Fixed tests when no log4plus is available.

Former-commit-id: f1ae81376c

test/functional/storm-functional-tests.cpp

@@ -2,21 +2,25 @@
 #include <list>
 #include <string>
 
+#include "storm-config.h"
+
 #include "gtest/gtest.h"
+#ifdef STORM_LOGGING_FRAMEWORK
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
 #include "log4cplus/consoleappender.h"
 #include "log4cplus/fileappender.h"
 
-#include "storm-config.h"
-#include "src/settings/SettingsManager.h"
-
 log4cplus::Logger logger;
+#endif
+
+#include "src/settings/SettingsManager.h"
 
 /*!
  * Initializes the logging framework.
  */
 void setUpLogging() {
+#ifdef STORM_LOGGING_FRAMEWORK
 	logger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("main"));
 	logger.setLogLevel(log4cplus::ERROR_LOG_LEVEL);
 	log4cplus::SharedAppenderPtr fileLogAppender(new log4cplus::FileAppender("storm-functional-tests.log"));
@@ -24,7 +28,7 @@ void setUpLogging() {
 	fileLogAppender->setThreshold(log4cplus::FATAL_LOG_LEVEL);
 	fileLogAppender->setLayout(std::auto_ptr<log4cplus::Layout>(new log4cplus::PatternLayout("%-5p - %D{%H:%M} (%r ms) - %F:%L : %m%n")));
 	logger.addAppender(fileLogAppender);
-
+#endif
 	// Uncomment these lines to enable console logging output
 	// log4cplus::SharedAppenderPtr consoleLogAppender(new log4cplus::ConsoleAppender());
 	// consoleLogAppender->setName("mainConsoleAppender");
@@ -39,9 +43,10 @@ int main(int argc, char* argv[]) {
 	testing::InitGoogleTest(&argc, argv);
 
     int result = RUN_ALL_TESTS();
-    
+#ifdef STORM_LOGGING_FRAMEWORK
     logger.closeNestedAppenders();
-
+#endif
+    
 	std::list<std::string> untestedModules;
 #ifndef STORM_HAVE_GUROBI
 	untestedModules.push_back("Gurobi");

test/performance/storm-performance-tests.cpp

@@ -1,19 +1,24 @@
 #include <iostream>
 
 #include "gtest/gtest.h"
+#include "storm-config.h"
+
+
+#include "src/settings/SettingsManager.h"
+#ifdef STORM_LOGGING_FRAMEWORK
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
 #include "log4cplus/consoleappender.h"
 #include "log4cplus/fileappender.h"
 
-#include "src/settings/SettingsManager.h"
-
 log4cplus::Logger logger;
+#endif
 
 /*!
  * Initializes the logging framework.
  */
 void setUpLogging() {
+#ifdef STORM_LOGGING_FRAMEWORK
 	logger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("main"));
 	logger.setLogLevel(log4cplus::WARN_LOG_LEVEL);
 	log4cplus::SharedAppenderPtr fileLogAppender(new log4cplus::FileAppender("storm-performance-tests.log"));
@@ -21,7 +26,7 @@ void setUpLogging() {
 	fileLogAppender->setThreshold(log4cplus::WARN_LOG_LEVEL);
 	fileLogAppender->setLayout(std::auto_ptr<log4cplus::Layout>(new log4cplus::PatternLayout("%-5p - %D{%H:%M} (%r ms) - %F:%L : %m%n")));
 	logger.addAppender(fileLogAppender);
-
+#endif 
 	// Uncomment these lines to enable console logging output
 	// log4cplus::SharedAppenderPtr consoleLogAppender(new log4cplus::ConsoleAppender());
 	// consoleLogAppender->setName("mainConsoleAppender");
@@ -36,7 +41,8 @@ int main(int argc, char* argv[]) {
 	testing::InitGoogleTest(&argc, argv);
 
     int result = RUN_ALL_TESTS();
-    
+#ifdef STORM_LOGGING_FRAMEWORK
     logger.closeNestedAppenders();
+#endif
     return result;
 }