summaryrefslogtreecommitdiff
path: root/indra/newview/tests
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2014-10-23 20:23:08 -0700
committerNat Goodspeed <nat@lindenlab.com>2014-10-23 20:23:08 -0700
commit918e2b629bd3dadfbe5288c0d72d93bcca1b8cfe (patch)
treeb5ae202882071bf8e954b5bcb875305e37d0dc41 /indra/newview/tests
parent642c334efa2dbd0bafca5b0dbb11a986cd5ab4a9 (diff)
Bring in new TUT library build. Clean up ensure_equals() overloads.
The new TUT library build eliminates the ambiguity about ensure_equals(const char*, ...) versus ensure_equals(const std::string&, ...). Now it's all based on const std::string&. Remove pointless const char* overloads and ambiguous forwarding templates. With clang in Xcode 6, any new datatypes we intend to use with ensure_equals() must have operator<<(std::ostream&, datatype) declared BEFORE lltut.h #includes tut.hpp. Reorder code in certain test source files to guarantee that visibility.
Diffstat (limited to 'indra/newview/tests')
-rwxr-xr-xindra/newview/tests/lllogininstance_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index adeb848e03..9ee6403739 100755
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -488,7 +488,7 @@ namespace tut
template<> template<>
void lllogininstance_object::test<3>()
{
- skip();
+ skip("test fails with Xcode 6, skipping");
set_test_name("Test Mandatory Update User Accepts");
@@ -517,7 +517,7 @@ namespace tut
template<> template<>
void lllogininstance_object::test<4>()
{
- skip();
+ skip("test fails with Xcode 6, skipping");
set_test_name("Test Mandatory Update User Decline");