Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r735:5aea4cf91fcc
Date: 2013-01-20 16:18 +0200
http://bitbucket.org/pypy/buildbot/changeset/5aea4cf91fcc/
Log: merge
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -367,7 +367,7 @@
timeout=kwargs.get('timeout', 4000)
self.addStep(PytestCmd(
- description="pytest",
+ description="pytest pypy",
command=["python", "testrunner/runner.py",
"--logfile=testrun.log",
"--config=pypy/testrunner_cfg.py",
@@ -379,6 +379,19 @@
env={"PYTHONPATH": ['.'],
"PYPYCHERRYPICK": cherrypick}))
+ self.addStep(PytestCmd(
+ description="pytest rpython",
+ command=["python", "testrunner/runner.py",
+ "--logfile=testrun.log",
+ "--config=pypy/testrunner_cfg.py",
+ "--config=~/machine_cfg.py",
+ "--root=rpython", "--timeout=%s" % (timeout,)
+ ] + ["--config=%s" % cfg for cfg in extra_cfgs],
+ logfiles={'pytestLog': 'testrun.log'},
+ timeout=timeout,
+ env={"PYTHONPATH": ['.'],
+ "PYPYCHERRYPICK": cherrypick}))
+
class Translated(factory.BuildFactory):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
