svn merge -r 61367:61368 svn+ssh://svn/svn/linden/branches/maintenance into...

svn merge -r 61367:61368 svn+ssh://svn/svn/linden/branches/maintenance into release  -- porting test spam removal

indra/test/lltut.cpp

@@ -20,8 +20,6 @@ namespace tut
 	void ensure_equals(const char* msg, const LLDate& actual,
 		const LLDate& expected)
 	{
-		std::cout << "ensure_equals " << msg << std::endl;
-
 		ensure_equals(msg,
 			actual.secondsSinceEpoch(), expected.secondsSinceEpoch());
 	}
@@ -30,8 +28,6 @@ namespace tut
 	void ensure_equals(const char* msg, const LLURI& actual,
 		const LLURI& expected)
 	{
-		std::cout << "ensure_equals " << msg << std::endl;
-
 		ensure_equals(msg,
 			actual.asString(), expected.asString());
 	}
@@ -40,8 +36,6 @@ namespace tut
 	void ensure_equals(const char* msg,
 		const std::vector<U8>& actual, const std::vector<U8>& expected)
 	{
-		std::cout << "ensure_equals " << msg << std::endl;
-
 		std::string s(msg);
 		
 		ensure_equals(s + " size", actual.size(), expected.size());
@@ -60,8 +54,6 @@ namespace tut
 	void ensure_equals(const char* m, const LLSD& actual,
 		const LLSD& expected)
 	{
-		std::cout << "ensure_equals " << m << std::endl;
-
 		const std::string& msg = m;
 		
 		ensure_equals(msg + " type", actual.type(), expected.type());
@@ -137,7 +129,6 @@ namespace tut
 	void ensure_starts_with(const std::string& msg,
 		const std::string& actual, const std::string& expectedStart)
 	{
-		std::cout << "ensure_starts_with " << msg << std::endl;
 		if( actual.find(expectedStart, 0) != 0 )
 		{
 			std::stringstream ss;
@@ -150,7 +141,6 @@ namespace tut
 	void ensure_ends_with(const std::string& msg,
 		const std::string& actual, const std::string& expectedEnd)
 	{
-		std::cout << "ensure_ends_with " << msg << std::endl;
 		if( actual.size() < expectedEnd.size()
 			|| actual.rfind(expectedEnd)
 				!= (actual.size() - expectedEnd.size()) )
@@ -165,7 +155,6 @@ namespace tut
 	void ensure_contains(const std::string& msg,
 		const std::string& actual, const std::string& expectedSubString)
 	{
-		std::cout << "ensure_contains " << msg << std::endl;
 		if( actual.find(expectedSubString, 0) == std::string::npos )
 		{
 			std::stringstream ss;
@@ -178,7 +167,6 @@ namespace tut
 	void ensure_does_not_contain(const std::string& msg,
 		const std::string& actual, const std::string& expectedSubString)
 	{
-		std::cout << "ensure_does_not_contain " << msg << std::endl;
 		if( actual.find(expectedSubString, 0) != std::string::npos )
 		{
 			std::stringstream ss;