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

arigo at codespeak.net arigo at codespeak.net
Mon Sep 21 19:50:37 CEST 2009


Author: arigo
Date: Mon Sep 21 19:50:37 2009
New Revision: 67835

Modified:
   pypy/build/bot2/pypybuildbot/builds.py
   pypy/build/bot2/pypybuildbot/master.py
Log:
(pedronis, arigo)
Add a "jit-only" tests builder.


Modified: pypy/build/bot2/pypybuildbot/builds.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/builds.py	(original)
+++ pypy/build/bot2/pypybuildbot/builds.py	Mon Sep 21 19:50:37 2009
@@ -91,6 +91,7 @@
 
     def __init__(self, *a, **kw):
         platform = kw.pop('platform', 'linux')
+        cherrypick = kw.pop('cherrypick', '')
         factory.BuildFactory.__init__(self, *a, **kw)
 
         setup_steps(platform, self)
@@ -104,7 +105,8 @@
                      "--root=pypy", "--timeout=10800"],
             logfiles={'pytestLog': 'testrun.log'},
             timeout = 4000,
-            env={"PYTHONPATH": ['.']}))
+            env={"PYTHONPATH": ['.'],
+                 "PYPYCHERRYPICK": cherrypick}))
 
 class PyPyTranslatedLibPythonTestFactory(factory.BuildFactory):
 

Modified: pypy/build/bot2/pypybuildbot/master.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/master.py	(original)
+++ pypy/build/bot2/pypybuildbot/master.py	Mon Sep 21 19:50:37 2009
@@ -44,6 +44,8 @@
 pypyOwnTestFactory = pypybuilds.PyPyOwnTestFactory()
 pypyOwnTestFactoryWin = pypybuilds.PyPyOwnTestFactory(platform="win32")
 
+pypyJitOnlyOwnTestFactory = pypybuilds.PyPyOwnTestFactory(cherrypick="jit")
+
 pypyTranslatedLibPythonTestFactory = pypybuilds.PyPyTranslatedLibPythonTestFactory()
 pypyTranslatedLibPythonTestFactoryWin = pypybuilds.PyPyTranslatedLibPythonTestFactory(platform="win32")
 pypyTranslatedLibPythonMaemoTestFactory = pypybuilds.PyPyTranslatedScratchboxTestFactory()
@@ -61,7 +63,8 @@
 APPLVLLINUX32 = "pypy-c-app-level-linux-x86-32"
 STACKLESSAPPLVLLINUX32 = "pypy-c-stackless-app-level-linux-x86-32"
 CPYFREEBSD64 = 'pypy-c-lib-python-freebsd-7-x86-64'
-JITLINUX32 = "pypy-c-jit-lib-python-linux-x86-32"
+JITCPYLINUX32 = "pypy-c-jit-lib-python-linux-x86-32"
+JITONLYLINUX32 = "jitonly-own-linux-x86-32"
 
 BuildmasterConfig = {
     'slavePortnum': slavePortnum,
@@ -69,7 +72,7 @@
     'change_source': [],
     'schedulers': [
     	Nightly("nightly", [LINUX32, CPYLINUX32, APPLVLLINUX32, CPYWIN32,
-                            STACKLESSAPPLVLLINUX32, JITLINUX32],
+                            STACKLESSAPPLVLLINUX32, JITCPYLINUX32],
                 hour=4, minute=45),
     ],   
     'status': [status],
@@ -127,12 +130,18 @@
                    'factory' : pypyTranslatedLibPythonTestFactory,
                    "category": 'other'
                    },
-                  {"name" : JITLINUX32,
+                  {"name" : JITCPYLINUX32,
                    "slavenames": ["bigdogvm1"],
-                   'builddir' : JITLINUX32,
+                   'builddir' : JITCPYLINUX32,
                    'factory' : pypyJITTranslatedTestFactory,
                    'category' : 'lib-python',
-                   }
+                   },
+                  {"name": JITONLYLINUX32,
+                   "slavenames": ["wyvern"],
+                   "builddir": JITONLYLINUX32,
+                   "factory": pypyJitOnlyOwnTestFactory,
+                   "category": 'own'
+                  },
                 ],
 
     'buildbotURL': 'http://codespeak.net:%d/'%(httpPortNumber),



More information about the Pypy-commit mailing list