diff options
author | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-09 15:47:37 -0700 |
---|---|---|
committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-09 15:47:37 -0700 |
commit | f2f7f7b3bb2c8466e2a07f8f586a1a63fdae8a66 (patch) | |
tree | 9c74f8e5ca2601bbdf87a4b5e034b76784bdacea /indra/llcommon/tests | |
parent | 163b767944caa4b2a474abf93e64eaeac1f02587 (diff) | |
parent | 4bbca7c086724da1af4f8cb6b22e6de8320a0b1b (diff) |
merge
Diffstat (limited to 'indra/llcommon/tests')
-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); |