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

[pedronis at codespeak.net]

Author: pedronis
Date: Sun Nov  2 13:23:31 2008
New Revision: 59649

Modified:
   pypy/build/bot2/pypybuildbot/builds.py
   pypy/build/bot2/pypybuildbot/master.py
Log:
experimental setup for py.test -A tests



Modified: pypy/build/bot2/pypybuildbot/builds.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/builds.py	(original)
+++ pypy/build/bot2/pypybuildbot/builds.py	Sun Nov  2 13:23:31 2008
@@ -120,6 +120,26 @@
                      "--resultlog=cpython.log", "lib-python"],           
             logfiles={'pytestLog': 'cpython.log'}))
 
+class PyPyTranslatedAppLevelTestFactory(factory.BuildFactory):
+
+    def __init__(self, *a, **kw):
+        platform = kw.pop('platform', 'linux')
+        factory.BuildFactory.__init__(self, *a, **kw)
+
+        setup_steps(platform, self)
+
+        self.addStep(Translate(["-O2"], []))
+
+        self.addStep(ShellCmd(
+            description="app-level (-A) test",
+            command=["python", "testrunner/runner.py",
+                     "--logfile=pytest-A.log",
+                     "--config=pypy/pytest-A.cfg",
+                     "--root=pypy", "--timeout=1800"],
+            logfiles={'pytestLog': 'pytest-A.log'},
+            timeout = 4000,
+            env={"PYTHONPATH": ['.']}))
+
 class PyPyTranslatedScratchboxTestFactory(factory.BuildFactory):
     def __init__(self, *a, **kw):
         platform = kw.pop('platform', 'linux')

Modified: pypy/build/bot2/pypybuildbot/master.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/master.py	(original)
+++ pypy/build/bot2/pypybuildbot/master.py	Sun Nov  2 13:23:31 2008
@@ -29,12 +29,14 @@
 pypyTranslatedLibPythonTestFactoryWin = pypybuilds.PyPyTranslatedLibPythonTestFactory(platform="win32")
 pypyTranslatedLibPythonMaemoTestFactory = pypybuilds.PyPyTranslatedScratchboxTestFactory()
 
+pypyTranslatedAppLevelTestFactory = pypybuilds.PyPyTranslatedAppLevelTestFactory()
 
 LINUX32 = "own-linux-x86-32"
 CPYLINUX32 = "pypy-c-lib-python-linux-x86-32"
 CPYWIN32 = "pypy-c-lib-python-win-32"
 CPYLINUX32_VM = 'pypy-c-lib-python-linux-x86-32vm'
 CPYMAEMO = "pypy-c-lib-python-maemo"
+APPLLVLINUX32 = "pypy-c-app-level-linux-x86-32"
 
 BuildmasterConfig = {
     'slavePortnum': slavePortnum,
@@ -60,6 +62,11 @@
                    "builddir": CPYLINUX32,
                    "factory": pypyTranslatedLibPythonTestFactory
                   },
+                  {"name": APPLVLLINUX32,
+                   "slavenames": ["wyvern", "cobra"],
+                   "builddir": APPLVLLINUX32,
+                   "factory": pypyTranslatedAppLevelTestFactory
+                  },                  
                   {"name" : CPYLINUX32_VM,
                    "slavenames": ['bigdogvm1'],
                    "builddir": CPYLINUX32_VM,