aboutsummaryrefslogtreecommitdiff
path: root/run_project_tests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-07-15 08:29:19 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2017-08-02 22:00:09 +0300
commitc2e40650e8b0b74e1800e563c5a3774501bc6477 (patch)
tree9ee555235092762c8f37a88ed7d624410e04669d /run_project_tests.py
parent00a3d1ac4f86c85b3e0ba8e929e34547d20a0134 (diff)
downloadmeson-c2e40650e8b0b74e1800e563c5a3774501bc6477.zip
meson-c2e40650e8b0b74e1800e563c5a3774501bc6477.tar.gz
meson-c2e40650e8b0b74e1800e563c5a3774501bc6477.tar.bz2
Turned mesontest into on internal module.
Diffstat (limited to 'run_project_tests.py')
-rwxr-xr-xrun_project_tests.py6
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