This is an archive of the discontinued LLVM Phabricator instance.

[llvm-rc] [test] Fix the windres-preproc test with other mingw triple forms. NFC.
ClosedPublic

Authored by mstorsjo on Sep 18 2022, 3:04 PM.

Details

Summary

When invoking the preprocessor, llvm-windres produces a mingw
triple; if the llvm default target triple is a mingw target, it
is used as is - if not, a mingw style triple is generated.

Relax the testcase, to not strictly require "w64" as vendor (allow
the vendor field to be missing entirely), and allow both
"mingw32" and "windows-gnu" as OS/environment (where both forms are
common, while the latter is the normalized form).

Diff Detail

Event Timeline

mstorsjo created this revision.Sep 18 2022, 3:04 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 18 2022, 3:04 PM
mstorsjo requested review of this revision.Sep 18 2022, 3:04 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 18 2022, 3:04 PM
mati865 accepted this revision.Sep 18 2022, 4:02 PM

LGTM

This revision is now accepted and ready to land.Sep 18 2022, 4:02 PM
alvinhochun accepted this revision.Sep 19 2022, 1:21 AM

Confirmed that this fixes the test on my end, thanks!