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

[pedronis at codespeak.net]

Author: pedronis
Date: Mon Oct  6 16:53:58 2008
New Revision: 58665

Modified:
   pypy/build/bot2/pypybuildbot/master.py
   pypy/build/bot2/pypybuildbot/steps.py
Log:
(hpk, pedronis)

experimental setup for a translating+run cpython test builder



Modified: pypy/build/bot2/pypybuildbot/master.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/master.py	(original)
+++ pypy/build/bot2/pypybuildbot/master.py	Mon Oct  6 16:53:58 2008
@@ -25,6 +25,8 @@
 pypyOwnTestFactory = pypysteps.PyPyOwnTestFactory()
 pypyOwnTestFactoryWin = pypysteps.PyPyOwnTestFactory(platform="win32")
 
+pypyTranslatedLibPythonTestFactory = pypysteps.PyPyTranslaledLibPythonTestFactory()
+
 BuildmasterConfig = {
     'slavePortnum': slavePortnum,
 
@@ -44,6 +46,12 @@
                    "builddir": "own-linux-x86-32",
                    "factory": pypyOwnTestFactory
                   },
+                  {"name": "pypy-c-lib-python-linux-x86-32",
+                   "slavenames": ["wyvern"],
+                   "builddir": "pypy-c-lib-python-linux-x86-32",
+                   "factory": pypyTranslatedLibPythonTestFactory
+                  },
+                  
                 ],
 
     'buildbotURL': 'http://wyvern.cs.uni-duesseldorf.de:%d/'%(httpPortNumber),

Modified: pypy/build/bot2/pypybuildbot/steps.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/steps.py	(original)
+++ pypy/build/bot2/pypybuildbot/steps.py	Mon Oct  6 16:53:58 2008
@@ -32,32 +32,53 @@
             self.setStatus(None, SUCCESS)
             self.finished(SUCCESS)
 
+class Translate(shell.ShellCommand):
+    name = "translate"
+    description = ["translating"]
+    descriptionDone = ["translation"]
+
+    command = ["echo", "python", "translate.py", "--batch"]
+    translationTarget = "targetpypystandalone"
+
+    def __init__(self, translationArgs, targetArgs,
+                 workdir="build/pypy/translator/goal",
+                 *a, **kw):
+        self.command = (self.command + translationArgs +
+                        [self.translationTarget] + targetArgs)
+        ShellCommand.__init__(self, workdir, *a, **kw)
+
+
 # ________________________________________________________________
 
 def not_first_time(props):
     first_time = props.getProperty("first-time")
     return not first_time 
 
+def setup_steps(platform, factory):
+    if platform == "win32":
+        first_time_check = WindowsFirstTime()
+    else:
+        first_time_check = PosixFirstTime()
+
+    factory.addStep(first_time_check)
+    factory.addStep(CondShellCommand(
+        description="wcrevert",
+        cond=not_first_time,
+        command = ["python", "py/bin/py.svnwcrevert", 
+                   "-p.buildbot-sourcedata", "."],
+        ))
+    factory.addStep(source.SVN(baseURL="http://codespeak.net/svn/pypy/",
+                            defaultBranch="dist"))    
+
+
 class PyPyOwnTestFactory(factory.BuildFactory):
 
     def __init__(self, *a, **kw):
         platform = kw.pop('platform', 'linux')
         factory.BuildFactory.__init__(self, *a, **kw)
 
-        if platform == "win32":
-            first_time_check = WindowsFirstTime()
-        else:
-            first_time_check = PosixFirstTime()
-
-        self.addStep(first_time_check)
-        self.addStep(CondShellCommand(
-            description="wcrevert",
-            cond=not_first_time,
-            command = ["python", "py/bin/py.svnwcrevert", 
-                       "-p.buildbot-sourcedata", "."],
-            ))
-        self.addStep(source.SVN(baseURL="http://codespeak.net/svn/pypy/",
-                                defaultBranch="dist"))
+        setup_steps(platform, factory)
+
         self.addStep(shell.ShellCommand(
             description="pytest",
             command=["python", "testrunner/runner.py",
@@ -67,3 +88,20 @@
                      "--root=pypy"],
             logfiles={'pytestLog': 'testrun.log'},
             env={"PYTHONPATH": ['.']}))
+
+class PyPyTranslaledLibPythonTestFactory(factory.BuildFactory):
+
+    def __init__(self, *a, **kw):
+        platform = kw.pop('platform', 'linux')
+        factory.BuildFactory.__init__(self, *a, **kw)
+
+        setup_steps(platform, factory)
+
+        self.addStep(Translate(["-O0"], ["-no-allworkingmodules"])
+
+        self.addStep(shell.ShellCommand(
+            description="lib-python test",
+            command=["python", "pypy/test_all.py",
+                     "--pypy=pypy/translator/goal/pypy-c",
+                     "--resultlog=cpython.log"],           
+            logfiles={'pytestLog': 'cpython.log'}))