diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-03-24 22:52:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 22:52:15 +0200 |
| commit | 54767ab482eb30a843974e985d2998f5476c906c (patch) | |
| tree | 34e083053ab4f12e1643b826ef12d55a8446dfdc /run_unittests.py | |
| parent | c8826e907a3e1a2428ddec73133f3c3e6ea859a2 (diff) | |
| parent | 1767c57492529fc7c3823871f861db35b89f5c1f (diff) | |
| download | meson-54767ab482eb30a843974e985d2998f5476c906c.zip meson-54767ab482eb30a843974e985d2998f5476c906c.tar.gz meson-54767ab482eb30a843974e985d2998f5476c906c.tar.bz2 | |
Merge pull request #8568 from dcbaker/submit/qt-dependency-factory
QT: use a proper dependency factory
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/run_unittests.py b/run_unittests.py index a53a43a..5362616 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -6593,10 +6593,10 @@ class LinuxlikeTests(BasePlatformTests): mesonlog = self.get_meson_log() if qt4 == 0: self.assertRegex('\n'.join(mesonlog), - r'Run-time dependency qt4 \(modules: Core\) found: YES 4.* \(pkg-config\)\n') + r'Run-time dependency qt4 \(modules: Core\) found: YES 4.* \(pkg-config\)') if qt5 == 0: self.assertRegex('\n'.join(mesonlog), - r'Run-time dependency qt5 \(modules: Core\) found: YES 5.* \(pkg-config\)\n') + r'Run-time dependency qt5 \(modules: Core\) found: YES 5.* \(pkg-config\)') @skip_if_not_base_option('b_sanitize') def test_generate_gir_with_address_sanitizer(self): @@ -6627,7 +6627,7 @@ class LinuxlikeTests(BasePlatformTests): # Confirm that the dependency was found with qmake mesonlog = self.get_meson_log() self.assertRegex('\n'.join(mesonlog), - r'Run-time dependency qt5 \(modules: Core\) found: YES .* \((qmake|qmake-qt5)\)\n') + r'Run-time dependency qt5 \(modules: Core\) found: YES .* \(qmake\)\n') def test_qt6dependency_qmake_detection(self): ''' @@ -6647,7 +6647,7 @@ class LinuxlikeTests(BasePlatformTests): # Confirm that the dependency was found with qmake mesonlog = self.get_meson_log() self.assertRegex('\n'.join(mesonlog), - r'Run-time dependency qt6 \(modules: Core\) found: YES .* \((qmake|qmake-qt6)\)\n') + r'Run-time dependency qt6 \(modules: Core\) found: YES .* \(qmake\)\n') def glob_sofiles_without_privdir(self, g): files = glob(g) |