From 1ab5b850ef2b9e59d1b88331a19688e0fcfa3bef Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 16 Feb 2015 01:24:58 +0200 Subject: Use lib as library path in unit tests. --- run_cross_test.py | 2 +- run_tests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/run_cross_test.py b/run_cross_test.py index e75de62c2..60263369c 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 eb4b3fab9..cd2cf795d 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() -- cgit v1.2.3