Author: Antonio Cuni <[email protected]>
Branch:
Changeset: r713:0a1aec7ec9a9
Date: 2012-10-18 16:12 +0200
http://bitbucket.org/pypy/buildbot/changeset/0a1aec7ec9a9/
Log: don't run pypy-c -A tests on py3k nightly. There is no way they can
run in their current form, because we run py.test on top of the
translated pypy-c, which means that we will try to import the pypy
package no top of pypy3, which will never work of course
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -66,6 +66,15 @@
app_tests=True,
platform='linux64')
+# these are like the two above: the only difference is that they only run
+# lib-python tests,not -A tests
+pypyTranslatedLibPythonTestFactory = pypybuilds.Translated(lib_python=True,
+ app_tests=False)
+pypyTranslatedLibPythonTestFactory64 = pypybuilds.Translated(lib_python=True,
+ app_tests=False,
+ platform='linux64')
+
+
pypyTranslatedAppLevelTestFactoryPPC64 = pypybuilds.Translated(
lib_python=True,
app_tests=True,
@@ -218,8 +227,10 @@
APPLVLLINUX64 = "pypy-c-app-level-linux-x86-64"
APPLVLLINUXARM = "pypy-c-app-level-linux-armel"
APPLVLLINUXPPC64 = "pypy-c-app-level-linux-ppc-64"
+APPLVLWIN32 = "pypy-c-app-level-win-x86-32"
-APPLVLWIN32 = "pypy-c-app-level-win-x86-32"
+LIBPYTHON_LINUX32 = "pypy-c-lib-python-linux-x86-32"
+LIBPYTHON_LINUX64 = "pypy-c-lib-python-linux-x86-64"
JITLINUX32 = "pypy-c-jit-linux-x86-32"
JITLINUX64 = "pypy-c-jit-linux-x86-64"
@@ -277,8 +288,8 @@
Nightly("nighly-0-00-py3k", [
LINUX32,
LINUX64,
- APPLVLLINUX32,
- APPLVLLINUX64,
+ LIBPYTHON_LINUX32,
+ LIBPYTHON_LINUX64,
], branch='py3k', hour=0, minute=0),
#
Nightly("nighly-ppc", [
@@ -337,6 +348,20 @@
"category": "linux64",
#"locks": [TannitCPU.access('counting')],
},
+ {"name": LIBPYTHON_LINUX32,
+ "slavenames": ["allegro32"],
+ "builddir": LIBPYTHON_LINUX32,
+ "factory": pypyTranslatedLibPythonTestFactory,
+ 'category': 'linux32',
+ #"locks": [TannitCPU.access('counting')],
+ },
+ {"name": LIBPYTHON_LINUX64,
+ "slavenames": ["allegro64"],
+ "builddir": LIBPYTHON_LINUX64,
+ "factory": pypyTranslatedLibPythonTestFactory,
+ "category": "linux64",
+ #"locks": [TannitCPU.access('counting')],
+ },
{"name": OJITLINUX32,
"slavenames": ["allegro32"],
"builddir": OJITLINUX32,
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
