1 files changed, 56 insertions, 46 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 9d327ff3be..b16fcb84d6 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -37,6 +37,7 @@
 #include "linden_common.h"
 #include "llerrorcontrol.h"
 #include "lltut.h"
+#include "chained_callback.h"
 #include "stringize.h"
 #include "namedtempfile.h"
 #include "lltrace.h"
@@ -62,11 +63,14 @@
 #endif
 #include <boost/iostreams/tee.hpp>
 #include <boost/iostreams/stream.hpp>
+#if LL_MSVC
+#pragma warning (pop)
+#endif
+
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/foreach.hpp>
-#include <boost/lambda/lambda.hpp>
 
 #include <fstream>
 
@@ -171,8 +175,10 @@ private:
 	LLError::RecorderPtr mRecorder;
 };
 
-class LLTestCallback : public tut::callback
+class LLTestCallback : public chained_callback
 {
+	typedef chained_callback super;
+
 public:
 	LLTestCallback(bool verbose_mode, std::ostream *stream,
 				   boost::shared_ptr<LLReplayLog> replayer) :
@@ -183,7 +189,7 @@ public:
 		mSkippedTests(0),
 		// By default, capture a shared_ptr to std::cout, with a no-op "deleter"
 		// so that destroying the shared_ptr makes no attempt to delete std::cout.
-		mStream(boost::shared_ptr<std::ostream>(&std::cout, boost::lambda::_1)),
+		mStream(boost::shared_ptr<std::ostream>(&std::cout, [](std::ostream*){})),
 		mReplayer(replayer)
 	{
 		if (stream)
@@ -204,22 +210,25 @@ public:
 
 	~LLTestCallback()
 	{
-	}	
+	}
 
 	virtual void run_started()
 	{
 		//std::cout << "run_started" << std::endl;
 		LL_INFOS("TestRunner")<<"Test Started"<< LL_ENDL;
+		super::run_started();
 	}
 
 	virtual void group_started(const std::string& name) {
 		LL_INFOS("TestRunner")<<"Unit test group_started name=" << name << LL_ENDL;
 		*mStream << "Unit test group_started name=" << name << std::endl;
+		super::group_started(name);
 	}
 
 	virtual void group_completed(const std::string& name) {
 		LL_INFOS("TestRunner")<<"Unit test group_completed name=" << name << LL_ENDL;
 		*mStream << "Unit test group_completed name=" << name << std::endl;
+		super::group_completed(name);
 	}
 
 	virtual void test_completed(const tut::test_result& tr)
@@ -281,6 +290,7 @@ public:
 			*mStream << std::endl;
 		}
 		LL_INFOS("TestRunner")<<out.str()<<LL_ENDL;
+		super::test_completed(tr);
 	}
 
 	virtual int getFailedTests() const { return mFailedTests; }
@@ -308,6 +318,7 @@ public:
 			*mStream << "Please report or fix the problem." << std::endl;
 			*mStream << "*********************************" << std::endl;
 		}
+		super::run_completed();
 	}
 
 protected:
@@ -473,9 +484,8 @@ void stream_usage(std::ostream& s, const char* app)
 	  << "LOGTEST=level : for all tests, emit log messages at level 'level'\n"
 	  << "LOGFAIL=level : only for failed tests, emit log messages at level 'level'\n"
 	  << "where 'level' is one of ALL, DEBUG, INFO, WARN, ERROR, NONE.\n"
-	  << "--debug is like LOGTEST=DEBUG, but --debug overrides LOGTEST.\n"
-	  << "Setting LOGFAIL overrides both LOGTEST and --debug: the only log\n"
-	  << "messages you will see will be for failed tests.\n\n";
+	  << "--debug is like LOGTEST=DEBUG, but --debug overrides LOGTEST,\n"
+	  << "while LOGTEST overrides LOGFAIL.\n\n";
 
 	s << "Examples:" << std::endl;
 	s << "  " << app << " --verbose" << std::endl;
@@ -514,35 +524,8 @@ int main(int argc, char **argv)
 #ifndef LL_WINDOWS
 	::testing::InitGoogleMock(&argc, argv);
 #endif
