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

[fijal at codespeak.net]

Author: fijal
Date: Fri May  1 00:13:31 2009
New Revision: 64894

Modified:
   pypy/build/bot2/pypybuildbot/builds.py
   pypy/build/bot2/pypybuildbot/master.py
Log:
Add a jit lib-python build. (yay!)


Modified: pypy/build/bot2/pypybuildbot/builds.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/builds.py	(original)
+++ pypy/build/bot2/pypybuildbot/builds.py	Fri May  1 00:13:31 2009
@@ -62,24 +62,6 @@
         self.command = (self.command + translationArgs +
                         [self.translationTarget] + targetArgs)
 
-class TranslateJIT(ShellCmd):
-    name = "translate_jit"
-    description = ["translating"]
-    descriptionDone = ["translation"]
-
-    command = ["python", "../../translator/goal/translate.py", "--jit", "--batch"]
-    translationTarget = "targetpypyjit"
-
-    def __init__(self, translationArgs, targetArgs,
-                 workdir="build/pypy/jit/tl",
-                 *a, **kw):
-        kw['translationArgs'] = translationArgs
-        kw['targetArgs'] = targetArgs
-        kw['timeout'] = 3600
-        ShellCmd.__init__(self, workdir, *a, **kw)
-        self.command = (self.command + translationArgs +
-                        [self.translationTarget] + targetArgs)
-
 # ________________________________________________________________
 
 def not_first_time(props):
@@ -211,12 +193,18 @@
             description="copy build",
             command=["scp", "pypy-c", "fijal at codespeak.net:builds/pypy-c-scratchbox"], workdir = workdir))
 
-class PyPyJITTranslatedTestFactory(factory.BuildFactory):
+class PyPyJITTranslatedLibPythonTestFactory(factory.BuildFactory):
     def __init__(self, *a, **kw):
         platform = kw.pop('platform', 'linux')
         factory.BuildFactory.__init__(self, *a, **kw)
 
         setup_steps(platform, self)
 
-        self.addStep(TranslateJIT([], []))
+        self.addStep(Translate(['--jit'], ['--withoutmod-thread']))
         
+        self.addStep(ShellCmd(
+            description="lib-python test",
+            command=["python", "pypy/test_all.py",
+                     "--pypy=pypy/translator/goal/pypy-c",
+                     "--resultlog=cpython.log", "lib-python"],           
+            logfiles={'pytestLog': 'cpython.log'}))

Modified: pypy/build/bot2/pypybuildbot/master.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/master.py	(original)
+++ pypy/build/bot2/pypybuildbot/master.py	Fri May  1 00:13:31 2009
@@ -34,7 +34,7 @@
 pypyTranslatedAppLevelTestFactory = pypybuilds.PyPyTranslatedAppLevelTestFactory()
 
 pypyStacklessTranslatedAppLevelTestFactory = pypybuilds.PyPyStacklessTranslatedAppLevelTestFactory()
-pypyJITTranslatedTestFactory = pypybuilds.PyPyJITTranslatedTestFactory()
+pypyJITTranslatedTestFactory = pypybuilds.PyPyJITTranslatedLibPythonTestFactory()
 
 LINUX32 = "own-linux-x86-32"
 CPYLINUX32 = "pypy-c-lib-python-linux-x86-32"
@@ -56,7 +56,7 @@
                 hour=0, minute=45, branch="release/1.1.x",
                 ),    
     	Nightly("nightly", [LINUX32, CPYLINUX32, APPLVLLINUX32, CPYWIN32,
-                            STACKLESSAPPLVLLINUX32],
+                            STACKLESSAPPLVLLINUX32, JITLINUX32],
                 hour=4, minute=45),
     ],   
     'status': [status],
@@ -115,7 +115,7 @@
                    "category": 'other'
                    },
                   {"name" : JITLINUX32,
-                   "slavenames": ["wyvern"],
+                   "slavenames": ["bigdogvm1"],
                    'builddir' : JITLINUX32,
                    'factory' : pypyJITTranslatedTestFactory,
                    'category' : 'other',