tests: raise log level to Debug for corba tests and set log level before __os_init (temporarily)

The rtt typekit and plugins are already loaded by an InitFunction in rtt/plugin/PluginLoader.cpp.

Author: meyerj

tests/corba_ipc_server.cpp

@@ -128,7 +128,15 @@ int ORO_main(int argc, char** argv)
 #endif
     corba::TaskContextProxy::InitOrb(argc,argv);
 
-    PluginLoader::Instance()->loadTypekits("../rtt");
+    // disable logging of errors or warnings if no ORO_LOGLEVEL was set.
+    if ( log().getLogLevel() == Logger::Warning ) {
+//        log(Info) << "Lowering LogLevel to Critical." << endlog();
+//        log().setLogLevel(Logger::Critical);
+        log().setLogLevel(Logger::Debug);
+        log(Info) << "Setting LogLevel to Debug." << endlog();
+    } else {
+        log(Info) << "LogLevel unaltered by test-runner." << endlog();
+    }
 
 #ifndef WIN32
     pid_t pid = getpid();

tests/corba_mqueue_ipc_server.cpp

@@ -82,8 +82,6 @@ int ORO_main(int argc, char** argv)
 #endif
     corba::TaskContextProxy::InitOrb(argc,argv);
 
-    PluginLoader::Instance()->loadTypekits("../rtt");
-
 #ifndef WIN32
     pid_t pid = getpid();
     std::ofstream pidfile("corba-mqueue-ipc-server.pid");

tests/test-runner-corba.cpp

@@ -84,22 +84,24 @@ boost::unit_test::test_suite* init_unit_test_suite(int argc, char** const argv)
 	assert((size_t)-1 != freeMem); // increase MEMORY_SIZE above most likely, as TLSF has a several kilobyte overhead
 	(void)freeMem;          // avoid compiler warning
 #endif
-	__os_init(argc, argv);
-
-    boost::unit_test::unit_test_monitor.register_exception_translator<CORBA::Exception>(&translate_corba_exception);
-
-    corba::TaskContextServer::InitOrb(argc,argv);
-    corba::TaskContextServer::ThreadOrb();
-
 
     // disable logging of errors or warnings if no ORO_LOGLEVEL was set.
     if ( log().getLogLevel() == Logger::Warning ) {
-        log(Info) << "Lowering LogLevel to Critical." << endlog();
-        log().setLogLevel(Logger::Critical);
+//        log(Info) << "Lowering LogLevel to Critical." << endlog();
+//        log().setLogLevel(Logger::Critical);
+        log().setLogLevel(Logger::Debug);
+        log(Info) << "Setting LogLevel to Debug." << endlog();
     } else {
         log(Info) << "LogLevel unaltered by test-runner." << endlog();
     }
 
+	__os_init(argc, argv);
+
+    boost::unit_test::unit_test_monitor.register_exception_translator<CORBA::Exception>(&translate_corba_exception);
+
+    corba::TaskContextServer::InitOrb(argc,argv);
+    corba::TaskContextServer::ThreadOrb();
+
     return 0;
 }
 

tests/test-runner.cpp

@@ -83,7 +83,6 @@ boost::unit_test::test_suite* init_unit_test_suite(int argc, char** const argv)
 	assert((size_t)-1 != freeMem); // increase MEMORY_SIZE above most likely, as TLSF has a several kilobyte overhead
     (void)freeMem;          // avoid compiler warning
 #endif
-	__os_init(argc, argv);
 
     // disable logging of errors or warnings if no ORO_LOGLEVEL was set.
     if ( log().getLogLevel() == Logger::Warning ) {
@@ -93,6 +92,8 @@ boost::unit_test::test_suite* init_unit_test_suite(int argc, char** const argv)
         log(Info) << "LogLevel unaltered by test-runner." << endlog();
     }
 
+	__os_init(argc, argv);
+
     return 0;
 }