Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r90644:fd8af983f881
Date: 2017-03-13 08:45 +0100
http://bitbucket.org/pypy/pypy/changeset/fd8af983f881/
Log: fixes, also add app_level_tests.py
diff --git a/testrunner/app_level_tests.py b/testrunner/app_level_tests.py
new file mode 100755
--- /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
old mode 100755
new mode 100644
--- a/testrunner/lib_python_tests.py
+++ b/testrunner/lib_python_tests.py
@@ -8,12 +8,15 @@
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/pypy-c",
- "--timeout=3600",
- "--resultlog=cpython.log", "lib-python"],
+ "--pypy=pypy/goal/pypy-c",
+ "--timeout=3600",
+ "--resultlog=cpython.log", "lib-python",
+ ] + sys.argv[1:],
cwd=rootdir)
try:
diff --git a/testrunner/pypyjit_tests.py b/testrunner/pypyjit_tests.py
old mode 100755
new mode 100644
--- a/testrunner/pypyjit_tests.py
+++ b/testrunner/pypyjit_tests.py
@@ -8,11 +8,14 @@
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(
["pypy/goal/pypy-c", "pypy/test_all.py",
- "--resultlog=pypyjit_new.log",
- "pypy/module/pypyjit/test_pypy_c"],
+ "--resultlog=pypyjit_new.log",
+ "pypy/module/pypyjit/test_pypy_c",
+ ] + sys.argv[1:],
cwd=rootdir)
try:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
