diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-02-16 01:24:58 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-02-16 01:24:58 +0200 |
commit | 1ab5b850ef2b9e59d1b88331a19688e0fcfa3bef (patch) | |
tree | c2e9eb2b46571c189bc1726880e5f33a7c8b9932 | |
parent | 22c23ee1fbfe2b357601992acdae3f3a71ea8632 (diff) | |
download | meson-1ab5b850ef2b9e59d1b88331a19688e0fcfa3bef.zip meson-1ab5b850ef2b9e59d1b88331a19688e0fcfa3bef.tar.gz meson-1ab5b850ef2b9e59d1b88331a19688e0fcfa3bef.tar.bz2 |
Use lib as library path in unit tests.
-rwxr-xr-x | run_cross_test.py | 2 | ||||
-rwxr-xr-x | run_tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/run_cross_test.py b/run_cross_test.py index e75de62..6026336 100755 --- a/run_cross_test.py +++ b/run_cross_test.py @@ -45,7 +45,7 @@ def run_test(testdir, should_succeed=True): os.mkdir(test_build_dir) os.mkdir(install_dir) print('Running test: ' + testdir) - gen_command = [sys.executable, meson_command, '--prefix', install_dir, testdir, test_build_dir] + extra_flags + gen_command = [sys.executable, meson_command, '--prefix', install_dir, '--libdir', 'lib', testdir, test_build_dir] + extra_flags p = subprocess.Popen(gen_command) p.wait() if not should_succeed: diff --git a/run_tests.py b/run_tests.py index eb4b3fa..cd2cf79 100755 --- a/run_tests.py +++ b/run_tests.py @@ -130,7 +130,7 @@ def run_test(testdir, should_succeed): os.mkdir(test_build_dir) os.mkdir(install_dir) print('Running test: ' + testdir) - gen_command = [sys.executable, meson_command, '--prefix', '/usr', testdir, test_build_dir]\ + gen_command = [sys.executable, meson_command, '--prefix', '/usr', '--libdir', 'lib', testdir, test_build_dir]\ + unity_flags + backend_flags p = subprocess.Popen(gen_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdo, stde) = p.communicate() |