summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-10-22 21:20:10 -0400
committerOz Linden <oz@lindenlab.com>2014-10-22 21:20:10 -0400
commit9e9779d3f88a35bd9d3eb949b6fa08a36b505d5f (patch)
tree2dba4c0cb4a4acf682fb709d2fb967709f22fb3d /indra
parentac6295ad5199842d2fea9ddb92ce27236746be8c (diff)
Remove unit test case that relied on undefined order of evaluation
in: 'cout << a() << b()' the order of evaluation of a() and b() is undefined.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llcommon/tests/llerror_test.cpp21
1 files changed, 3 insertions, 18 deletions
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp
index 1ac72d13bf..fee9492618 100755
--- a/indra/llcommon/tests/llerror_test.cpp
+++ b/indra/llcommon/tests/llerror_test.cpp
@@ -453,11 +453,6 @@ namespace
return "bar";
}
- void uberLogger()
- {
- LL_INFOS() << "uber(" << outerLogger() << "," << innerLogger() << ")" << LL_ENDL;
- }
-
class LogWhileLogging
{
public:
@@ -485,25 +480,15 @@ namespace tut
// handle nested logging
void ErrorTestObject::test<7>()
{
-#if LL_DARWIN
- skip("Skip known failure on clang and intelc due to operator << differences");
-#endif
outerLogger();
ensure_message_contains(0, "inside");
ensure_message_contains(1, "outside(moo)");
ensure_message_count(2);
- uberLogger();
- ensure_message_contains(2, "inside");
- ensure_message_contains(3, "inside");
- ensure_message_contains(4, "outside(moo)");
- ensure_message_contains(5, "uber(bar,moo)");
- ensure_message_count(6);
-
metaLogger();
- ensure_message_contains(6, "logging");
- ensure_message_contains(7, "meta(baz)");
- ensure_message_count(8);
+ ensure_message_contains(2, "logging");
+ ensure_message_contains(3, "meta(baz)");
+ ensure_message_count(4);
}
template<> template<>