diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-02-12 20:04:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 20:04:23 +0200 |
| commit | 82e4cb7731e59237746e480f9611700f1d4fda76 (patch) | |
| tree | 24e8133c742258833badd29a03188cb72bb0e044 /run_project_tests.py | |
| parent | ccdac894eedebfb49a90f87a3752cbcfeb28083e (diff) | |
| parent | 0eccce799f5643dda7a65f3e841cd54785f03ec5 (diff) | |
| download | meson-82e4cb7731e59237746e480f9611700f1d4fda76.zip meson-82e4cb7731e59237746e480f9611700f1d4fda76.tar.gz meson-82e4cb7731e59237746e480f9611700f1d4fda76.tar.bz2 | |
Merge pull request #4743 from dcbaker/native-file-extended
Extend native files to store install path information
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index d10f3a2..c35928f 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -345,6 +345,12 @@ def _run_test(testdir, test_build_dir, install_dir, extra_args, compiler, backen if pass_libdir_to_test(testdir): gen_args += ['--libdir', 'lib'] gen_args += [testdir, test_build_dir] + flags + test_args + extra_args + nativefile = os.path.join(testdir, 'nativefile.ini') + if os.path.exists(nativefile): + gen_args.extend(['--native-file', nativefile]) + crossfile = os.path.join(testdir, 'crossfile.ini') + if os.path.exists(crossfile): + gen_args.extend(['--cross-file', crossfile]) (returncode, stdo, stde) = run_configure(gen_args) try: logfile = Path(test_build_dir, 'meson-logs', 'meson-log.txt') |