Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r761:908ad98d9252
Date: 2013-03-23 16:35 -0700
http://bitbucket.org/pypy/buildbot/changeset/908ad98d9252/
Log: merge
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -248,7 +248,6 @@
JITLINUX64 = "pypy-c-jit-linux-x86-64"
JITLINUXARM = "pypy-c-jit-linux-armel"
JITLINUXPPC64 = "pypy-c-jit-linux-ppc-64"
-OJITLINUX32 = "pypy-c-Ojit-no-jit-linux-x86-32"
JITMACOSX64 = "pypy-c-jit-macosx-x86-64"
JITWIN32 = "pypy-c-jit-win-x86-32"
JITWIN64 = "pypy-c-jit-win-x86-64"
@@ -289,13 +288,12 @@
JITLINUX64, # on allegro64, uses 1 core
APPLVLLINUX32, # on tannit32, uses 1 core
APPLVLLINUX64, # on allegro64, uses 1 core
- OJITLINUX32, # on tannit32, uses 1 core
# other platforms
MACOSX32, # on minime
JITWIN32, # on aurora
JITFREEBSD64, # on headless
JITFREEBSD964, # on exarkun's freebsd
- JITMACOSX64, # on mvt's machine
+ #JITMACOSX64, # no currently working machine
], branch=None, hour=0, minute=0),
Nightly("nightly-2-00", [
@@ -379,13 +377,6 @@
"category": "linux64",
#"locks": [TannitCPU.access('counting')],
},
- {"name": OJITLINUX32,
- "slavenames": ["allegro32"],
- "builddir": OJITLINUX32,
- "factory": pypy_OjitTranslatedTestFactory,
- "category": 'linux32',
- #"locks": [TannitCPU.access('counting')],
- },
{"name" : JITLINUX32,
#"slavenames": ["allegro32"],
"slavenames": ["tannit32"],
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
