[PATCH] D149998: [test] [llvm-config] Assume unix style lib names on mingw targets

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo updated this revision to Diff 521627.
mstorsjo added a comment.

Check specifically for the host triple instead of the target triple.

@dyung Can you take this patch for a test in your build configuration, to see if these tests work as expected now?


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D149998/new/

https://reviews.llvm.org/D149998

Files:
  llvm/test/lit.cfg.py
  llvm/test/tools/llvm-config/system-libs.test
  llvm/test/tools/llvm-config/system-libs.windows.test


Index: llvm/test/tools/llvm-config/system-libs.windows.test
===================================================================
--- llvm/test/tools/llvm-config/system-libs.windows.test
+++ llvm/test/tools/llvm-config/system-libs.windows.test
@@ -1,6 +1,6 @@
 RUN: llvm-config --link-static --system-libs Support 2>&1 | FileCheck %s
 REQUIRES: static-libs
-REQUIRES: system-windows
+REQUIRES: host={{.*-windows-msvc}}
 CHECK-NOT: -l
 CHECK: psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib
 CHECK-NOT: error
Index: llvm/test/tools/llvm-config/system-libs.test
===================================================================
--- llvm/test/tools/llvm-config/system-libs.test
+++ llvm/test/tools/llvm-config/system-libs.test
@@ -1,6 +1,6 @@
 RUN: llvm-config --link-static --system-libs Support 2>&1 | FileCheck %s
 REQUIRES: static-libs
-UNSUPPORTED: system-windows
+UNSUPPORTED: host={{.*-windows-msvc}}
 CHECK: -l
 CHECK-NOT: error
 CHECK-NOT: warning
Index: llvm/test/lit.cfg.py
===================================================================
--- llvm/test/lit.cfg.py
+++ llvm/test/lit.cfg.py
@@ -365,6 +365,10 @@
     if not config.target_triple.startswith(("nvptx", "xcore")):
         config.available_features.add('object-emission')
 
+# Allow checking for specific details in the host triple
+if config.host_triple:
+    config.available_features.add('host=%s' % config.host_triple)
+
 if config.have_llvm_driver:
   config.available_features.add('llvm-driver')
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D149998.521627.patch
Type: text/x-patch
Size: 1482 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230512/e2f82c18/attachment.bin>