[llvm] 82f7b03 - Reapply [test] [llvm-config] Assume unix style lib names on mingw targets

[Martin Storsjö via llvm-commits]

Author: Martin Storsjö
Date: 2023-05-16T10:40:30+03:00
New Revision: 82f7b03d9bcbdb397965c8c97bb69b1f992b7a65

URL: https://github.com/llvm/llvm-project/commit/82f7b03d9bcbdb397965c8c97bb69b1f992b7a65
DIFF: https://github.com/llvm/llvm-project/commit/82f7b03d9bcbdb397965c8c97bb69b1f992b7a65.diff

LOG: Reapply [test] [llvm-config] Assume unix style lib names on mingw targets

Assume the MSVC style naming only for "windows-msvc" targets.

After the previous attempt, this was changed to use the host triple
instead of the target.

Differential Revision: https://reviews.llvm.org/D149998

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py
index 72f16adddebcc..59bfd8ecfd13a 100644
--- a/llvm/test/lit.cfg.py
+++ b/llvm/test/lit.cfg.py
@@ -365,6 +365,10 @@ def have_cxx_shared_library():
     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')
 

diff  --git a/llvm/test/tools/llvm-config/system-libs.test b/llvm/test/tools/llvm-config/system-libs.test
index 708ce3ef99a42..e6450a6f5a0eb 100644
--- a/llvm/test/tools/llvm-config/system-libs.test
+++ b/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

diff  --git a/llvm/test/tools/llvm-config/system-libs.windows.test b/llvm/test/tools/llvm-config/system-libs.windows.test
index 55d1fbea97888..d1d91a9a0b9e2 100644
--- a/llvm/test/tools/llvm-config/system-libs.windows.test
+++ b/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