svn commit: r1037996 - /subversion/trunk/build/run_tests.py

[da...@apache.org]

Author: danielsh
Date: Tue Nov 23 05:14:25 2010
New Revision: 1037996

URL: http://svn.apache.org/viewvc?rev=1037996&view=rev
Log:
Quickly patch up the LOG_TO_STDOUT mode of 'make check'.

* build/run_tests.py
  (TestHarness._run_py_test->progress_func, TestHarness._run_test):
    Inject some hacks into the --log-to-stdout logic.

Modified:
    subversion/trunk/build/run_tests.py

Modified: subversion/trunk/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1037996&r1=1037995&r2=1037996&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Tue Nov 23 05:14:25 2010
@@ -345,9 +345,6 @@ class TestHarness:
       dots_to_write = dots - self.dots_written
       if self.log:
         os.write(old_stdout, '.' * dots_to_write)
-      else:
-        sys.stdout.write(old_stdout, '.' * dots_to_write)
-        sys.stdout.flush()
 
       self.dots_written = dots
 
@@ -390,6 +387,9 @@ class TestHarness:
       test_info = '%s [%d/%d]' % (progbase, test_nr + 1, total_tests)
       sys.stdout.write('Running tests in %s' % (test_info, ))
       sys.stdout.flush()
+    else:
+      # ### Hack for --log-to-stdout to work (but not print any dots).
+      test_info = ''
 
     log.write('START: %s\n' % progbase)
     log.flush()