Add an option to dependencies called 'method'. This can be used to

configure a detection method, for those types of dependencies that have
more than one means of detection.

The default detection methods are unchanged if 'method' is not
specified, and all dependencies support the method 'auto', which is the
same as not specifying a method.

The dependencies which do support multiple detection methods
additionally support other values, depending on the dependency.

1 files changed, 2 insertions, 4 deletions

diff --git a/run_unittests.py b/run_unittests.py
index 1b24d08..6b2a680 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1121,7 +1121,7 @@ class LinuxlikeTests(BasePlatformTests):
         if qt4 != 0 or qt5 != 0:
             raise unittest.SkipTest('Qt not found with pkg-config')
         testdir = os.path.join(self.framework_test_dir, '4 qt')
-        self.init(testdir)
+        self.init(testdir, ['-Dmethod=pkgconfig'])
         # Confirm that the dependency was found with qmake
         msg = 'Qt4 native `pkg-config` dependency (modules: Core, Gui) found: YES\n'
         msg2 = 'Qt5 native `pkg-config` dependency (modules: Core, Gui) found: YES\n'
@@ -1144,10 +1144,8 @@ class LinuxlikeTests(BasePlatformTests):
             if 'Qt version 5' not in output and 'qt5' 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
-        os.environ['PKG_CONFIG_LIBDIR'] = self.builddir
-        os.environ['PKG_CONFIG_PATH'] = self.builddir
         testdir = os.path.join(self.framework_test_dir, '4 qt')
-        self.init(testdir)
+        self.init(testdir, ['-Dmethod=qmake'])
         # Confirm that the dependency was found with qmake
         msg = 'Qt5 native `qmake-qt5` dependency (modules: Core) found: YES\n'
         msg2 = 'Qt5 native `qmake` dependency (modules: Core) found: YES\n'