aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-02-04 22:00:06 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-02-04 22:00:06 +0200
commit73b8ff534115074125568b33ed2c67065c5e91b5 (patch)
treed5a2c024adbebbbe4028be8bc16c571498308d8d /run_tests.py
parent1eaf6673b73be1393de61f0367d1fd352872b5cc (diff)
downloadmeson-73b8ff534115074125568b33ed2c67065c5e91b5.zip
meson-73b8ff534115074125568b33ed2c67065c5e91b5.tar.gz
meson-73b8ff534115074125568b33ed2c67065c5e91b5.tar.bz2
Rework installation logic so we can go outside the install prefix.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/run_tests.py b/run_tests.py
index c572257..eb4b3fa 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', install_dir, testdir, test_build_dir]\
+ gen_command = [sys.executable, meson_command, '--prefix', '/usr', testdir, test_build_dir]\
+ unity_flags + backend_flags
p = subprocess.Popen(gen_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(stdo, stde) = p.communicate()
@@ -165,7 +165,9 @@ def run_test(testdir, should_succeed):
print("Skipping install test")
return ('', '', '')
else:
- pi = subprocess.Popen(install_commands, cwd=test_build_dir,
+ env = os.environ.copy()
+ env['DESTDIR'] = install_dir
+ pi = subprocess.Popen(install_commands, cwd=test_build_dir, env=env,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(o, e) = pi.communicate()
stdo += o.decode('utf-8')