diff options
author | Richard Nelson <none@none> | 2010-06-04 14:26:08 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-06-04 14:26:08 -0700 |
commit | 1be76eccdfed4d02f7ff8e34a29528887dd8d26c (patch) | |
tree | 0f1ef59f9ff5986dbd6ce8ab117c66f92b4205bc /indra/llcommon/tests/llerror_test.cpp | |
parent | 46e1253ee11cd2aca41314ec4e9c053bddd7a0b4 (diff) | |
parent | 05d7addde73511d303f9203d0dc007ebb2e5b299 (diff) |
merge
Diffstat (limited to 'indra/llcommon/tests/llerror_test.cpp')
-rw-r--r-- | indra/llcommon/tests/llerror_test.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 6785d0cf17..1558df231a 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -545,15 +545,6 @@ namespace tut // output order void ErrorTestObject::test<10>() { -#if LL_LINUX - skip("Fails on Linux, see comments"); -// on Linux: -// [error, 10] fail: 'order is time type location function message: expected -// '1947-07-08T03:04:05Z INFO: llcommon/tests/llerror_test.cpp(268) : -// writeReturningLocationAndFunction: apple' actual -// '1947-07-08T03:04:05Z INFO: llcommon/tests/llerror_test.cpp(268) : -// LLError::NoClassInfo::writeReturningLocationAndFunction: apple'' -#endif LLError::setPrintLocation(true); LLError::setTimeFunction(roswell); mRecorder.setWantsTime(true); |