This is an archive of the discontinued LLVM Phabricator instance.

Differential D59824

[LLD] Restore tests that use "-" as output
ClosedPublic

Authored by andrewng on Mar 26 2019, 9:20 AM.

Details

Reviewers
ruiu
rnk
tlively
• espindola
Commits
rGe6b6ab2c6685: [LLD] Restore tests that use "-" as output
rLLD357072: [LLD] Restore tests that use "-" as output
rL357072: [LLD] Restore tests that use "-" as output
Summary

No longer require workarounds for output to "-" (stdout) for
Windows. These workarounds were just hiding the actual problem which is
fixed by patch D59663. This needs to land after D59663.

Diff Detail

Repository
rL LLVM

Event Timeline

andrewng created this revision.Mar 26 2019, 9:20 AM
Herald added a reviewer: • espindola. · View Herald TranscriptMar 26 2019, 9:20 AM
Herald added subscribers: MaskRay, aheejin, arichardson and 2 others. · View Herald Transcript
andrewng mentioned this in D59663: [Support] MemoryBlock size should reflect the requested size.Mar 26 2019, 9:22 AM
ruiu accepted this revision.Mar 26 2019, 9:33 AM

LGTM

This revision is now accepted and ready to land.Mar 26 2019, 9:33 AM
tlively added a comment.Mar 26 2019, 9:35 AM

I think there are more tests that should use -o - in wasm/target-feature-none.yaml, but otherwise the wasm changes lgtm.

andrewng added a comment.Mar 26 2019, 11:05 AM
In D59824#1443159, @tlively wrote:

I think there are more tests that should use -o - in wasm/target-feature-none.yaml, but otherwise the wasm changes lgtm.

Thanks for pointing that out. I'll update that test too (assuming the dependent patch lands OK).

Closed by commit rL357072: [LLD] Restore tests that use "-" as output (authored by anng). · Explain WhyMar 27 2019, 8:29 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptMar 27 2019, 8:29 AM

Revision Contents

Diff 192450

lld/trunk/test/ELF/stdout.s

# REQUIRES: x86 # REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o -o - > %t1 # RUN: ld.lld %t.o -o - > %t1
# RUN: llvm-objdump -d %t1 | FileCheck %s # RUN: llvm-objdump -d %t1 | FileCheck %s
# CHECK: 0000000000201000 _start: # CHECK: 0000000000201000 _start:
# CHECK: 201000: 90 nop # CHECK: 201000: 90 nop
# RUN: ld.lld %t.o -o %t2 # RUN: ld.lld %t.o -o %t2
# RUN: diff %t1 %t2
# FIXME: Add "RUN" in front of this line once the test passes on Windows
# with it.
# diff %t1 %t2
.globl _start .globl _start
_start: _start:
nop nop

lld/trunk/test/wasm/target-feature-disallowed.yaml

# RUN: yaml2obj %s -o %t1.o # RUN: yaml2obj %s -o %t1.o
# RUN: wasm-ld --no-entry --features=foo,bar,baz -o %t.specified.wasm %t1.o # RUN: wasm-ld --no-entry --features=foo,bar,baz -o %t.specified.wasm %t1.o
# RUN: obj2yaml %t.specified.wasm | FileCheck %s --check-prefix SPECIFIED # RUN: obj2yaml %t.specified.wasm | FileCheck %s --check-prefix SPECIFIED
# RUN: wasm-ld --no-entry --features=bar,baz,quux -o %t.unspecified.wasm %t1.o # RUN: wasm-ld --no-entry --features=bar,baz,quux -o %t.unspecified.wasm %t1.o
# RUN: obj2yaml %t.unspecified.wasm | FileCheck %s --check-prefix UNSPECIFIED # RUN: obj2yaml %t.unspecified.wasm | FileCheck %s --check-prefix UNSPECIFIED
# RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o # RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
# RUN: wasm-ld --no-entry -o %t.disallowed.wasm %t1.o %t.disallowed.o # RUN: wasm-ld --no-entry -o - %t1.o %t.disallowed.o | obj2yaml | FileCheck %s --check-prefix DISALLOWED
# RUN: obj2yaml %t.disallowed.wasm | FileCheck %s --check-prefix DISALLOWED
# RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o # RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
# RUN: wasm-ld --no-entry -o %t.none.wasm %t1.o %t.none.o # RUN: wasm-ld --no-entry -o - %t1.o %t.none.o | obj2yaml | FileCheck %s --check-prefix NONE
# RUN: obj2yaml %t.none.wasm | FileCheck %s --check-prefix NONE
# Check that the following combinations of feature linkage policies # Check that the following combinations of feature linkage policies
# give the expected results: # give the expected results:
# #
# DISALLOWED x DISALLOWED => NONE # DISALLOWED x DISALLOWED => NONE
# DISALLOWED x NONE => NONE # DISALLOWED x NONE => NONE
--- !WASM --- !WASM
▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines

