diff options
| author |   Armin Rigo <arigo@tunes.org> | 2017-03-13 08:45:03 +0100 |
|---|---|---|
| committer | Armin Rigo <arigo@tunes.org> | 2017-03-13 08:45:03 +0100 |
| commit | e983854cc62685414cdee977f2a81b12c764390b (patch) | |
| tree | 95ad481b39a4bee12e5f8206a5e515f4dd70f317 /testrunner | |
| parent | Check in here test runners for the lib-python and the pypyjit steps (diff) | |
| download | pypy-e983854cc62685414cdee977f2a81b12c764390b.tar.gz pypy-e983854cc62685414cdee977f2a81b12c764390b.tar.bz2 pypy-e983854cc62685414cdee977f2a81b12c764390b.zip | |
fixes, also add app_level_tests.py
Diffstat (limited to 'testrunner')
| -rwxr-xr-x | testrunner/app_level_tests.py | 31 | ||||
| -rw-r--r--[-rwxr-xr-x] | testrunner/lib_python_tests.py | 9 | ||||
| -rw-r--r--[-rwxr-xr-x] | testrunner/pypyjit_tests.py | 7 |
3 files changed, 42 insertions, 5 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 index 2fcbccf187..6ffd2a6a53 100755..100644 --- a/testrunner/lib_python_tests.py +++ b/testrunner/lib_python_tests.py @@ -8,12 +8,15 @@ 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/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 index 624c67c337..0f8c8bd841 100755..100644 --- a/testrunner/pypyjit_tests.py +++ b/testrunner/pypyjit_tests.py @@ -8,11 +8,14 @@ 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( ["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: |