aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-04-16 22:38:29 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2014-04-16 22:38:29 +0300
commitc21637a01db7f6958c816bfe2a8b0383b96e8f68 (patch)
tree682774f314499b0951e0adf01d3af638025f700d /run_tests.py
parent4c02a35fe067d24ce97207a702dd2e46f2203849 (diff)
downloadmeson-c21637a01db7f6958c816bfe2a8b0383b96e8f68.zip
meson-c21637a01db7f6958c816bfe2a8b0383b96e8f68.tar.gz
meson-c21637a01db7f6958c816bfe2a8b0383b96e8f68.tar.bz2
Fixed unity builds for Qt5.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/run_tests.py b/run_tests.py
index 96fff21..4ca0659 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -25,6 +25,7 @@ test_build_dir = 'work area'
install_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], 'install dir')
meson_command = './meson.py'
+unity_flags = ['--unity']
msbuild_exe = shutil.which('msbuild')
if msbuild_exe is not None:
@@ -107,7 +108,8 @@ 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] + backend_flags
+ gen_command = [sys.executable, meson_command, '--prefix', install_dir, testdir, test_build_dir]\
+ + unity_flags + backend_flags
p = subprocess.Popen(gen_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(stdo, stde) = p.communicate()
stdo = stdo.decode('utf-8')