aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-03-02 12:36:59 +0000
committerJon Turney <jon.turney@dronecode.org.uk>2018-03-04 22:28:47 +0000
commit610e5d4a7122964d2e14c3c77585ce478704f976 (patch)
tree552351ce1766fbd0ecd5e68d596ac149cc6d0d47 /run_unittests.py
parent0eade4f3c6eb6d47c546152b40302ea7b59660a0 (diff)
downloadmeson-610e5d4a7122964d2e14c3c77585ce478704f976.zip
meson-610e5d4a7122964d2e14c3c77585ce478704f976.tar.gz
meson-610e5d4a7122964d2e14c3c77585ce478704f976.tar.bz2
Invoke 'qmake --version' correctly in test_qt5dependency_qmake_detection
subprocess.getoutput() takes a string, not a list. I'm going to guess this is the cause of the mysterious behaviour alluded to in the comment...
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/run_unittests.py b/run_unittests.py
index c2299ca..851b61f 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -2270,11 +2270,8 @@ class LinuxlikeTests(BasePlatformTests):
if not shutil.which('qmake-qt5'):
if not shutil.which('qmake'):
raise unittest.SkipTest('QMake not found')
- # For some inexplicable reason qmake --version gives different
- # results when run from the command line vs invoked by Python.
- # Check for both cases in case this behavior changes in the future.
- output = subprocess.getoutput(['qmake', '--version'])
- if 'Qt version 5' not in output and 'qt5' not in output:
+ output = subprocess.getoutput('qmake --version')
+ if 'Qt version 5' not in output:
raise unittest.SkipTest('Qmake found, but it is not for Qt 5.')
# Disable pkg-config codepath and force searching with qmake/qmake-qt5
testdir = os.path.join(self.framework_test_dir, '4 qt')