Revert "test cases/15 llvm: Skip cmake when llvm == 17.0"

Latest MSYS2 provides LLVM 18, where its CMake files are no longer broken. This reverts commit 890dd31.
frida · Mar 19, 2024 · a00ffcc · a00ffcc
1 parent cc689ed
commit a00ffcc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build
@@ -8,11 +8,6 @@ if not d.found()
   error('MESON_SKIP_TEST llvm not found.')
 endif
 
-if method != 'config-tool' and d.version().startswith('17.0') and host_machine.system() == 'windows'
-  # https://github.com/llvm/llvm-project/commit/e7fc7540daa9333f0be4f380fc9c619236d17f57#r130257253
-  error('MESON_SKIP_TEST broken llvm cmake files on MSYS2')
-endif
-
 modules_to_find = [
   'bitwriter', 'asmprinter', 'executionengine', 'mcjit', 'target',
   'nativecodegen', 'amdgpu', 'engine'

diff --git a/test cases/frameworks/15 llvm/test.json b/test cases/frameworks/15 llvm/test.json
@@ -3,8 +3,8 @@
     "options": {
       "method": [
         { "val": "config-tool", "expect_skip_on_jobname": ["msys2-gcc"] },
-        { "val": "cmake", "expect_skip_on_jobname": ["msys2"] },
-        { "val": "combination", "expect_skip_on_jobname": ["msys2"] }
+        { "val": "cmake", "expect_skip_on_jobname": ["msys2-gcc"] },
+        { "val": "combination", "expect_skip_on_jobname": ["msys2-gcc"] }
       ],
       "link-static": [
         { "val": true, "expect_skip_on_jobname": ["arch", "opensuse", "linux-gentoo-gcc"] },