diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-04 13:50:32 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-04 13:50:32 -0500 |
| commit | c9c9943098d35914f7b8591bf66ea1ae3985a94e (patch) | |
| tree | daa74a4288a0e5e5c028717e0b925633c11eac5b /indra/llcommon/tests | |
| parent | 92a1ecd5fdfff2490cb563e83baff88fc6120882 (diff) | |
| parent | 5b695ac56a7fbbb4d1f63bccb0c147c46e56ebcf (diff) | |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
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); |