diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-07 14:07:45 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-07 14:07:45 +0300 |
| commit | 3e80a0e025045955ee18234c514b492b4c604d82 (patch) | |
| tree | a8c36e65af9512a8104d09d371162ff3fe8fee7b /indra/llcommon/tests/llerror_test.cpp | |
| parent | c356aeedfb2801f3a77a5a68efb307fdb385d773 (diff) | |
| parent | eec00a712fff079009ae793d86e27b7f3ab13053 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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); |