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

[rh...@apache.org]

Author: rhuijben
Date: Sat Jun 12 21:47:07 2010
New Revision: 954143

URL: http://svn.apache.org/viewvc?rev=954143&view=rev
Log:
Following up on r954020 and r954136 fix running the tests on Windows.

* build/run_tests.py
  (quote): Remove function that is no longer needed when using subprocess.
  (_run_test): Remove callers.
  (_run_prog): Revert r954136.

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=954143&r1=954142&r2=954143&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Sat Jun 12 21:47:07 2010
@@ -218,12 +218,6 @@ class TestHarness:
   def _run_test(self, prog, test_nr, total_tests):
     "Run a single test. Return the test's exit code."
 
-    def quote(arg):
-      if sys.platform == 'win32':
-        return '"' + arg + '"'
-      else:
-        return arg
-
     if self.log:
       log = self.log
     else:
@@ -246,22 +240,22 @@ class TestHarness:
     start_time = datetime.now()
     if progbase[-3:] == '.py':
       progname = sys.executable
-      cmdline = [quote(progname),
-                 quote(os.path.join(self.srcdir, prog))]
+      cmdline = [progname,
+                 os.path.join(self.srcdir, prog)]
       if self.base_url is not None:
-        cmdline.append(quote('--url=' + self.base_url))
+        cmdline.append('--url=' + self.base_url)
       if self.enable_sasl is not None:
         cmdline.append('--enable-sasl')
       if self.parallel is not None:
         cmdline.append('--parallel')
       if self.config_file is not None:
-        cmdline.append(quote('--config-file=' + self.config_file))
+        cmdline.append('--config-file=' + self.config_file)
     elif os.access(prog, os.X_OK):
       progname = './' + progbase
-      cmdline = [quote(progname),
-                 quote('--srcdir=' + os.path.join(self.srcdir, progdir))]
+      cmdline = [progname,
+                 '--srcdir=' + os.path.join(self.srcdir, progdir)]
       if self.config_file is not None:
-        cmdline.append(quote('--config-file=' + self.config_file))
+        cmdline.append('--config-file=' + self.config_file)
     else:
       print('Don\'t know what to do about ' + progbase)
       sys.exit(1)
@@ -271,15 +265,15 @@ class TestHarness:
     if self.cleanup is not None:
       cmdline.append('--cleanup')
     if self.fs_type is not None:
-      cmdline.append(quote('--fs-type=' + self.fs_type))
+      cmdline.append('--fs-type=' + self.fs_type)
     if self.http_library is not None:
-      cmdline.append(quote('--http-library=' + self.http_library))
+      cmdline.append('--http-library=' + self.http_library)
     if self.server_minor_version is not None:
-      cmdline.append(quote('--server-minor-version=' + self.server_minor_version))
+      cmdline.append('--server-minor-version=' + self.server_minor_version)
     if self.list_tests is not None:
       cmdline.append('--list')
     if self.svn_bin is not None:
-      cmdline.append(quote('--bin=' + self.svn_bin))
+      cmdline.append('--bin=' + self.svn_bin)
     if self.fsfs_sharding is not None:
       cmdline.append('--fsfs-sharding=%d' % self.fsfs_sharding)
     if self.fsfs_packing is not None:
@@ -345,7 +339,7 @@ class TestHarness:
       if self.log:
         os.dup2(self.log.fileno(), 1)
         os.dup2(self.log.fileno(), 2)
-      rv = subprocess.call([progname] + arglist[1:])
+      rv = subprocess.call(arglist)
     except:
       if self.log:
         restore_streams(old_stdout, old_stderr)