-	// LOGTEST overrides default, but can be overridden by --debug or LOGFAIL.
-	const char* LOGTEST = getenv("LOGTEST");
-	if (LOGTEST)
-	{
-		LLError::initForApplication(".", ".", true /* log to stderr */);
-		LLError::setDefaultLevel(LLError::decodeLevel(LOGTEST));
-	}
-	else
-	{
-		LLError::initForApplication(".", ".", false /* do not log to stderr */);
-		LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
-	}	
-	LLError::setFatalHook(wouldHaveCrashed);
-	std::string test_app_name(argv[0]);
-	std::string test_log = test_app_name + ".log";
-	LLFile::remove(test_log);
-	LLError::logToFile(test_log);
-
-#ifdef CTYPE_WORKAROUND
-	ctype_workaround();
-#endif
 
 	ll_init_apr();
-	
-	if (!sMasterThreadRecorder)
-	{
-		sMasterThreadRecorder = new LLTrace::ThreadRecorder();
-		LLTrace::set_master_thread_recorder(sMasterThreadRecorder);
-	}
 	apr_getopt_t* os = NULL;
 	if(APR_SUCCESS != apr_getopt_init(&os, gAPRPoolp, argc, argv))
 	{
@@ -556,7 +539,10 @@ int main(int argc, char **argv)
 	std::string test_group;
 	std::string suite_name;
 
-	// values use for options parsing
+	// LOGTEST overrides default, but can be overridden by --debug.
+	const char* LOGTEST = getenv("LOGTEST");
+
+	// values used for options parsing
 	apr_status_t apr_err;
 	const char* opt_arg = NULL;
 	int opt_id = 0;
@@ -605,7 +591,7 @@ int main(int argc, char **argv)
 				wait_at_exit = true;
 				break;
 			case 'd':
-				LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
+				LOGTEST = "DEBUG";
 				break;
 			case 'x':
 				suite_name.assign(opt_arg);
@@ -617,21 +603,44 @@ int main(int argc, char **argv)
 		}
 	}
 
-	// run the tests
-
+	// set up logging
 	const char* LOGFAIL = getenv("LOGFAIL");
-	boost::shared_ptr<LLReplayLog> replayer;
-	// As described in stream_usage(), LOGFAIL overrides both --debug and
-	// LOGTEST.
-	if (LOGFAIL)
+	boost::shared_ptr<LLReplayLog> replayer{boost::make_shared<LLReplayLog>()};
+
+	// Testing environment variables for both 'set' and 'not empty' allows a
+	// user to suppress a pre-existing environment variable by forcing empty.
+	if (LOGTEST && *LOGTEST)
 	{
-		LLError::ELevel level = LLError::decodeLevel(LOGFAIL);
-		replayer.reset(new LLReplayLogReal(level, gAPRPoolp));
+		LLError::initForApplication(".", ".", true /* log to stderr */);
+		LLError::setDefaultLevel(LLError::decodeLevel(LOGTEST));
 	}
 	else
 	{
-		replayer.reset(new LLReplayLog());
+		LLError::initForApplication(".", ".", false /* do not log to stderr */);
+		LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
+		if (LOGFAIL && *LOGFAIL)
+		{
+			LLError::ELevel level = LLError::decodeLevel(LOGFAIL);
+			replayer.reset(new LLReplayLogReal(level, gAPRPoolp));
+		}
 	}
+	LLError::setFatalHook(wouldHaveCrashed);
+	std::string test_app_name(argv[0]);
+	std::string test_log = test_app_name + ".log";
+	LLFile::remove(test_log);
+	LLError::logToFile(test_log);
+
+#ifdef CTYPE_WORKAROUND
+	ctype_workaround();
+#endif
+
+	if (!sMasterThreadRecorder)
+	{
+		sMasterThreadRecorder = new LLTrace::ThreadRecorder();
+		LLTrace::set_master_thread_recorder(sMasterThreadRecorder);
+	}
+
+	// run the tests
 
 	LLTestCallback* mycallback;
 	if (getenv("TEAMCITY_PROJECT_NAME"))
@@ -643,7 +652,8 @@ int main(int argc, char **argv)
 		mycallback = new LLTestCallback(verbose_mode, output.get(), replayer);
 	}
 
-	tut::runner.get().set_callback(mycallback);
+	// a chained_callback subclass must be linked with previous
+	mycallback->link();
 
 	if(test_group.empty())
 	{