[pypy-commit] buildbot default: hg merge default

antocuni noreply at buildbot.pypy.org
Thu Dec 15 16:46:13 CET 2011


Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: 
Changeset: r601:4d1b872dbf60
Date: 2011-12-15 16:45 +0100
http://bitbucket.org/pypy/buildbot/changeset/4d1b872dbf60/

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
@@ -152,6 +152,8 @@
 JITONLYLINUX32 = "jitonly-own-linux-x86-32"
 JITBENCH = "jit-benchmark-linux-x86-32"
 JITBENCH64 = "jit-benchmark-linux-x86-64"
+JITBENCH64_2 = "jit-benchmark-linux-x86-64-2"
+
 
 BuildmasterConfig = {
     'slavePortnum': slavePortnum,
@@ -296,6 +298,13 @@
                    "category": "benchmark-run",
                    # the locks are acquired with fine grain inside the build
                    },
+                  {"name": JITBENCH64_2,
+                   "slavenames": ["speed-python-64"],
+                   "builddir": JITBENCH64,
+                   "factory": pypyJITBenchmarkFactory64,
+                   "category": "benchmark-run",
+                   # the locks are acquired with fine grain inside the build
+                   },
                   {"name": MACOSX32,
                    "slavenames": ["minime"],
                    "builddir": MACOSX32,


More information about the pypy-commit mailing list