Skip test_config_tool_dep on MSYS2

llvm-config --libfiles --link-shared wants to link to a bunch of shared
libraries which don't exist, so we end up at dev.py:308, but the guess
that makes ('libLLVM*.dll') doesn't take into account the existence of
implibs (which is fixable), but even if it did 'libLLVM-7.0.dll.a'
doesn't seem to exist... so not sure how to fix this...)

Also some steps towards making that work:

Adjust helper_create_binary_wrapper for MSYS2. The .bat wrapper should
run msys2 python, not try to invoke the 'py' python launcher (which may
not be present)

Suppress echoing of the command in helper_create_binary_wrapper
(otherwise the echoed command can interfere in interpreting the output
of the wrapped command, which seems to be the case when it's
llvm-config)

1 files changed, 6 insertions, 1 deletions

diff --git a/run_unittests.py b/run_unittests.py
index a5124473f..5677efab7 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -4700,7 +4700,10 @@ class NativeFileTests(BasePlatformTests):
         # invokes our python wrapper
         batfile = os.path.join(self.builddir, 'binary_wrapper{}.bat'.format(self.current_wrapper))
         with open(batfile, 'wt') as f:
-            f.write('py -3 {} %*'.format(filename))
+            if mesonbuild.environment.detect_msys2_arch():
+                f.write(r'@python3 {} %*'.format(filename))
+            else:
+                f.write('@py -3 {} %*'.format(filename))
         return batfile
 
     def helper_for_compiler(self, lang, cb):
@@ -4745,6 +4748,8 @@ class NativeFileTests(BasePlatformTests):
 
     def test_config_tool_dep(self):
         # Do the skip at this level to avoid screwing up the cache
+        if mesonbuild.environment.detect_msys2_arch():
+            raise unittest.SkipTest('Skipped due to problems with LLVM on MSYS2')
         if not shutil.which('llvm-config'):
             raise unittest.SkipTest('No llvm-installed, cannot test')
         self._simple_test('config_dep', 'llvm-config')