aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Rigo <arigo@tunes.org>2009-09-25 13:52:00 +0000
committerArmin Rigo <arigo@tunes.org>2009-09-25 13:52:00 +0000
commit932ce315e6ef6463c9c303be0bfc688cbfa288a4 (patch)
tree79efbf8e820f9dabd5699f4435656ebc3f4850c9 /pypy/testrunner_cfg.py
parentmake MultipleFrozenPBC immutable on ootype too (diff)
downloadpypy-932ce315e6ef6463c9c303be0bfc688cbfa288a4.tar.gz
pypy-932ce315e6ef6463c9c303be0bfc688cbfa288a4.tar.bz2
pypy-932ce315e6ef6463c9c303be0bfc688cbfa288a4.zip
(pedronis, arigo)
Merge the branch/remove-plfbid. The main change is to not keep any loop around. Changed the interface to the backend. Cleaned up internals of x86 and other things.
Diffstat (limited to 'pypy/testrunner_cfg.py')
-rw-r--r--pypy/testrunner_cfg.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pypy/testrunner_cfg.py b/pypy/testrunner_cfg.py
index 7561b9584c..4f3572cb1d 100644
--- a/pypy/testrunner_cfg.py
+++ b/pypy/testrunner_cfg.py
@@ -1,4 +1,5 @@
# nightly test configuration for the paraller runner
+import os
def collect_one_testdir(testdirs, reldir, tests):
if (reldir.startswith('translator/c/') or
@@ -10,4 +11,7 @@ def collect_one_testdir(testdirs, reldir, tests):
else:
testdirs.append(reldir)
-
+
+_cherrypick = os.getenv('PYPYCHERRYPICK', '')
+if _cherrypick:
+ cherrypick = _cherrypick.split(':')