Imported Upstream version 1.1.0.99.1

[platform/upstream/syncevolution.git] / test / client-test-main.cpp

diff --git a/test/client-test-main.cpp b/test/client-test-main.cpp
index 2165b26..63d5758 100644 (file)
--- a/test/client-test-main.cpp
+++ b/test/client-test-main.cpp
@@ -127,11 +127,13 @@ public:
     void startTest (CppUnit::Test *test) {
         m_currentTest = test->getName();
         std::cerr << m_currentTest;
-        string logfile = m_currentTest + ".log";
-        simplifyFilename(logfile);
-        m_logger.reset(new LoggerStdout(logfile));
-        m_logger->setLevel(Logger::DEBUG);
-        LoggerBase::pushLogger(m_logger.get());
+        if (!getenv("SYNCEVOLUTION_DEBUG")) {
+            string logfile = m_currentTest + ".log";
+            simplifyFilename(logfile);
+            m_logger.reset(new LoggerStdout(logfile));
+            m_logger->setLevel(Logger::DEBUG);
+            LoggerBase::pushLogger(m_logger.get());
+        }
         SE_LOG_DEBUG(NULL, NULL, "*** starting %s ***", m_currentTest.c_str());
         m_failures.reset();
         m_testFailed = false;
@@ -176,7 +178,9 @@ public:
         if (!failure.empty()) {
             SE_LOG_DEBUG(NULL, NULL, "%s", failure.c_str());
         }
-        LoggerBase::popLogger();
+        if (&LoggerBase::instance() == m_logger.get()) {
+            LoggerBase::popLogger();
+        }
         m_logger.reset();
 
         string logfile = m_currentTest + ".log";
@@ -261,6 +265,11 @@ int main(int argc, char* argv[])
   }
   runner.eventManager().addListener(&syncListener);
 
+
+  if (getenv("SYNCEVOLUTION_DEBUG")) {
+      LoggerBase::instance().setLevel(Logger::DEBUG);
+  }
+
   try {
       // Run the tests.
       if (argc <= 1) {