diff options
| author | John Ericson <git@JohnEricson.me> | 2019-03-11 22:59:22 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-03-12 04:03:47 +0000 |
| commit | 9409155d5a5721e2dd3484ccea2c953628eabe2c (patch) | |
| tree | b7382aa748186e04d339e55ea2b89a796c755bcb | |
| parent | 89e46f0d92834289da66579cb457ddc0504f192d (diff) | |
| download | meson-9409155d5a5721e2dd3484ccea2c953628eabe2c.tar.gz | |
Avoid module patching in `test_find_library_patterns`
This is less hacky, and also prepares the way for #4010.
| -rwxr-xr-x | run_unittests.py | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/run_unittests.py b/run_unittests.py index 5de69f643..e231a253c 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -763,19 +763,14 @@ class InternalTests(unittest.TestCase): self._test_all_naming(cc, env, patterns, 'openbsd') else: self._test_all_naming(cc, env, patterns, 'linux') - true = lambda x, y: True - with PatchModule(mesonbuild.compilers.c.for_openbsd, - 'mesonbuild.compilers.c.for_openbsd', true): - self._test_all_naming(cc, env, patterns, 'openbsd') - with PatchModule(mesonbuild.compilers.c.for_darwin, - 'mesonbuild.compilers.c.for_darwin', true): - self._test_all_naming(cc, env, patterns, 'darwin') - with PatchModule(mesonbuild.compilers.c.for_cygwin, - 'mesonbuild.compilers.c.for_cygwin', true): - self._test_all_naming(cc, env, patterns, 'cygwin') - with PatchModule(mesonbuild.compilers.c.for_windows, - 'mesonbuild.compilers.c.for_windows', true): - self._test_all_naming(cc, env, patterns, 'windows-mingw') + env.machines.host.system = 'openbsd' + self._test_all_naming(cc, env, patterns, 'openbsd') + env.machines.host.system = 'darwin' + self._test_all_naming(cc, env, patterns, 'darwin') + env.machines.host.system = 'cygwin' + self._test_all_naming(cc, env, patterns, 'cygwin') + env.machines.host.system = 'windows' + self._test_all_naming(cc, env, patterns, 'windows-mingw') def test_pkgconfig_parse_libs(self): ''' |