Merge remote-tracking branch 'ftalbrecht/master'

dune/stuff/test/main.hxx

@@ -5,6 +5,10 @@
 
 #include "config.h"
 
+#ifndef THIS_IS_A_BUILDBOT_BUILD
+#define THIS_IS_A_BUILDBOT_BUILD 0
+#endif
+
 #ifndef DUNE_STUFF_TEST_MAIN_CATCH_EXCEPTIONS
 #define DUNE_STUFF_TEST_MAIN_CATCH_EXCEPTIONS 0
 #endif
@@ -87,9 +91,9 @@ int main(int argc, char** argv)
 #endif
 
     DSC::Logger().create(
-#if DUNE_STUFF_TEST_MAIN_ENABLE_DEBUG_LOGGING
+#if DUNE_STUFF_TEST_MAIN_ENABLE_DEBUG_LOGGING && !THIS_IS_A_BUILDBOT_BUILD
         DSC::LOG_CONSOLE | DSC::LOG_INFO | DSC::LOG_DEBUG | DSC::LOG_ERROR
-#elif DUNE_STUFF_TEST_MAIN_ENABLE_INFO_LOGGING
+#elif DUNE_STUFF_TEST_MAIN_ENABLE_INFO_LOGGING && !THIS_IS_A_BUILDBOT_BUILD
       DSC::LOG_CONSOLE | DSC::LOG_INFO | DSC::LOG_ERROR
 #else
       DSC::LOG_CONSOLE | DSC::LOG_ERROR
@@ -100,12 +104,12 @@ int main(int argc, char** argv)
         "");
 
     DSC::TimedLogger().create(
-#if DUNE_STUFF_TEST_MAIN_ENABLE_TIMED_LOGGING && DUNE_STUFF_TEST_MAIN_ENABLE_INFO_LOGGING
+#if DUNE_STUFF_TEST_MAIN_ENABLE_TIMED_LOGGING && DUNE_STUFF_TEST_MAIN_ENABLE_INFO_LOGGING && !THIS_IS_A_BUILDBOT_BUILD
         std::numeric_limits<ssize_t>::max(),
 #else
       -1,
 #endif
-#if DUNE_STUFF_TEST_MAIN_ENABLE_TIMED_LOGGING && DUNE_STUFF_TEST_MAIN_ENABLE_DEBUG_LOGGING
+#if DUNE_STUFF_TEST_MAIN_ENABLE_TIMED_LOGGING && DUNE_STUFF_TEST_MAIN_ENABLE_DEBUG_LOGGING && !THIS_IS_A_BUILDBOT_BUILD
         std::numeric_limits<ssize_t>::max()
 #else
       -1