[pypy-svn] r69653 - pypy/build/bot2/pypybuildbot

pedronis at codespeak.net pedronis at codespeak.net
Thu Nov 26 16:05:29 CET 2009


Author: pedronis
Date: Thu Nov 26 16:05:28 2009
New Revision: 69653

Modified:
   pypy/build/bot2/pypybuildbot/builds.py
   pypy/build/bot2/pypybuildbot/master.py
Log:
simplify own build factory



Modified: pypy/build/bot2/pypybuildbot/builds.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/builds.py	(original)
+++ pypy/build/bot2/pypybuildbot/builds.py	Thu Nov 26 16:05:28 2009
@@ -87,12 +87,10 @@
                                workdir=workdir))
 
 
-class PyPyOwnTestFactory(factory.BuildFactory):
+class Own(factory.BuildFactory):
 
-    def __init__(self, *a, **kw):
-        platform = kw.pop('platform', 'linux')
-        cherrypick = kw.pop('cherrypick', '')
-        factory.BuildFactory.__init__(self, *a, **kw)
+    def __init__(self, platform='linux', cherrypick='', extra_cfgs=[]):
+        factory.BuildFactory.__init__(self)
 
         setup_steps(platform, self)
 
@@ -102,7 +100,8 @@
                      "--logfile=testrun.log",
                      "--config=pypy/testrunner_cfg.py",
                      "--config=~/machine_cfg.py",
-                     "--root=pypy", "--timeout=10800"],
+                     "--root=pypy", "--timeout=10800"
+                     ] + ["--config=%s" % cfg for cfg in extra_cfgs],
             logfiles={'pytestLog': 'testrun.log'},
             timeout = 4000,
             env={"PYTHONPATH": ['.'],

Modified: pypy/build/bot2/pypybuildbot/master.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/master.py	(original)
+++ pypy/build/bot2/pypybuildbot/master.py	Thu Nov 26 16:05:28 2009
@@ -44,10 +44,9 @@
 
 pypybuilds = load('pypybuildbot.builds')
 
-pypyOwnTestFactory = pypybuilds.PyPyOwnTestFactory()
-pypyOwnTestFactoryWin = pypybuilds.PyPyOwnTestFactory(platform="win32")
-
-pypyJitOnlyOwnTestFactory = pypybuilds.PyPyOwnTestFactory(cherrypick="jit")
+pypyOwnTestFactory = pypybuilds.Own()
+pypyOwnTestFactoryWin = pypybuilds.Own(platform="win32")
+pypyJitOnlyOwnTestFactory = pypybuilds.Own(cherrypick="jit")
 
 pypyTranslatedLibPythonTestFactory = pypybuilds.PyPyTranslatedLibPythonTestFactory()
 pypyTranslatedLibPythonTestFactoryWin = pypybuilds.PyPyTranslatedLibPythonTestFactory(platform="win32")



More information about the Pypy-commit mailing list