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

[mstorsjo]

Summary

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

[alvinhochun]

Looks like a straightforward test fix.

[mati865]

LGTM

[dyung]

Hi @mstorsjo, the change you made is causing the test llvm/test/tools/llvm-config/system-libs.test to fail on the PS5 Windows bot. Can you fix the test or revert if you need time to investigate?

https://lab.llvm.org/buildbot/#/builders/216/builds/20982

******************** TEST 'LLVM :: tools/llvm-config/system-libs.test' FAILED ********************
Script:
--
: 'RUN: at line 1';   z:\b\llvm-clang-x86_64-sie-win\build\bin\llvm-config.exe --link-static --system-libs Support 2>&1 | z:\b\llvm-clang-x86_64-sie-win\build\bin\filecheck.exe Z:\b\llvm-clang-x86_64-sie-win\llvm-project\llvm\test\tools\llvm-config\system-libs.test
--
Exit Code: 1
Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "z:\b\llvm-clang-x86_64-sie-win\build\bin\llvm-config.exe" "--link-static" "--system-libs" "Support"
$ "z:\b\llvm-clang-x86_64-sie-win\build\bin\filecheck.exe" "Z:\b\llvm-clang-x86_64-sie-win\llvm-project\llvm\test\tools\llvm-config\system-libs.test"
# command stderr:
Z:\b\llvm-clang-x86_64-sie-win\llvm-project\llvm\test\tools\llvm-config\system-libs.test:4:8: error: CHECK: expected string not found in input
CHECK: -l
       ^
<stdin>:1:1: note: scanning from here
psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib
^
<stdin>:1:6: note: possible intended match here
psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib
     ^
Input file: <stdin>
Check file: Z:\b\llvm-clang-x86_64-sie-win\llvm-project\llvm\test\tools\llvm-config\system-libs.test
-dump-input=help explains the following input dump.
Input was:
<<<<<<
           1: psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib 
check:4'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
check:4'1          ?                                                 possible intended match
>>>>>>
error: command failed with exit status: 1
--
********************

[mstorsjo]

In D149998#4331023, @dyung wrote:

Hi @mstorsjo, the change you made is causing the test llvm/test/tools/llvm-config/system-libs.test to fail on the PS5 Windows bot. Can you fix the test or revert if you need time to investigate?

Sorry about that, and sorry for not being around to revert it in a timely manner.

What's the target set to in the runs of this buildbot? I guess target might be anything, for cases that are configured to cross compile by default, so we shouldn't rely on that in this test. I wonder if there's some similar feature we could check for the host instead of the target? Or perhaps we should just mark the windows part of the test UNSUPPORTED: target={{.*-windows-gnu}} and not complicate things more than necessary - that should be enough to achieve what we want here...

[dyung]

In D149998#4331540, @mstorsjo wrote:

In D149998#4331023, @dyung wrote:

Hi @mstorsjo, the change you made is causing the test llvm/test/tools/llvm-config/system-libs.test to fail on the PS5 Windows bot. Can you fix the test or revert if you need time to investigate?

Sorry about that, and sorry for not being around to revert it in a timely manner.

What's the target set to in the runs of this buildbot?

On this buildbot, the default target triple is set to x86_64-sie-ps5.

[alvinhochun]

In D149998#4331540, @mstorsjo wrote:

I guess target might be anything, for cases that are configured to cross compile by default, so we shouldn't rely on that in this test. I wonder if there's some similar feature we could check for the host instead of the target? Or perhaps we should just mark the windows part of the test UNSUPPORTED: target={{.*-windows-gnu}} and not complicate things more than necessary - that should be enough to achieve what we want here...

Seems that you may need to add a lit.cfg.py and check config.host_triple in there to set a custom feature keyword.

[mstorsjo]

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?

[mstorsjo]

In D149998#4337553, @mstorsjo wrote:

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

I relanded this patch now, and it seems to run fine in this buildbot this time: https://lab.llvm.org/buildbot/#/builders/216

[dyung]

In D149998#4345101, @mstorsjo wrote:

In D149998#4337553, @mstorsjo wrote:

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

I relanded this patch now, and it seems to run fine in this buildbot this time: https://lab.llvm.org/buildbot/#/builders/216

I saw that, thanks for the fix! I apologize for not being able to get to this, much of our internal buildbot infrastructure was down for various reasons this past weekend which I was trying to get fixed.

llvm/test/lit.cfg.py

 # LLVM can be configured with an empty default triple
 # Some tests are "generic" and require a valid default triple
 if config.target_triple:
     config.available_features.add('default_triple')
     # Direct object generation
     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')
 
 import subprocess
 
 
 def have_ld_plugin_support():
     if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold' + config.llvm_shlib_ext)):

llvm/test/tools/llvm-config/system-libs.test

 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

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

 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
 CHECK-NOT: warning