diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-11-09 00:59:06 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-11-20 23:08:17 +0200 |
| commit | b3dfb80c15cae24c66d07425bb7a327528438a55 (patch) | |
| tree | 250ff7ed1623068bf28386ba203dfbec4be1e292 /run_project_tests.py | |
| parent | 9d67e5030b6c86ce33f43ae7a5b827f299d68a3e (diff) | |
| download | meson-b3dfb80c15cae24c66d07425bb7a327528438a55.zip meson-b3dfb80c15cae24c66d07425bb7a327528438a55.tar.gz meson-b3dfb80c15cae24c66d07425bb7a327528438a55.tar.bz2 | |
Tests can be run with an external Meson command.
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 17e095b..d3da4e6 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -33,7 +33,7 @@ import time import multiprocessing import concurrent.futures as conc import re -from run_unittests import get_fake_options, run_configure_inprocess +from run_unittests import get_fake_options, run_configure from run_tests import get_backend_commands, get_backend_args_for_dir, Backend from run_tests import ensure_backend_detects_changes @@ -327,9 +327,9 @@ def _run_test(testdir, test_build_dir, install_dir, extra_args, compiler, backen test_args = parse_test_args(testdir) gen_start = time.time() # Configure in-process - gen_command = [meson_command, '--prefix', '/usr', '--libdir', 'lib', testdir, test_build_dir]\ + gen_args = ['--prefix', '/usr', '--libdir', 'lib', testdir, test_build_dir]\ + flags + test_args + extra_args - (returncode, stdo, stde) = run_configure_inprocess(gen_command) + (returncode, stdo, stde) = run_configure(meson_command, gen_args) try: logfile = os.path.join(test_build_dir, 'meson-logs/meson-log.txt') with open(logfile, errors='ignore') as f: |