lld/trunk/test/wasm/target-feature-none.yaml

# RUN: yaml2obj %s -o %t1.o # RUN: yaml2obj %s -o %t1.o
# RUN: wasm-ld --no-entry -o %t.empty.wasm %t1.o # RUN: wasm-ld --no-entry -o - %t1.o | obj2yaml | FileCheck %s --check-prefix EMPTY
# RUN: obj2yaml %t.empty.wasm | FileCheck %s --check-prefix EMPTY
# RUN: wasm-ld --no-entry --features= -o %t.empty.2.wasm %t1.o # RUN: wasm-ld --no-entry --features= -o - %t1.o | obj2yaml | FileCheck %s --check-prefix EMPTY
# RUN: obj2yaml %t.empty.2.wasm | FileCheck %s --check-prefix EMPTY
# RUN: wasm-ld --no-entry --features=foo,bar,baz -o %t.specified.wasm %t1.o # RUN: wasm-ld --no-entry --features=foo,bar,baz -o - %t1.o | obj2yaml | FileCheck %s --check-prefix SPECIFIED
# RUN: obj2yaml %t.specified.wasm | FileCheck %s --check-prefix SPECIFIED
--- !WASM --- !WASM
FileHeader: FileHeader:
Version: 0x00000001 Version: 0x00000001
Sections: Sections:
- Type: CUSTOM - Type: CUSTOM
Name: linking Name: linking
Version: 2 Version: 2
Show All 18 Lines

lld/trunk/test/wasm/target-feature-required.yaml

# RUN: yaml2obj %s -o %t1.o # RUN: yaml2obj %s -o %t1.o
# RUN: wasm-ld --no-entry --features=foo,bar,baz -o %t.specified.wasm %t1.o # RUN: wasm-ld --no-entry --features=foo,bar,baz -o - %t1.o | obj2yaml | FileCheck %s --check-prefix SPECIFIED
# RUN: obj2yaml %t.specified.wasm | FileCheck %s --check-prefix SPECIFIED
# RUN: not wasm-ld --no-entry --features=bar,baz,quux -o - %t1.o 2>&1 | FileCheck %s --check-prefix UNSPECIFIED # RUN: not wasm-ld --no-entry --features=bar,baz,quux -o /dev/null %t1.o 2>&1 | FileCheck %s --check-prefix UNSPECIFIED
# RUN: wasm-ld --no-entry --no-check-features --features=bar,baz,quux -o %t.unspecified.wasm %t1.o # RUN: wasm-ld --no-entry --no-check-features --features=bar,baz,quux -o - %t1.o | obj2yaml | FileCheck %s --check-prefix UNSPECIFIED-NOCHECK
# RUN: obj2yaml %t.unspecified.wasm | FileCheck %s --check-prefix UNSPECIFIED-NOCHECK
# RUN: yaml2obj %S/Inputs/require-feature-foo.yaml -o %t.required.o # RUN: yaml2obj %S/Inputs/require-feature-foo.yaml -o %t.required.o
# RUN: wasm-ld --no-entry -o %t.required.wasm %t1.o %t.required.o # RUN: wasm-ld --no-entry -o - %t1.o %t.required.o | obj2yaml | FileCheck %s --check-prefix REQUIRED
# RUN: obj2yaml %t.required.wasm | FileCheck %s --check-prefix REQUIRED
# RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o # RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
# RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED # RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED
# RUN: wasm-ld --no-entry --no-check-features -o %t.disallowed.wasm %t1.o %t.disallowed.o # RUN: wasm-ld --no-entry --no-check-features -o - %t1.o %t.disallowed.o | obj2yaml | FileCheck %s --check-prefix DISALLOWED-NOCHECK
# RUN: obj2yaml %t.disallowed.wasm | FileCheck %s --check-prefix DISALLOWED-NOCHECK
# RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o # RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
# RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.none.o 2>&1 | FileCheck %s --check-prefix NONE # RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.none.o 2>&1 | FileCheck %s --check-prefix NONE
# RUN: wasm-ld --no-entry --no-check-features -o %t.none.wasm %t1.o %t.none.o # RUN: wasm-ld --no-entry --no-check-features -o - %t1.o %t.none.o | obj2yaml | FileCheck %s --check-prefix NONE-NOCHECK
# RUN: obj2yaml %t.none.wasm | FileCheck %s --check-prefix NONE-NOCHECK
# Check that the following combinations of feature linkage policies # Check that the following combinations of feature linkage policies
# give the expected results: # give the expected results:
# #
# REQUIRED x REQUIRED => USED # REQUIRED x REQUIRED => USED
# REQUIRED x DISALLOWED => Error # REQUIRED x DISALLOWED => Error
# REQUIRED x NONE => Error # REQUIRED x NONE => Error
▲ Show 20 Lines • Show All 62 Lines • Show Last 20 Lines

