This is an archive of the discontinued LLVM Phabricator instance.

Differential D121553

[lld-link] Tweak winsysroottest.test to have passing links on happy path
ClosedPublic

Authored by thakis on Mar 13 2022, 8:18 AM.

Details

Reviewers
hans
Commits
rG17414150cfa0: [lld-link] Tweak winsysroottest.test to have passing links on happy path
Summary

Previously, the test checked for a "undefined symbol" error
(instead of the "could not open std*.lib" which would happen without
the flag).

Instead, use /entry: so that the link succeeds.

No behavior change, but maybe makes the test a bit easier to understand.

Diff Detail

Event Timeline

thakis created this revision.Mar 13 2022, 8:18 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 13 2022, 8:18 AM
thakis requested review of this revision.Mar 13 2022, 8:18 AM
Harbormaster completed remote builds in B153994: Diff 414935.Mar 13 2022, 8:29 AM
hans accepted this revision.Mar 14 2022, 7:43 AM

lgtm

This revision is now accepted and ready to land.Mar 14 2022, 7:43 AM
Closed by commit rG17414150cfa0: [lld-link] Tweak winsysroottest.test to have passing links on happy path (authored by thakis). · Explain WhyMar 14 2022, 7:44 AM
This revision was automatically updated to reflect the committed changes.
thakis added a commit: rG17414150cfa0: [lld-link] Tweak winsysroottest.test to have passing links on happy path.
Herald added a project: Restricted Project. · View Herald TranscriptMar 14 2022, 7:44 AM

Revision Contents

PathSize
lld/
test/
COFF/
8 lines

Diff 415093

lld/test/COFF/winsysroot.test

Check that /winsysroot results in the correct machine-specific subdirectory Check that /winsysroot results in the correct machine-specific subdirectory
being searched for the defaultlibs, for a 32-bit .obj. being searched for the defaultlibs, for a 32-bit .obj.
# RUN: yaml2obj %p/Inputs/hello32.yaml -o %t.obj # RUN: yaml2obj %p/Inputs/hello32.yaml -o %t.obj
# RUN: mkdir -p %t.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x86 # RUN: mkdir -p %t.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x86
# RUN: mkdir -p %t.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x64 # RUN: mkdir -p %t.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x64
# RUN: cp %p/Inputs/std32.lib %t.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x86 # RUN: cp %p/Inputs/std32.lib %t.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x86
# RUN: cp %p/Inputs/std64.lib %t.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x64 # RUN: cp %p/Inputs/std64.lib %t.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x64
# RUN: not lld-link %t.obj /winsysroot:%t.dir/sysroot /defaultlib:std32 2>&1 | FileCheck -check-prefix=MISSINGENTRY32 --implicit-check-not=_ExitProcess %s # RUN: lld-link %t.obj /winsysroot:%t.dir/sysroot \
MISSINGENTRY32: undefined symbol: _mainCRTStartup # RUN: /defaultlib:std32 /entry:main@0
Check the same for a 64-bit input .obj. Check the same for a 64-bit input .obj.
# RUN: not lld-link %p/Inputs/hello64.obj /winsysroot:%t.dir/sysroot /defaultlib:std64 2>&1 | FileCheck -check-prefix=MISSINGENTRY64 --implicit-check-not=_ExitProcess %s # RUN: lld-link %p/Inputs/hello64.obj /winsysroot:%t.dir/sysroot \
MISSINGENTRY64: undefined symbol: mainCRTStartup # RUN: /defaultlib:std64 /entry:main
Check that when /winsysroot is specified, %LIB% is ignored. Check that when /winsysroot is specified, %LIB% is ignored.
# RUN: env LIB=foo.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x86 not lld-link %t.obj /winsysroot:%t.dir/doesnotexist /defaultlib:std32 2>&1 | FileCheck -check-prefix=LIBIGNORED %s # RUN: env LIB=foo.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x86 not lld-link %t.obj /winsysroot:%t.dir/doesnotexist /defaultlib:std32 2>&1 | FileCheck -check-prefix=LIBIGNORED %s
LIBIGNORED: could not open 'std32.lib' LIBIGNORED: could not open 'std32.lib'