[pypy-commit] buildbot default: fix the locks and schedule speed.python.org nightly

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r606:4b5f6c1f66ac
Date: 2011-12-18 18:53 +0200
http://bitbucket.org/pypy/buildbot/changeset/4b5f6c1f66ac/

Log:	fix the locks and schedule speed.python.org nightly

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -345,7 +345,7 @@
             addopts = []
         self.addStep(ShellCmd(
             # this step needs exclusive access to the CPU
-            locks=[TannitCPU.access('exclusive')],
+            locks=[lock.access('exclusive')],
             description="run benchmarks on top of pypy-c",
             command=["python", "runner.py", '--output-filename', 'result.json',
                     '--pypy-c', pypy_c_rel,
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -204,7 +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)
+            JITBENCH64_2,              # on speed.python.org, uses 1 core (in part exclusively)
             MACOSX32,                  # on minime
             ], branch=None, hour=0, minute=0),
         #