diff options
| author |   mattip <matti.picus@gmail.com> | 2014-06-11 21:33:57 +0300 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2014-06-11 21:33:57 +0300 |
| commit | ccfb718e8e3047d3606d78d10b38862ff757b9f9 (patch) | |
| tree | f7242e6be7ce44b5b3a3bfa9bcc924293789aa88 /testrunner | |
| parent | prevent opening error dialog box on windows when not using testrunner/runner (diff) | |
| download | pypy-ccfb718e8e3047d3606d78d10b38862ff757b9f9.tar.gz pypy-ccfb718e8e3047d3606d78d10b38862ff757b9f9.tar.bz2 pypy-ccfb718e8e3047d3606d78d10b38862ff757b9f9.zip | |
document more of the test environment
Diffstat (limited to 'testrunner')
| -rw-r--r-- | testrunner/runner.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/testrunner/runner.py b/testrunner/runner.py index d7a6848ec7..00fc99e8cf 100644 --- a/testrunner/runner.py +++ b/testrunner/runner.py @@ -233,6 +233,8 @@ def execute_tests(run_param, testdirs, logfile, out): run_param.startup() N = run_param.parallel_runs + if N > 1: + out.write("running %d parallel test workers") failure = False for testname in testdirs: @@ -353,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=0, + parser.add_option("--parallel-runs", dest="parallel_runs", default=1, type="int", help="number of parallel test runs") parser.add_option("--dry-run", dest="dry_run", default=False, @@ -389,6 +391,8 @@ def main(args): if py.path.local(config_py_file).check(file=1): print >>out, "using config", config_py_file execfile(config_py_file, run_param.__dict__) + else: + print >>out, "ignoring non-existant config", config_py_file if run_param.cherrypick: for p in run_param.cherrypick: |