svn commit: r1061464 - /subversion/trunk/win-tests.py

[pb...@apache.org]

Author: pburba
Date: Thu Jan 20 19:09:38 2011
New Revision: 1061464

URL: http://svn.apache.org/viewvc?rev=1061464&view=rev
Log:
Let win-tests.py take advantage of build/run_tests.py's --log-to-stdout
option.

* win-tests.py

  (_usage_exit): Add --log-to-stdout to usage text.

  (log_to_stdout): New global variable.

  (global): Accept --log-to-stdout as a valid option.  Call
   run_tests.TestHarness() with null log/fail_log files if the
  --log-to-stdout option is used.

Modified:
    subversion/trunk/win-tests.py

Modified: subversion/trunk/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/win-tests.py?rev=1061464&r1=1061463&r2=1061464&view=diff
==============================================================================
--- subversion/trunk/win-tests.py (original)
+++ subversion/trunk/win-tests.py Thu Jan 20 19:09:38 2011
@@ -87,6 +87,7 @@ def _usage_exit():
   print(" --config-file           : Configuration file for tests")
   print(" --fsfs-sharding         : Specify shard size (for fsfs)")
   print(" --fsfs-packing          : Run 'svnadmin pack' automatically")
+  print(" --log-to-stdout         : Write log results to stdout")
 
   sys.exit(0)
 
@@ -119,7 +120,8 @@ opts, args = my_getopt(sys.argv[1:], 'hr
                         'httpd-server', 'http-library=', 'help',
                         'fsfs-packing', 'fsfs-sharding=', 'javahl',
                         'list', 'enable-sasl', 'bin=', 'parallel',
-                        'config-file=', 'server-minor-version='])
+                        'config-file=', 'server-minor-version=',
+                        'log-to-stdout'])
 if len(args) > 1:
   print('Warning: non-option arguments after the first one will be ignored')
 
@@ -144,6 +146,7 @@ fsfs_sharding = None
 fsfs_packing = None
 server_minor_version = None
 config_file = None
+log_to_stdout = None
 tests_to_run = []
 
 for opt, val in opts:
@@ -200,6 +203,8 @@ for opt, val in opts:
     parallel = 1
   elif opt in ('--config-file'):
     config_file = val
+  elif opt == '--log-to-stdout':
+    log_to_stdout = 1
 
 # Calculate the source and test directory names
 abs_srcdir = os.path.abspath("")
@@ -664,9 +669,16 @@ sys.path.insert(0, os.path.join(abs_srcd
 
 if not test_javahl:
   import run_tests
+  if log_to_stdout:
+    log_file = None
+    fail_log_file = None
+  else:
+    log_file = os.path.join(abs_builddir, log)
+    fail_log_file = os.path.join(abs_builddir, faillog)
+
   th = run_tests.TestHarness(abs_srcdir, abs_builddir,
-                             os.path.join(abs_builddir, log),
-                             os.path.join(abs_builddir, faillog),
+                             log_file,
+                             fail_log_file,
                              base_url, fs_type, http_library,
                              server_minor_version, not quiet,
                              cleanup, enable_sasl, parallel, config_file,