This is an archive of the discontinued LLVM Phabricator instance.

Differential D126366

[llvm-rc] Avoid which(1) dependency in windres-prefix.test
ClosedPublic

Authored by mgorny on May 25 2022, 4:07 AM.

Details

Reviewers
mstorsjo
MaskRay
Commits
rGe40c4dd66218: [llvm-rc] Avoid which(1) dependency in windres-prefix.test
Summary

Rely on lit substitution to provide the path to llvm-windres instead
of redundantly calling which(1) with the subtituted absolute path.
This fixes test failure on the happy systems without which(1) installed.

Diff Detail

Event Timeline

mgorny created this revision.May 25 2022, 4:07 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 25 2022, 4:07 AM
Herald added a subscriber: StephenFan. · View Herald Transcript
mgorny requested review of this revision.May 25 2022, 4:07 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 25 2022, 4:07 AM
mstorsjo accepted this revision.May 25 2022, 4:09 AM

If this works, then LGTM!

This revision is now accepted and ready to land.May 25 2022, 4:09 AM
Harbormaster completed remote builds in B166235: Diff 431935.May 25 2022, 4:51 AM
mgorny added a comment.May 25 2022, 7:15 AM

Thanks!

This revision was landed with ongoing or failed builds.May 25 2022, 7:15 AM
Closed by commit rGe40c4dd66218: [llvm-rc] Avoid which(1) dependency in windres-prefix.test (authored by mgorny). · Explain Why
This revision was automatically updated to reflect the committed changes.
mgorny added a commit: rGe40c4dd66218: [llvm-rc] Avoid which(1) dependency in windres-prefix.test.

Revision Contents

PathSize
llvm/
test/
tools/
llvm-rc/
2 lines

Diff 431981

llvm/test/tools/llvm-rc/windres-prefix.test

; REQUIRES: shell ; REQUIRES: shell
; RUN: rm -rf %t && mkdir %t ; RUN: rm -rf %t && mkdir %t
; Check that a triple prefix on the executable gets picked up as target triple. ; Check that a triple prefix on the executable gets picked up as target triple.
; RUN: ln -fs $(which llvm-windres) %t/aarch64-w64-mingw32-windres ; RUN: ln -fs llvm-windres %t/aarch64-w64-mingw32-windres
; RUN: %t/aarch64-w64-mingw32-windres -### %p/Inputs/empty.rc %t.res | FileCheck %s --check-prefix=CHECK-PREPROC ; RUN: %t/aarch64-w64-mingw32-windres -### %p/Inputs/empty.rc %t.res | FileCheck %s --check-prefix=CHECK-PREPROC
; CHECK-PREPROC: "clang" "--driver-mode=gcc" "-target" "aarch64-w64-mingw32" ; CHECK-PREPROC: "clang" "--driver-mode=gcc" "-target" "aarch64-w64-mingw32"
; Check that the triple prefix also affects the output object file type. ; Check that the triple prefix also affects the output object file type.
; RUN: %t/aarch64-w64-mingw32-windres --no-preprocess %p/Inputs/tag-stringtable-basic.rc %t.o ; RUN: %t/aarch64-w64-mingw32-windres --no-preprocess %p/Inputs/tag-stringtable-basic.rc %t.o
; RUN: llvm-readobj --coff-resources %t.o | FileCheck %s --check-prefix=CHECK-OBJ ; RUN: llvm-readobj --coff-resources %t.o | FileCheck %s --check-prefix=CHECK-OBJ
; CHECK-OBJ: Format: COFF-ARM64 ; CHECK-OBJ: Format: COFF-ARM64
; CHECK-OBJ: Resources [ ; CHECK-OBJ: Resources [
; CHECK-OBJ: Total Number of Resources: ; CHECK-OBJ: Total Number of Resources: