Author: Antonio Cuni <[email protected]>
Branch:
Changeset: r717:7cdc6fee84bb
Date: 2012-11-02 14:49 +0100
http://bitbucket.org/pypy/buildbot/changeset/7cdc6fee84bb/
Log: merge
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -314,7 +314,7 @@
command=prefix + ["python", "testrunner/runner.py",
"--logfile=pytest-A.log",
"--config=pypy/pytest-A.cfg",
- "--root=pypy", "--timeout=1800"
+ "--root=pypy", "--timeout=3600"
] + ["--config=%s" % cfg for cfg in app_tests],
logfiles={'pytestLog': 'pytest-A.log'},
timeout=4000,
@@ -325,7 +325,7 @@
description="lib-python test",
command=prefix + ["python", "pypy/test_all.py",
"--pypy=pypy/translator/goal/pypy-c",
- "--timeout=1800",
+ "--timeout=3600",
"--resultlog=cpython.log", "lib-python"],
timeout=4000,
logfiles={'pytestLog': 'cpython.log'}))
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -55,6 +55,7 @@
pypyOwnTestFactory = pypybuilds.Own()
pypyOwnTestFactoryWin = pypybuilds.Own(platform="win32")
+pypyOwnTestFactoryIndiana = pypybuilds.Own(platform="indiana32")
pypyJitOnlyOwnTestFactory = pypybuilds.Own(cherrypick="jit")
# OSX 32bit tests require a larger timeout to finish
@@ -116,6 +117,15 @@
interpreter='python',
)
+pypyJITTranslatedTestFactoryIndiana = pypybuilds.Translated(
+ translationArgs=jit_translation_args,
+ targetArgs=[],
+ lib_python=True,
+ pypyjit=True,
+ app_tests=True,
+ platform='openindiana32',
+ )
+
pypyJITTranslatedTestFactoryOSX = pypybuilds.Translated(
platform='osx',
translationArgs=jit_translation_args,
@@ -219,6 +229,7 @@
LINUX32 = "own-linux-x86-32"
LINUX64 = "own-linux-x86-64"
LINUXPPC64 = "own-linux-ppc-64"
+INDIANA32 = "own-indiana-x86-32"
MACOSX32 = "own-macosx-x86-32"
WIN32 = "own-win-x86-32"
@@ -241,6 +252,7 @@
JITWIN32 = "pypy-c-jit-win-x86-32"
JITWIN64 = "pypy-c-jit-win-x86-64"
JITFREEBSD64 = 'pypy-c-jit-freebsd-7-x86-64'
+JITINDIANA32 = "pypy-c-jit-indiana-x86-32"
JITBACKENDONLYLINUXARMEL = "jitbackendonly-own-linux-armel"
JITBACKENDONLYLINUXARMELXDIST = "jitbackendonly-own-linux-armel-xdist"
@@ -492,6 +504,19 @@
'factory': pypyJITTranslatedTestFactoryPPC64,
'category': 'linux-ppc64',
},
+ # openindiana
+ {'name': JITINDIANA32,
+ 'slavenames': ['jcea-openindiana-32'],
+ 'builddir': JITINDIANA32,
+ 'factory': pypyJITTranslatedTestFactoryIndiana,
+ 'category': 'openindiana32',
+ },
+ {'name': INDIANA32,
+ 'slavenames': ['jcea-openindiana-32'],
+ 'builddir': INDIANA32,
+ 'factory': pypyOwnTestFactoryIndiana,
+ 'category': 'openindiana32',
+ },
# ARM
# armel
{"name": JITBACKENDONLYLINUXARMELXDIST,
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
