diff options
author | Jan Niklas Hasse <jhasse@bixense.com> | 2018-09-17 15:02:03 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-09-17 21:43:50 +0300 |
commit | d0648ee077c6009609bbba474882283a74f5e649 (patch) | |
tree | ade68303406acfab9233a64b772b8ab9598c1834 /run_unittests.py | |
parent | 87750bf98897f1fa590ed6e55b90936a72e1d2fe (diff) | |
download | meson-d0648ee077c6009609bbba474882283a74f5e649.zip meson-d0648ee077c6009609bbba474882283a74f5e649.tar.gz meson-d0648ee077c6009609bbba474882283a74f5e649.tar.bz2 |
Also check wx-config-gtk3 when looking for wxWidgets
On Arch Linux the wxgtk3 package doesn't provide wx-config.
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 e9e9abf..80864c9 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2856,15 +2856,15 @@ class FailureTests(BasePlatformTests): def test_wx_notfound_dependency(self): # Want to test failure, so skip if available - if shutil.which('wx-config-3.0') or shutil.which('wx-config'): - raise unittest.SkipTest('wx-config or wx-config-3.0 found') + if shutil.which('wx-config-3.0') or shutil.which('wx-config') or shutil.which('wx-config-gtk3'): + raise unittest.SkipTest('wx-config, wx-config-3.0 or wx-config-gtk3 found') self.assertMesonRaises("dependency('wxwidgets')", self.dnf) self.assertMesonOutputs("dependency('wxwidgets', required : false)", "Dependency .*WxWidgets.* found: .*NO.*") def test_wx_dependency(self): - if not shutil.which('wx-config-3.0') and not shutil.which('wx-config'): - raise unittest.SkipTest('Neither wx-config nor wx-config-3.0 found') + if not shutil.which('wx-config-3.0') and not shutil.which('wx-config') and not shutil.which('wx-config-gtk3'): + raise unittest.SkipTest('Neither wx-config, wx-config-3.0 nor wx-config-gtk3 found') self.assertMesonRaises("dependency('wxwidgets', modules : 1)", "module argument is not a string") |