diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-06-01 14:27:06 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-01 14:26:02 +0100 |
| commit | f6b3567fcced39acf81bace8df616cf7035f1a69 (patch) | |
| tree | 5847780a16b459251d2cd4cc433e0384af64db1b | |
| parent | b744d56fc7ee7ec7ca738489f694fdc5b719d3a2 (diff) | |
| download | meson-f6b3567fcced39acf81bace8df616cf7035f1a69.zip meson-f6b3567fcced39acf81bace8df616cf7035f1a69.tar.gz meson-f6b3567fcced39acf81bace8df616cf7035f1a69.tar.bz2 | |
Update a unit test which relies on specific dependency check output
| -rwxr-xr-x | run_unittests.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/run_unittests.py b/run_unittests.py index 7c8d230..dee1086 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2939,11 +2939,12 @@ class LinuxlikeTests(BasePlatformTests): raise unittest.SkipTest('Qt not found with pkg-config') testdir = os.path.join(self.framework_test_dir, '4 qt') self.init(testdir, ['-Dmethod=pkg-config']) - # 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' + # Confirm that the dependency was found with pkg-config mesonlog = self.get_meson_log() - self.assertTrue(msg in mesonlog or msg2 in mesonlog) + self.assertRegex('\n'.join(mesonlog), + r'Dependency qt4 \(modules: Core\) found: YES .*, `pkg-config`\n') + self.assertRegex('\n'.join(mesonlog), + r'Dependency qt5 \(modules: Core\) found: YES .*, `pkg-config`\n') def test_qt5dependency_qmake_detection(self): ''' @@ -2961,10 +2962,9 @@ class LinuxlikeTests(BasePlatformTests): testdir = os.path.join(self.framework_test_dir, '4 qt') 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' mesonlog = self.get_meson_log() - self.assertTrue(msg in mesonlog or msg2 in mesonlog) + self.assertRegex('\n'.join(mesonlog), + r'Dependency qt5 \(modules: Core\) found: YES .*, `(qmake|qmake-qt5)`\n') def _test_soname_impl(self, libpath, install): if is_cygwin() or is_osx(): |