merge from latest svn/viewer-2-0 to hg/viewer-2-0

3 files changed, 9 insertions, 37 deletions

diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 6a93537a38..381197d812 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -29,67 +29,39 @@ include_directories(
     )
 
 set(test_SOURCE_FILES
-    common.cpp
-    inventory.cpp
     io.cpp
 #    llapp_tut.cpp						# Temporarily removed until thread issues can be solved
-    llbase64_tut.cpp
-    llbbox_tut.cpp
-    llbboxlocal_tut.cpp
     llblowfish_tut.cpp
     llbuffer_tut.cpp
-    lldate_tut.cpp
     lldependencies_tut.cpp
     lldoubledispatch_tut.cpp
-    llerror_tut.cpp
     llevents_tut.cpp
-    llhost_tut.cpp
     llhttpdate_tut.cpp
     llhttpclient_tut.cpp
     llhttpnode_tut.cpp
     llinventoryparcel_tut.cpp
     lliohttpserver_tut.cpp
-    lljoint_tut.cpp
-    llmime_tut.cpp
     llmessageconfig_tut.cpp
-    llmodularmath_tut.cpp
-    llnamevalue_tut.cpp
     llpermissions_tut.cpp
     llpipeutil.cpp
-    llquaternion_tut.cpp
-    llrandom_tut.cpp
-    llrect_tut.cpp
     llsaleinfo_tut.cpp
     llscriptresource_tut.cpp
     llsdmessagebuilder_tut.cpp
     llsdmessagereader_tut.cpp
     llsd_new_tut.cpp
-    llsdserialize_tut.cpp
     llsdutil_tut.cpp
     llservicebuilder_tut.cpp
     llstreamtools_tut.cpp
-    llstring_tut.cpp
     lltemplatemessagebuilder_tut.cpp
     lltimestampcache_tut.cpp
-    lltiming_tut.cpp
     lltranscode_tut.cpp
-    lltreeiterators_tut.cpp
     lltut.cpp
-    lluri_tut.cpp
     lluuidhashmap_tut.cpp
     llxfer_tut.cpp
-    math.cpp
     message_tut.cpp
     reflection_tut.cpp
     stringize_tut.cpp
     test.cpp
-    v2math_tut.cpp
-    v3color_tut.cpp
-    v3dmath_tut.cpp
-    v3math_tut.cpp
-    v4color_tut.cpp
-    v4coloru_tut.cpp
-    v4math_tut.cpp
     )
 
 set(test_HEADER_FILES
diff --git a/indra/test/lltut.h b/indra/test/lltut.h
index ba3791cbd4..6322753253 100644
--- a/indra/test/lltut.h
+++ b/indra/test/lltut.h
@@ -74,7 +74,7 @@ namespace tut
 	inline void ensure_memory_matches(const char* msg,const void* actual, U32 actual_len, const void* expected,U32 expected_len)
 	{
 		if((expected_len != actual_len) || 
-			(memcmp(actual, expected, actual_len) != 0))
+			(std::memcmp(actual, expected, actual_len) != 0))
 		{
 			std::stringstream ss;
 			ss << (msg?msg:"") << (msg?": ":"") << "not equal";
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 721e9da917..7dfe8f40b7 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -148,24 +148,24 @@ public:
 private:
 	void run_completed_(std::ostream &stream)
 	{
+		stream << "\tTotal Tests:\t" << mTotalTests << std::endl;
+		stream << "\tPassed Tests:\t" << mPassedTests;
+		if (mPassedTests == mTotalTests)
+		{
+			stream << "\tYAY!! \\o/";
+		}
 		stream << std::endl;
-		stream << "Total Tests:   " << mTotalTests << std::endl;
-		stream << "Passed Tests: " << mPassedTests << std::endl;
 
-		stream << std::endl;
-		stream << "Total Tests:   " << mTotalTests << std::endl;
-		stream << "Passed Tests: " << mPassedTests << std::endl;
-		
 		if (mSkippedTests > 0)
 		{
-			stream << "Skipped known failures: " << mSkippedTests
+			stream << "\tSkipped known failures:\t" << mSkippedTests
 				<< std::endl;
 		}
 
 		if(mFailedTests > 0)
 		{
 			stream << "*********************************" << std::endl;
-			stream << "Failed Tests:   " << mFailedTests << std::endl;
+			stream << "Failed Tests:\t" << mFailedTests << std::endl;
 			stream << "Please report or fix the problem." << std::endl;
 			stream << "*********************************" << std::endl;
 		}