hg merge default

3 files changed, 89 insertions, 0 deletions

diff --git a/testrunner/app_level_tests.py b/testrunner/app_level_tests.py
new file mode 100755
index 0000000000..eb8215918a
--- /dev/null
+++ b/testrunner/app_level_tests.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+"""
+This is what the buildbot runs to execute the app-level tests
+on top of pypy-c.
+"""
+
+import sys, os
+import subprocess
+
+rootdir = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
+os.environ['PYTHONPATH'] = rootdir
+os.environ['PYTEST_PLUGINS'] = ''
+
+popen = subprocess.Popen(
+    [sys.executable, "testrunner/runner.py",
+     "--logfile=pytest-A.log",
+     "--config=pypy/pytest-A.cfg",
+     "--config=pypy/pytest-A.py",
+     "--config=~/machine-A_cfg.py",
+     "--root=pypy", "--timeout=3600",
+     ] + sys.argv[1:],
+    cwd=rootdir)
+
+try:
+    ret = popen.wait()
+except KeyboardInterrupt:
+    popen.kill()
+    print "\ninterrupted"
+    ret = 1
+
+sys.exit(ret)
diff --git a/testrunner/lib_python_tests.py b/testrunner/lib_python_tests.py
new file mode 100755
index 0000000000..a01492016f
--- /dev/null
+++ b/testrunner/lib_python_tests.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+"""
+This is what the buildbot runs to execute the lib-python tests
+on top of pypy-c.
+"""
+
+import sys, os
+import subprocess
+
+rootdir = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
+os.environ['PYTHONPATH'] = rootdir
+os.environ['PYTEST_PLUGINS'] = ''
+
+popen = subprocess.Popen(
+    [sys.executable, "pypy/test_all.py",
+     "--pypy=pypy/goal/pypy3-c",
+     "--timeout=3600",
+     "--resultlog=cpython.log", "lib-python",
+     ] + sys.argv[1:],
+    cwd=rootdir)
+
+try:
+    ret = popen.wait()
+except KeyboardInterrupt:
+    popen.kill()
+    print "\ninterrupted"
+    ret = 1
+
+sys.exit(ret)
diff --git a/testrunner/pypyjit_tests.py b/testrunner/pypyjit_tests.py
new file mode 100755
index 0000000000..313fe09167
--- /dev/null
+++ b/testrunner/pypyjit_tests.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+"""
+This is what the buildbot runs to execute the pypyjit tests
+on top of pypy-c.
+"""
+
+import sys, os
+import subprocess
+
+rootdir = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
+os.environ['PYTHONPATH'] = rootdir
+os.environ['PYTEST_PLUGINS'] = ''
+
+popen = subprocess.Popen(
+    [sys.executable, "pypy/test_all.py",
+     "--pypy=pypy/goal/pypy3-c",
+     "--resultlog=pypyjit_new.log",
+     "pypy/module/pypyjit/test_pypy_c",
+     ] + sys.argv[1:],
+    cwd=rootdir)
+
+try:
+    ret = popen.wait()
+except KeyboardInterrupt:
+    popen.kill()
+    print "\ninterrupted"
+    ret = 1
+
+sys.exit(ret)