[pypy-commit] buildbot default: adapt timeouts for the ARM factories

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r678:73e79c32a9e8
Date: 2012-09-04 10:36 +0200
http://bitbucket.org/pypy/buildbot/changeset/73e79c32a9e8/

Log:	adapt timeouts for the ARM factories

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -58,12 +58,6 @@
 # OSX 32bit tests require a larger timeout to finish
 pypyOwnTestFactoryOSX32 = pypybuilds.Own(timeout=3*3600)
 
-# ARM own test factories, larger timeouts
-pypyJitBackendOnlyOwnTestFactoryARM = pypybuilds.Own(cherrypick="jit/backend/",
-                                                                timeout=6*3600)
-pypyJitOnlyOwnTestFactoryARM = pypybuilds.Own(cherrypick="jit", timeout=6*3600)
-pypyOwnTestFactoryARM = pypybuilds.Own(timeout=6*3600)
-
 pypyTranslatedAppLevelTestFactory = pypybuilds.Translated(lib_python=True,
                                                           app_tests=True)
 pypyTranslatedAppLevelTestFactory64 = pypybuilds.Translated(lib_python=True,
@@ -168,6 +162,12 @@
                                                           platform='linux64')
 
 
+# ARM own test factories
+# this one needs a larger timeout due to how it is run
+pypyJitBackendOnlyOwnTestFactoryARM = pypybuilds.Own(cherrypick="jit/backend/",
+                                                                timeout=6*3600)
+pypyJitOnlyOwnTestFactoryARM = pypybuilds.Own(cherrypick="jit", timeout=2*3600)
+pypyOwnTestFactoryARM = pypybuilds.Own(timeout=2*3600)
 LINUX32 = "own-linux-x86-32"
 LINUX64 = "own-linux-x86-64"
 LINUXPPC64 = "own-linux-ppc-64"