diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-18 21:31:49 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-18 22:10:22 +0200 |
commit | c7ddce163fb8f440c96649a3319ab9f1f62e38be (patch) | |
tree | 70a4778f2a8c2f67ccda1317234143b9b7f225b1 /run_project_tests.py | |
parent | 39df22bf539ce3359679643256b854f34c13fa16 (diff) | |
download | meson-c7ddce163fb8f440c96649a3319ab9f1f62e38be.zip meson-c7ddce163fb8f440c96649a3319ab9f1f62e38be.tar.gz meson-c7ddce163fb8f440c96649a3319ab9f1f62e38be.tar.bz2 |
All testing is now in mesontest.py, which simplifies a lot of stuff.
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 15d656b..dcc6006 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -19,12 +19,12 @@ import os, subprocess, shutil, sys, signal from io import StringIO from ast import literal_eval import sys, tempfile +import mesontest from mesonbuild import environment from mesonbuild import mesonlib from mesonbuild import mlog from mesonbuild import mesonmain from mesonbuild.mesonlib import stringlistify -from mesonbuild.scripts import meson_test, meson_benchmark import argparse import xml.etree.ElementTree as ET import time @@ -211,8 +211,8 @@ def run_test_inprocess(testdir): old_cwd = os.getcwd() os.chdir(testdir) try: - returncode_test = meson_test.run(['meson-private/meson_test_setup.dat']) - returncode_benchmark = meson_benchmark.run(['meson-private/meson_benchmark_setup.dat']) + returncode_test = mesontest.run([]) + returncode_benchmark = mesontest.run(['--benchmark', '--logbase', 'benchmarklog']) finally: sys.stdout = old_stdout sys.stderr = old_stderr |