diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-04 20:47:17 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-04 20:47:17 +0200 |
commit | 67ff38b51b59766ff7bc0af1e541b54ac067ea70 (patch) | |
tree | d204b5b656911187d12b08b8ed77a873f9758b4d /indra/llcommon/tests | |
parent | c28fd45839b0a1924c80bc289a90e4756e677472 (diff) | |
parent | ae6911d094bcfaa730fd77f3c55c9ea5fa02b229 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon/tests')
-rw-r--r-- | indra/llcommon/tests/llerror_test.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 1558df231a..6785d0cf17 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -545,6 +545,15 @@ 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); |