lld/trunk/test/wasm/target-feature-used.yaml

# RUN: yaml2obj %s -o %t1.o # RUN: yaml2obj %s -o %t1.o
# RUN: wasm-ld --no-entry --features=foo,bar,baz -o %t.specified.wasm %t1.o # RUN: wasm-ld --no-entry --features=foo,bar,baz -o - %t1.o | obj2yaml | FileCheck %s --check-prefix SPECIFIED
# RUN: obj2yaml %t.specified.wasm | FileCheck %s --check-prefix SPECIFIED
# RUN: not wasm-ld --no-entry --features=bar,baz,quux -o - %t1.o 2>&1 | FileCheck %s --check-prefix UNSPECIFIED # RUN: not wasm-ld --no-entry --features=bar,baz,quux -o /dev/null %t1.o 2>&1 | FileCheck %s --check-prefix UNSPECIFIED
# RUN: wasm-ld --no-entry --no-check-features --features=bar,baz,quux -o %t.unspecified.wasm %t1.o # RUN: wasm-ld --no-entry --no-check-features --features=bar,baz,quux -o - %t1.o | obj2yaml | FileCheck %s --check-prefix UNSPECIFIED-NOCHECK
# RUN: obj2yaml %t.unspecified.wasm| FileCheck %s --check-prefix UNSPECIFIED-NOCHECK
# RUN: yaml2obj %S/Inputs/use-feature-foo.yaml -o %t.used.o # RUN: yaml2obj %S/Inputs/use-feature-foo.yaml -o %t.used.o
# RUN: wasm-ld --no-entry -o %t.used.wasm %t1.o %t.used.o # RUN: wasm-ld --no-entry -o - %t1.o %t.used.o | obj2yaml | FileCheck %s --check-prefix USED
# RUN: obj2yaml %t.used.wasm | FileCheck %s --check-prefix USED
# RUN: yaml2obj %S/Inputs/require-feature-foo.yaml -o %t.required.o # RUN: yaml2obj %S/Inputs/require-feature-foo.yaml -o %t.required.o
# RUN: wasm-ld --no-entry -o %t.required.wasm %t1.o %t.required.o # RUN: wasm-ld --no-entry -o - %t1.o %t.required.o | obj2yaml | FileCheck %s --check-prefix REQUIRED
# RUN: obj2yaml %t.required.wasm | FileCheck %s --check-prefix REQUIRED
# RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o # RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
# RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED # RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED
# RUN: wasm-ld --no-entry --no-check-features -o %t.disallowed.wasm %t1.o %t.disallowed.o # RUN: wasm-ld --no-entry --no-check-features -o - %t1.o %t.disallowed.o | obj2yaml | FileCheck %s --check-prefix DISALLOWED-NOCHECK
# RUN: obj2yaml %t.disallowed.wasm | FileCheck %s --check-prefix DISALLOWED-NOCHECK
# RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o # RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
# RUN: wasm-ld --no-entry -o %t.none.wasm %t1.o %t.none.o # RUN: wasm-ld --no-entry -o - %t1.o %t.none.o | obj2yaml | FileCheck %s --check-prefix NONE
# RUN: obj2yaml %t.none.wasm | FileCheck %s --check-prefix NONE
# Check that the following combinations of feature linkage policies # Check that the following combinations of feature linkage policies
# give the expected results: # give the expected results:
# #
# USED x USED => USED # USED x USED => USED
# USED x REQUIRED => USED # USED x REQUIRED => USED
# USED x DISALLOWED => Error # USED x DISALLOWED => Error
# USED x NONE => USED # USED x NONE => USED
▲ Show 20 Lines • Show All 68 Lines • Show Last 20 Lines