aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattip <matti.picus@gmail.com>2016-03-11 15:21:05 +0200
committermattip <matti.picus@gmail.com>2016-03-11 15:21:05 +0200
commit2217a6e09a535cddcacb7f55bc3003488a5919a1 (patch)
tree55ea8e9c645e6b491d1d6a5255fe526767b16721 /testrunner
parentmerged upstream (diff)
downloadpypy-2217a6e09a535cddcacb7f55bc3003488a5919a1.tar.gz
pypy-2217a6e09a535cddcacb7f55bc3003488a5919a1.tar.bz2
pypy-2217a6e09a535cddcacb7f55bc3003488a5919a1.zip
when running tests in parallel, restrict make to a single core
Diffstat (limited to 'testrunner')
-rw-r--r--testrunner/runner.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/testrunner/runner.py b/testrunner/runner.py
index f2619a548b..cb2ccd534d 100644
--- a/testrunner/runner.py
+++ b/testrunner/runner.py
@@ -237,6 +237,11 @@ def execute_tests(run_param, testdirs, logfile, out):
N = run_param.parallel_runs
if N > 1:
out.write("running %d parallel test workers\n" % N)
+ s = 'setting'
+ if os.environ.get('MAKEFLAGS'):
+ s = 'overriding'
+ out.write("%s MAKEFLAGS to '-j1'\n" % s)
+ os.environ['MAKEFLAGS'] = '-j1'
failure = False
for testname in testdirs: