[llvm] e8ea7d2 - Revert "[test] [llvm-config] Assume unix style lib names on mingw targets"

[Douglas Yung via llvm-commits]

Author: Douglas Yung
Date: 2023-05-09T17:42:28-07:00
New Revision: e8ea7d2d788f2ce1a71978d69de2367ec6d2df11

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

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

This reverts commit 38db3795e706b212a34140a395d642195b9d150e.

This change was causing a test failure on the PS5 Windows bot:
https://lab.llvm.org/buildbot/#/builders/216/builds/20982

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/llvm-config/system-libs.test b/llvm/test/tools/llvm-config/system-libs.test
index ac747bf4e8c83..708ce3ef99a42 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: target={{.*-windows-msvc}}
+UNSUPPORTED: system-windows
 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 471ed871c3048..55d1fbea97888 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: target={{.*-windows-msvc}}
+REQUIRES: system-windows
 CHECK-NOT: -l
 CHECK: psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib
 CHECK-NOT: error