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

[exarkun at codespeak.net]

Author: exarkun
Date: Fri Sep 12 16:35:33 2008
New Revision: 58083

Added:
   pypy/build/bot/django-settings.py
Modified:
   pypy/build/bot/master.cfg
   pypy/build/bot/netstring_conftest.py
   pypy/build/bot/per-directory-py-test.py
Log:
move slaves from charm to bigdogvm1

Added: pypy/build/bot/django-settings.py
==============================================================================
--- (empty file)
+++ pypy/build/bot/django-settings.py	Fri Sep 12 16:35:33 2008
@@ -0,0 +1,2 @@
+ROOT_URLCONF=""
+DATABASE_ENGINE="sqlite3"

Modified: pypy/build/bot/master.cfg
==============================================================================
--- pypy/build/bot/master.cfg	(original)
+++ pypy/build/bot/master.cfg	Fri Sep 12 16:35:33 2008
@@ -26,8 +26,9 @@
 
     'change_source': [],
     'schedulers': [Nightly("nightly", [
-                           "pypy-c-allworkingmodules-32",
-                           "pypy-c-allworkingmodules-O3-32",
+                           "pypy-c-32-O0",
+                           "pypy-c-32-O2",
+                           "pypy-c-32-O3",
                            "pypy-c-allworkingmodules-O3-64",
                            "pypy-c-allworkingmodules-winxp32"],
                            hour=19)],
@@ -38,30 +39,35 @@
                in passwords.iteritems()],
 
     'builders': [
-                  {"name": "pypy-c-allworkingmodules-32",
-                   "slavenames": ["charm"],
-                   "builddir": "pypy-c-allworkingmodules-32",
+                  {"name": "pypy-c-32-O0",
+                   "slavenames": ["bigdogvm1"],
+                   "builddir": "pypy-c-32-O0",
                    "factory": POSIXPyPyBuildFactory(
                        ["--boxed"], ["-O0"], [])},
 
-                  {"name": "pypy-c-allworkingmodules-O3-32",
-                   "slavenames": ["charm"],
-                   "builddir": "pypy-c-allworkingmodules-faassen-32",
+                  {"name": "pypy-c-32-O2",
+                   "slavenames": ["bigdogvm1"],
+                   "builddir": "pypy-c-32-O2",
                    "factory": POSIXPyPyBuildFactory(
-                       None, ["-O3", "--gcrootfinder=asmgcc"],
-                       [])},
+                       None, ["-O2"], [], django=True)},
+
+                  {"name": "pypy-c-32-O3",
+                   "slavenames": ["bigdogvm1"],
+                   "builddir": "pypy-c-32-O3",
+                   "factory": POSIXPyPyBuildFactory(
+                       None, ["-O3"], [])},
 
                  {"name": "pypy-c-allworkingmodules-O3-64",
                   "slavenames": ["linux-dvs0"],
                   "builddir": "pypy-c-allworkingmodules-faassen-64",
                   "factory": POSIXPyPyBuildFactory(
-                      ["--boxed"], ["-O3"], [], django=True)},
+                      ["--boxed"], ["-O3"], [])},
 
                   {"name": "pypy-c-allworkingmodules-winxp32",
                    "slavenames": ["winxp32-py2.5"],
                    "builddir": "pypy-c-allworkingmodules-faassen-winxp32",
                    "factory": WindowsPyPyBuildFactory(
-                       ["--boxed"], ["-O0"], [], django=True)},
+                       ["--boxed"], ["-O0"], [])},
                 ],
 
     'buildbotURL': 'http://office.divmod.com:%d/' % (httpPortNumber,),

Modified: pypy/build/bot/netstring_conftest.py
==============================================================================
--- pypy/build/bot/netstring_conftest.py	(original)
+++ pypy/build/bot/netstring_conftest.py	Fri Sep 12 16:35:33 2008
@@ -8,11 +8,11 @@
 from twisted.spread.jelly import jelly
 import cPickle
 
-from bot.netstring import netstring
+from netstring import netstring
 from StringIO import StringIO
 
 def itemrepr(item):
-    return (item.__class__.__name__, item.listnames())    
+    return (item.__class__.__name__, item.listnames())
 
 class MyReporter(AbstractReporter):
     def __init__(self, *args, **kwds):

Modified: pypy/build/bot/per-directory-py-test.py
==============================================================================
--- pypy/build/bot/per-directory-py-test.py	(original)
+++ pypy/build/bot/per-directory-py-test.py	Fri Sep 12 16:35:33 2008
@@ -5,9 +5,12 @@
 def runPyPyTests(pythonExe, rootDir, args):
     command = [pythonExe, r"py\bin\py.test"] + list(args)
 
+    print 'Walking', repr(rootDir)
     for rootDir, dirs, files in os.walk(rootDir):
+        print 'Found', repr(rootDir), repr(dirs), repr(files)
         if "test" in dirs:
             testDir = os.path.join(rootDir, "test")
+            print 'Running', repr(command + [testDir])
             subprocess.call(command + [testDir])
 
 def main():