From 9409155d5a5721e2dd3484ccea2c953628eabe2c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 11 Mar 2019 22:59:22 -0400 Subject: Avoid module patching in `test_find_library_patterns` This is less hacky, and also prepares the way for #4010. --- run_unittests.py | 21 ++++++++------------- 1 file 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): ''' -- cgit v1.2.1