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...
pull/3165/head
Jon Turney 7 years ago
parent 0eade4f3c6
commit 610e5d4a71
  1. 7
      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')

Loading…
Cancel
Save