[pypy-commit] buildbot default: merge from win32-cleanup

[RonnyPfannschmidt]

Author: Ronny Pfannschmidt <Ronny.Pfannschmidt at gmx.de>
Branch: 
Changeset: r642:64eeefddd046
Date: 2012-04-27 08:36 +0200
http://bitbucket.org/pypy/buildbot/changeset/64eeefddd046/

Log:	merge from win32-cleanup

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -314,9 +314,13 @@
                 logfiles={'pytestLog': 'pypyjit.log'}))
             #
             # "new" test_pypy_c
+            if platform == 'win32':
+                cmd = r'pypy\translator\goal\pypy-c'
+            else:
+                cmd = 'pypy/translator/goal/pypy-c'
             self.addStep(PytestCmd(
                 description="pypyjit tests",
-                command=["pypy/translator/goal/pypy-c", "pypy/test_all.py",
+                command=[cmd, "pypy/test_all.py",
                          "--resultlog=pypyjit_new.log",
                          "pypy/module/pypyjit/test_pypy_c"],
                 logfiles={'pytestLog': 'pypyjit_new.log'}))
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -184,7 +184,7 @@
     ##         JITLINUX32,                # on tannit32, uses 1 core
     ##         JITLINUX64,                # on tannit64, uses 1 core
     ##         OJITLINUX32,               # on tannit32, uses 1 core
-    ##         JITWIN32,                  # on bigboard
+    ##         JITWIN32,                  # on aurora
     ##         STACKLESSAPPLVLFREEBSD64,  # on headless
     ##         JITMACOSX64,               # on mvt's machine
     ##         ], hour=4, minute=0),
@@ -225,7 +225,7 @@
             APPLVLLINUX32,             # on tannit32, uses 1 core
             APPLVLLINUX64,             # on tannit64, uses 1 core
             #
-            JITWIN32,                  # on bigboard
+            JITWIN32,                  # on aurora
             #JITFREEBSD64,              # on headless
             JITMACOSX64,               # on mvt's machine
             ], branch=None, hour=3, minute=0),
@@ -348,7 +348,7 @@
                    'category' : 'mac64',
                    },
                   {"name": WIN32,
-                   "slavenames": ["aurora", "SalsaSalsa", "snakepit32", "bigboard"],
+                   "slavenames": ["aurora", "SalsaSalsa"],
                    "builddir": WIN32,
                    "factory": pypyOwnTestFactoryWin,
                    "category": 'win32'
@@ -360,13 +360,13 @@
                    "category": 'win32'
                   },
                   {"name": APPLVLWIN32,
-                   "slavenames": ["aurora", "SalsaSalsa", "snakepit32", "bigboard"],
+                   "slavenames": ["aurora", "SalsaSalsa"],
                    "builddir": APPLVLWIN32,
                    "factory": pypyTranslatedAppLevelTestFactoryWin,
                    "category": "win32"
                   },
                   {"name" : JITWIN32,
-                   "slavenames": ["aurora", "SalsaSalsa", "snakepit32", "bigboard"],
+                   "slavenames": ["aurora", "SalsaSalsa"],
                    'builddir' : JITWIN32,
                    'factory' : pypyJITTranslatedTestFactoryWin,
                    'category' : 'win32',