[pypy-commit] buildbot default: make prefix a parameter

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r684:60120437fc4f
Date: 2012-09-06 15:00 +0000
http://bitbucket.org/pypy/buildbot/changeset/60120437fc4f/

Log:	make prefix a parameter

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -267,7 +267,6 @@
 
 
 class Translated(factory.BuildFactory):
-    prefix = []
 
     def __init__(self, platform='linux',
                  translationArgs=['-O2'], targetArgs=[],
@@ -275,23 +274,24 @@
                  interpreter='pypy',
                  lib_python=False,
                  pypyjit=False,
-                 **kwargs
+                 prefix=None
                  ):
         factory.BuildFactory.__init__(self)
-        if 'prefix' in kwargs:
-           self.prefix = kwargs['prefix'].split()
+        if prefix is not None:
+            prefix = prefix.split()
+        else:
+            prefix = []
 
         setup_steps(platform, self)
 
         self.addStep(Translate(translationArgs, targetArgs,
                                interpreter=interpreter))
-
         if app_tests:
             if app_tests == True:
                 app_tests = []
             self.addStep(PytestCmd(
                 description="app-level (-A) test",
-                command=self.prefix + ["python", "testrunner/runner.py",
+                command=prefix + ["python", "testrunner/runner.py",
                          "--logfile=pytest-A.log",
                          "--config=pypy/pytest-A.cfg",
                          "--root=pypy", "--timeout=1800"
@@ -303,7 +303,7 @@
         if lib_python:
             self.addStep(PytestCmd(
                 description="lib-python test",
-                command=self.prefix + ["python", "pypy/test_all.py",
+                command=prefix + ["python", "pypy/test_all.py",
                          "--pypy=pypy/translator/goal/pypy-c",
                          "--resultlog=cpython.log", "lib-python"],
                 logfiles={'pytestLog': 'cpython.log'}))
@@ -314,7 +314,7 @@
             # "old" test_pypy_c
             self.addStep(PytestCmd(
                 description="pypyjit tests",
-                command=self.prefix + ["python", "pypy/test_all.py",
+                command=prefix + ["python", "pypy/test_all.py",
                          "--pypy=pypy/translator/goal/pypy-c",
                          "--resultlog=pypyjit.log",
                          "pypy/module/pypyjit/test"],
@@ -327,7 +327,7 @@
                 cmd = 'pypy/translator/goal/pypy-c'
             self.addStep(PytestCmd(
                 description="pypyjit tests",
-                command=self.prefix + [cmd, "pypy/test_all.py",
+                command=prefix + [cmd, "pypy/test_all.py",
                          "--resultlog=pypyjit_new.log",
                          "pypy/module/pypyjit/test_pypy_c"],
                 logfiles={'pytestLog': 'pypyjit_new.log'}))
@@ -346,7 +346,7 @@
         name = 'pypy-c-' + kind + '-%(final_file_name)s-' + platform
         self.addStep(ShellCmd(
             description="compress pypy-c",
-            command=self.prefix + ["python", "pypy/tool/release/package.py",
+            command=prefix + ["python", "pypy/tool/release/package.py",
                      ".", WithProperties(name), 'pypy',
                      '.'],
             workdir='build'))