svn commit: r954892 - /subversion/trunk/subversion/tests/cmdline/svntest/main.py

[rh...@apache.org]

Author: rhuijben
Date: Tue Jun 15 14:04:54 2010
New Revision: 954892

URL: http://svn.apache.org/viewvc?rev=954892&view=rev
Log:
Following up on r954850, allow running the tests in parallel again.

* subversion/tests/cmdline/svntest/main.py
  (run_tests): Remove parallel and use options.parallel instead.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/main.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=954892&r1=954891&r2=954892&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Tue Jun 15 14:04:54 2010
@@ -1302,7 +1302,6 @@ def run_tests(test_list, serial_only = F
   # Should the tests be listed (as opposed to executed)?
   list_tests = False
 
-  parallel = 0
   svn_bin = None
   use_jsvn = False
   keep_local_tmp = False
@@ -1481,7 +1480,7 @@ def run_tests(test_list, serial_only = F
     svntest.actions.setup_pristine_repository()
 
   # Run the tests.
-  exit_code = _internal_run_tests(test_list, testnums, parallel)
+  exit_code = _internal_run_tests(test_list, testnums, options.parallel)
 
   # Remove all scratchwork: the 'pristine' repository, greek tree, etc.
   # This ensures that an 'import' will happen the next time we run.