Author: Matti Picus <[email protected]>
Branch:
Changeset: r909:ffb97030dbbe
Date: 2014-03-09 21:25 +0200
http://bitbucket.org/pypy/buildbot/changeset/ffb97030dbbe/
Log: add own build for win32, lock it
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -24,7 +24,7 @@
# there are 8 logical CPUs, but only 4 physical ones, and only enough memory
for ~3 translations
TannitCPU = locks.MasterLock('tannit_cpu', maxCount=3)
SpeedPythonCPU = locks.MasterLock('speed_python_cpu', maxCount=24)
-#WinLockCPU = locks.MasterLock('win_cpu', maxCount=1)
+WinSlaveLock = locks.SlaveLock('win_cpu', maxCount=1)
# The cross translation machine can accomodate 2 jobs at the same time
ARMCrossLock = locks.MasterLock('arm_cpu', maxCount=2)
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -49,7 +49,7 @@
ARM = load('pypybuildbot.arm_master')
TannitCPU = pypybuilds.TannitCPU
-#WinLockCPU = pypybuilds.WinLockCPU
+WinSlaveLock = pypybuilds.WinSlaveLock
pypyOwnTestFactory = pypybuilds.Own()
pypyOwnTestFactoryWin = pypybuilds.Own(platform="win32")
@@ -216,7 +216,8 @@
APPLVLLINUX64, # on allegro64, uses 1 core
# other platforms
#MACOSX32, # on minime
- JITWIN32, # on aurora
+ JITWIN32, # on aurora, SalsaSalsa
+ WIN32, # on aurora, SalsaSalsa
#JITFREEBSD764, # on headless
#JITFREEBSD864, # on ananke
JITFREEBSD964, # on tavendo
@@ -387,6 +388,7 @@
"slavenames": ["aurora", "SalsaSalsa"],
"builddir": WIN32,
"factory": pypyOwnTestFactoryWin,
+ "locks": [WinSlaveLock],
"category": 'win32',
},
{"name": WIN64,
@@ -399,12 +401,14 @@
"slavenames": ["aurora", "SalsaSalsa"],
"builddir": APPLVLWIN32,
"factory": pypyTranslatedAppLevelTestFactoryWin,
+ "locks": [WinSlaveLock],
"category": "win32",
},
{"name" : JITWIN32,
"slavenames": ["aurora", "SalsaSalsa"],
'builddir' : JITWIN32,
'factory' : pypyJITTranslatedTestFactoryWin,
+ "locks": [WinSlaveLock],
'category' : 'win32',
},
{"name" : JITWIN64,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
