[paludis-commits] r4115 - trunk/paludis/util

[ciaranm at svn.pioto.org]

Author: ciaranm
Date: 2007-12-31 01:46:25 +0000 (Mon, 31 Dec 2007)
New Revision: 4115

Modified:
   trunk/paludis/util/test_extras.cc
Log:
More flexible sneaky test hacks


Modified: trunk/paludis/util/test_extras.cc
===================================================================
--- trunk/paludis/util/test_extras.cc	2007-12-31 01:46:18 UTC (rev 4114)
+++ trunk/paludis/util/test_extras.cc	2007-12-31 01:46:25 UTC (rev 4115)
@@ -41,21 +41,23 @@
 
     struct C
     {
-        std::stringstream s;
+        /* icky hack: don't bother destructing s, it makes log assplode */
+        std::stringstream * s;
         int dev_null_pid;
 
         C() :
+            s(new std::stringstream),
             dev_null_pid(open("/dev/stderr", O_RDONLY))
         {
             test::set_exception_to_debug_string(&verbose_exception_to_debug_string);
 
-            if (getenv_with_default("PALUDIS_VERBOSE_TESTS", "").empty())
-            {
-                Log::get_instance()->set_log_stream(&s);
+            if (getenv_with_default("PALUDIS_TESTS_KEEP_STDERR", "").empty())
+                set_run_command_stderr_fds(dev_null_pid, -1);
 
-                set_run_command_stderr_fds(dev_null_pid, -1);
-            }
-            else
+            if (getenv_with_default("PALUDIS_TESTS_KEEP_LOG", "").empty())
+                Log::get_instance()->set_log_stream(s);
+
+            if (getenv_with_default("PALUDIS_TESTS_DEBUG_LOG", "").empty())
                 Log::get_instance()->set_log_level(ll_debug);
         }
     };