Author: Armin Rigo <[email protected]>
Branch:
Changeset: r1018:27fa8b5fac2b
Date: 2016-11-13 15:56 +0100
http://bitbucket.org/pypy/buildbot/changeset/27fa8b5fac2b/
Log: update:
* pypy/module/test/: don't run it again with the '--pypy' option,
which has been pointless since a while
* pypy/module/test_pypy_c/: run it with the '--pypy' option instead
of using 'pypy py.test'. This will only work on modern pypy's with
the changeset d9c685ecab5e or dd2ec76131ce.
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -466,15 +466,15 @@
# kill this step when the transition to test_pypy_c_new has been
# completed
# "old" test_pypy_c
- factory.addStep(PytestCmd(
- description="pypyjit tests",
- command=prefix + ["python", "pypy/test_all.py",
- "--pypy=pypy/goal/pypy-c",
- "--resultlog=pypyjit.log",
- "pypy/module/pypyjit/test"],
- logfiles={'pytestLog': 'pypyjit.log'},
- env={"TMPDIR": Interpolate('%(prop:target_tmpdir)s' + pytest),
- }))
+ #factory.addStep(PytestCmd(
+ # description="pypyjit tests",
+ # command=prefix + ["python", "pypy/test_all.py",
+ # "--pypy=pypy/goal/pypy-c",
+ # "--resultlog=pypyjit.log",
+ # "pypy/module/pypyjit/test"],
+ # logfiles={'pytestLog': 'pypyjit.log'},
+ # env={"TMPDIR": Interpolate('%(prop:target_tmpdir)s' + pytest),
+ # }))
#
# "new" test_pypy_c
if platform == 'win32':
@@ -483,7 +483,8 @@
cmd = 'pypy/goal/pypy-c'
factory.addStep(PytestCmd(
description="pypyjit tests",
- command=prefix + [cmd, "pypy/test_all.py",
+ command=prefix + ["python", "pypy/test_all.py",
+ "--pypy=%s" % (cmd,),
"--resultlog=pypyjit_new.log",
"pypy/module/pypyjit/test_pypy_c"],
logfiles={'pytestLog': 'pypyjit_new.log'},
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
