[pypy-svn] r57721 - pypy/build/bot

[exarkun at codespeak.net]

Author: exarkun
Date: Mon Sep  1 14:39:41 2008
New Revision: 57721

Modified:
   pypy/build/bot/master.cfg
   pypy/build/bot/pypybuilders.py
Log:
django and new optimization options

Modified: pypy/build/bot/master.cfg
==============================================================================
--- pypy/build/bot/master.cfg	(original)
+++ pypy/build/bot/master.cfg	Mon Sep  1 14:39:41 2008
@@ -42,26 +42,26 @@
                    "slavenames": ["charm"],
                    "builddir": "pypy-c-allworkingmodules-32",
                    "factory": POSIXPyPyBuildFactory(
-                       ["--boxed"], [], ["--allworkingmodules"])},
+                       ["--boxed"], ["-O0"], [])},
 
                   {"name": "pypy-c-allworkingmodules-O3-32",
                    "slavenames": ["charm"],
                    "builddir": "pypy-c-allworkingmodules-faassen-32",
                    "factory": POSIXPyPyBuildFactory(
-                       None, ["--gc=hybrid", "--gcrootfinder=asmgcc", "-O3"],
-                       ["--allworkingmodules"])},
+                       None, ["-O3", "--gcrootfinder=asmgcc"],
+                       [])},
 
                  {"name": "pypy-c-allworkingmodules-O3-64",
                   "slavenames": ["linux-dvs0"],
                   "builddir": "pypy-c-allworkingmodules-faassen-64",
                   "factory": POSIXPyPyBuildFactory(
-                      ["--boxed"], ["-O3"], ["--allworkingmodules"])},
+                      ["--boxed"], ["-O3"], [], django=True)},
 
                   {"name": "pypy-c-allworkingmodules-winxp32",
                    "slavenames": ["winxp32-py2.5"],
                    "builddir": "pypy-c-allworkingmodules-faassen-winxp32",
                    "factory": WindowsPyPyBuildFactory(
-                       ["--boxed"], [], ["--allworkingmodules"])},
+                       ["--boxed"], ["-O0"], [], django=True)},
                 ],
 
     'buildbotURL': 'http://office.divmod.com:%d/' % (httpPortNumber,),

Modified: pypy/build/bot/pypybuilders.py
==============================================================================
--- pypy/build/bot/pypybuilders.py	(original)
+++ pypy/build/bot/pypybuilders.py	Mon Sep  1 14:39:41 2008
@@ -105,6 +105,7 @@
 
     def __init__(self, pytestArguments, translationArguments,
                  targetArguments, *a, **kw):
+        django = kw.pop('django', False)
         BuildFactory.__init__(self, *a, **kw)
 
         self.addStep(
@@ -175,13 +176,35 @@
 #             tests=["twisted"],
 #             env={"PATH": "."})
 
+        if django:
+            self.addStep(
+                SVN,
+                workdir="build/Django-src",
+                svnurl="http://code.djangoproject.com/svn/django/trunk/",
+                mode="copy")
+            self.addStep(
+                FileDownload,
+                mastersrc="django-settings.py",
+                slavedest="tests/settings.py",
+                workdir="build/Django-src")
+            self.addStep(
+                ShellCommand,
+                command=[self.sep.join([
+                            "..", "..", "pypy-src", "pypy", "translator",
+                            "goal", self.executable]),
+                         "runtests.py", "-v", "2",
+                         "--settings=settings"],
+                workdir="build/Django-src/tests",
+                env={'PYTHONPATH': '..'})
 
 
 class POSIXPyPyBuildFactory(PyPyBuildFactory):
     PyTestStep = POSIXPyTest
+    sep = '/'
 
 
 
 class WindowsPyPyBuildFactory(PyPyBuildFactory):
     PyTestStep = WindowsPyTest
     executable = "pypy-c.exe"
+    sep = '\\'