diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-06 17:00:51 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-06 17:00:51 +0300 |
| commit | d94e06db21e8bcfcf194b7ba5eb8255acd168d4d (patch) | |
| tree | 4ed41e9f3d21ed943b4145402f874e5449c05a85 /run_project_tests.py | |
| parent | 06f195e9ec1e8ea399ebb138b63865c1e3f4c90d (diff) | |
| parent | e765091c2e34f5ac3cd84cf5a61c30ec0868e0a9 (diff) | |
| download | meson-d94e06db21e8bcfcf194b7ba5eb8255acd168d4d.zip meson-d94e06db21e8bcfcf194b7ba5eb8255acd168d4d.tar.gz meson-d94e06db21e8bcfcf194b7ba5eb8255acd168d4d.tar.bz2 | |
Merged singleexe branch.
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index d7ad257..58a0fd5 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -21,7 +21,7 @@ from io import StringIO from ast import literal_eval from enum import Enum import tempfile -import mesontest +from mesonbuild import mtest from mesonbuild import environment from mesonbuild import mesonlib from mesonbuild import mlog @@ -287,12 +287,12 @@ def run_test_inprocess(testdir): os.chdir(testdir) test_log_fname = 'meson-logs/testlog.txt' try: - returncode_test = mesontest.run(['--no-rebuild']) + returncode_test = mtest.run(['--no-rebuild']) if os.path.exists(test_log_fname): test_log = open(test_log_fname, errors='ignore').read() else: test_log = '' - returncode_benchmark = mesontest.run(['--no-rebuild', '--benchmark', '--logbase', 'benchmarklog']) + returncode_benchmark = mtest.run(['--no-rebuild', '--benchmark', '--logbase', 'benchmarklog']) finally: sys.stdout = old_stdout sys.stderr = old_stderr |