aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattip <matti.picus@gmail.com>2014-06-12 18:30:18 +0300
committermattip <matti.picus@gmail.com>2014-06-12 18:30:18 +0300
commit2a65ca964c1f6e9a714f238f3178db4564b3ebc6 (patch)
tree86f4ba484bb89ce89e702f43b0b44fa855f39c67
parentpypy and cpython on windows both raise a KeyError (diff)
downloadpypy-2a65ca964c1f6e9a714f238f3178db4564b3ebc6.tar.gz
pypy-2a65ca964c1f6e9a714f238f3178db4564b3ebc6.tar.bz2
pypy-2a65ca964c1f6e9a714f238f3178db4564b3ebc6.zip
whoops on parallel_runs of tests
-rw-r--r--testrunner/runner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/testrunner/runner.py b/testrunner/runner.py
index 00fc99e8cf..ef04b2be2e 100644
--- a/testrunner/runner.py
+++ b/testrunner/runner.py
@@ -234,7 +234,7 @@ def execute_tests(run_param, testdirs, logfile, out):
N = run_param.parallel_runs
if N > 1:
- out.write("running %d parallel test workers")
+ out.write("running %d parallel test workers" % N)
failure = False
for testname in testdirs:
@@ -355,7 +355,7 @@ def main(args):
help="configuration python file (optional)")
parser.add_option("--root", dest="root", default=".",
help="root directory for the run")
- parser.add_option("--parallel-runs", dest="parallel_runs", default=1,
+ parser.add_option("--parallel-runs", dest="parallel_runs", default=0,
type="int",
help="number of parallel test runs")
parser.add_option("--dry-run", dest="dry_run", default=False,