Author: David Schneider <[email protected]>
Branch:
Changeset: r710:4aaabe5cd63d
Date: 2012-10-15 16:12 -0300
http://bitbucket.org/pypy/buildbot/changeset/4aaabe5cd63d/
Log: merge heads
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -231,7 +231,6 @@
JITWIN64 = "pypy-c-jit-win-x86-64"
JITFREEBSD64 = 'pypy-c-jit-freebsd-7-x86-64'
-JITONLYLINUX32 = "jitonly-own-linux-x86-32"
JITBACKENDONLYLINUXARMEL = "jitbackendonly-own-linux-armel"
JITBACKENDONLYLINUXARMELXDIST = "jitbackendonly-own-linux-armel-xdist"
JITONLYLINUXPPC64 = "jitonly-own-linux-ppc-64"
@@ -309,69 +308,55 @@
'builders': [
{"name": LINUX32,
- "slavenames": ["bigdogvm1", "tannit32"],
+ "slavenames": ["allegro32", "tannit32"],
"builddir": LINUX32,
"factory": pypyOwnTestFactory,
"category": 'linux32',
# this build needs 4 CPUs
- "locks": [TannitCPU.access('exclusive')],
+ #"locks": [TannitCPU.access('exclusive')],
},
{"name": LINUX64,
- "slavenames": ["tannit64"],
+ "slavenames": ["allegro64", "tannit64"],
"builddir": LINUX64,
"factory": pypyOwnTestFactory,
"category": 'linux64',
# this build needs 4 CPUs
- "locks": [TannitCPU.access('exclusive')],
- },
- {"name": LINUX64 + "2",
- "slavenames": ["allegro64"],
- "builddir": LINUX64 + "2",
- "factory": pypyOwnTestFactory,
- "category": 'linux64',
- # no locks, this is not a tannit build
+ #"locks": [TannitCPU.access('exclusive')],
},
{"name": APPLVLLINUX32,
- "slavenames": ["bigdogvm1", "tannit32"],
+ "slavenames": ["allegro32", "tannit32"],
"builddir": APPLVLLINUX32,
"factory": pypyTranslatedAppLevelTestFactory,
'category': 'linux32',
- "locks": [TannitCPU.access('counting')],
+ #"locks": [TannitCPU.access('counting')],
},
{"name": APPLVLLINUX64,
- "slavenames": ["tannit64"],
+ "slavenames": ["allegro64", "tannit64"],
"builddir": APPLVLLINUX64,
"factory": pypyTranslatedAppLevelTestFactory64,
"category": "linux64",
- "locks": [TannitCPU.access('counting')],
+ #"locks": [TannitCPU.access('counting')],
},
{"name": OJITLINUX32,
- "slavenames": ["bigdogvm1", "tannit32"],
+ "slavenames": ["allegro32", "tannit32"],
"builddir": OJITLINUX32,
"factory": pypy_OjitTranslatedTestFactory,
"category": 'linux32',
- "locks": [TannitCPU.access('counting')],
+ #"locks": [TannitCPU.access('counting')],
},
{"name" : JITLINUX32,
- "slavenames": ["bigdogvm1", "tannit32"],
+ "slavenames": ["allegro32", "tannit32"],
'builddir' : JITLINUX32,
'factory' : pypyJITTranslatedTestFactory,
'category' : 'linux32',
- "locks": [TannitCPU.access('counting')],
+ #"locks": [TannitCPU.access('counting')],
},
{'name': JITLINUX64,
- 'slavenames': ['tannit64'],
+ 'slavenames': ["allegro64", 'tannit64'],
'builddir': JITLINUX64,
'factory': pypyJITTranslatedTestFactory64,
'category': 'linux64',
- "locks": [TannitCPU.access('counting')],
- },
- {"name": JITONLYLINUX32,
- "slavenames": ["tannit32", "bigdogvm1"],
- "builddir": JITONLYLINUX32,
- "factory": pypyJitOnlyOwnTestFactory,
- "category": 'linux32',
- "locks": [TannitCPU.access('counting')],
+ #"locks": [TannitCPU.access('counting')],
},
{"name": JITBENCH,
"slavenames": ["tannit32"],
diff --git a/bot2/pypybuildbot/summary.py b/bot2/pypybuildbot/summary.py
--- a/bot2/pypybuildbot/summary.py
+++ b/bot2/pypybuildbot/summary.py
@@ -804,6 +804,8 @@
branch_key = (len(self.branch_order_prefixes)+1, branch)
for i, catprefix in enumerate(self.categories):
if category.startswith(catprefix):
+ # kill '-' to make 'linux32' sort before 'linux-armel'
+ category = category.replace('-', '')
break
else:
i = len(self.categories)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
