[pypy-commit] buildbot default: hg merge default

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: 
Changeset: r604:c34d2583efd4
Date: 2011-12-15 17:28 +0100
http://bitbucket.org/pypy/buildbot/changeset/c34d2583efd4/

Log:	hg merge default

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -204,6 +204,7 @@
         Nightly("nightly-0-00", [
             JITBENCH,                  # on tannit32, uses 1 core (in part exclusively)
             JITBENCH64,                # on tannit64, uses 1 core (in part exclusively)
+            JITBENCH64_2,              # on speed.python.org, uses 1 core (in part exclusively)
             MACOSX32,                  # on minime
             ], branch=None, hour=0, minute=0),
         #
@@ -329,7 +330,7 @@
                    'category' : 'mac64',
                    },
                   {"name": WIN32,
-                   "slavenames": ["bigboard"],
+                   "slavenames": ["snakepit32", "bigboard"],
                    "builddir": WIN32,
                    "factory": pypyOwnTestFactoryWin,
                    "category": 'win32'
@@ -341,13 +342,13 @@
                    "category": 'win32'
                   },
                   {"name": APPLVLWIN32,
-                   "slavenames": ["bigboard"],
+                   "slavenames": ["snakepit32", "bigboard"],
                    "builddir": APPLVLWIN32,
                    "factory": pypyTranslatedAppLevelTestFactoryWin,
                    "category": "win32"
                   },
                   {"name" : JITWIN32,
-                   "slavenames": ["bigboard"],
+                   "slavenames": ["snakepit32", "bigboard"],
                    'builddir' : JITWIN32,
                    'factory' : pypyJITTranslatedTestFactoryWin,
                    'category' : 'win32',