[Test] Make llvm and lld tests pass when $USER matches `bar`

[rupprecht]

I left similar comments on D72357 too

lld/test/COFF/start-lib.ll

26

I'm not sure what this is supposed to be. Can it just be Name: bar? Ditto for TEST3-NOT below

llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test

6 ↗

(On Diff #236673)

Read from stdin to avoid the filename showing up, e.g.

# RUN: llvm-readobj --symbols < %t2.o | FileCheck %s --implicit-check-not=bar

Then the rest of the test can remain unchanged

llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test

7–8 ↗

(On Diff #236673)

Same here, read from stdin

[MaskRay]

lld/test/COFF/start-lib.ll

35–36

Is {{ }}foo good enough?

The map file is something like 00001010 00000000 0 bar

[jhenderson]

llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test

6 ↗

(On Diff #236673)

This will collide with D72357. As noted in that review, I'd prefer just changing the patterns to "Name: bar" (e.g. --implicit-check-not="Name: bar").

llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test

7–8 ↗

(On Diff #236673)

See my above comment/comment in D72357.

[bbaren]

Take D72358 into account; simplify some regexes

[MaskRay]

lld/test/ELF/lto/linker-script-symbols-assign.ll

6

Use llvm-nm %t2.lto.o

It does not include a file name.

lld/test/ELF/undefined-glob.s

17

Use llvm-nm

[bbaren]

Use llvm-nm where appropriate

[bbaren]

lld/test/COFF/start-lib.ll

26

Name: bar doesn’t work – the map file contains

00001010 00000000     0                 bar

However, @MaskRay’s suggestion below applies here as well. Changed to {{ }}bar.

35–36

Yes, that works great. Changed.

llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test

6 ↗

(On Diff #236673)

Obviated by D72358.

llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test

7–8 ↗

(On Diff #236673)

Also obviated by D72358.

[MaskRay]

lld/test/COFF/start-lib.ll

26

Maybe it is clearer to match the full line.

lld/test/ELF/lto/linker-script-symbols-assign.ll

6

| count 0

[bbaren]

Use count 0 to check for empty output

[jhenderson]

lld/test/COFF/start-lib.ll

26

If that's the format, then the TEST2-NOT lines either side of this line won't work...

Also, perhaps consider {{ }}bar{{$}, since {{ }}bar could match somebody with a space in their path before "bar".

[bbaren]

Check for end-of-line in start-lib.ll, and fix assertion issue

lld/test/COFF/start-lib.ll

26

Ah, good point. Switched everywhere to {{ }}symbolName{{$}}.

[jhenderson]

lld/test/COFF/start-lib.ll

35–36

Possibly want to change these lines too to have {{$}} at the end?

[bbaren]

Add some more end-of-line checks

[MaskRay]

lld/test/COFF/start-lib.ll

26

It may be helpful to add ; TEST2: Address Size Align Out In Symbol before the first check line.

The sames applies to TEST3

[MaskRay]

Does this fix ninja -C /path/to/build/directory check-all for you?

[bbaren]

In D72360#1903538, @MaskRay wrote:

Does this fix ninja -C /path/to/build/directory check-all for you?

It does for me, at least.

[jhenderson]

LGTM.

lld/test/COFF/start-lib.ll

 ;
 ; RUN: lld-link -out:%t2.exe -entry:main -opt:noref -lldmap:%t2.map \
 ; RUN:     %t.obj -start-lib %t1.obj -end-lib %t2.obj
 ; RUN: FileCheck --check-prefix=TEST2 %s < %t2.map
 ; RUN: lld-link -out:%t2.exe -entry:main -opt:noref -lldmap:%t2.thinlto.map \
 ; RUN:     %t.bc -start-lib %t1.bc -end-lib %t2.bc
 ; RUN: FileCheck --check-prefix=TEST2 %s < %t2.thinlto.map
 ; TEST2-NOT: Name: foo
-; TEST2: bar
+; TEST2: {{ }}bar
 ; TEST2-NOT: Name: foo
 ;
 ; RUN: lld-link -out:%t3.exe -entry:main -opt:noref -lldmap:%t3.map \
 ; RUN:     %t.obj -start-lib %t1.obj %t2.obj
 ; RUN: FileCheck --check-prefix=TEST3 %s < %t3.map
 ; RUN: lld-link -out:%t3.exe -entry:main -opt:noref -lldmap:%t3.thinlto.map \
 ; RUN:     %t.bc -start-lib %t1.bc %t2.bc
 ; RUN: FileCheck --check-prefix=TEST3 %s < %t3.thinlto.map
-; TEST3-NOT: foo
-; TEST3-NOT: bar
+; TEST3-NOT: {{ }}foo
+; TEST3-NOT: {{ }}bar
 
 target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-windows-msvc"
 
 define void @main() {
   ret void
 }

lld/test/ELF/assignment-archive.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %ta.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux -o %t.o < /dev/null
 # RUN: rm -f %tar.a
 # RUN: llvm-ar rcs %tar.a %ta.o
 
 # RUN: echo "SECTIONS { foo = 1; }" > %t1.script
 # RUN: ld.lld -o %t1.exe --script %t1.script %tar.a %t.o
 # RUN: llvm-readobj --symbols %t1.exe | FileCheck %s
+# CHECK:     Symbols [
 # CHECK-NOT: bar
 # CHECK:     foo
 # CHECK-NOT: bar
 
 # RUN: echo "SECTIONS { zed = foo; }" > %t2.script
 # RUN: ld.lld -o %t2.exe --script %t2.script %tar.a %t.o
 # RUN: llvm-readobj --symbols %t2.exe | FileCheck %s --check-prefix=SYMS
 # SYMS: bar

lld/test/ELF/lto/linker-script-symbols-assign.ll

 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 
 ; RUN: echo "foo = 1;" > %t.script
 ; RUN: ld.lld %t.o -o %t2 --script %t.script -save-temps
 ; RUN: llvm-readobj --symbols %t2.lto.o | FileCheck %s
 
+; CHECK: Symbols [
 ; CHECK-NOT: bar
 ; CHECK-NOT: foo
 
 ; RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=VAL
 ; VAL:       Symbol {
 ; VAL:        Name: foo
 ; VAL-NEXT:   Value: 0x1
 ; VAL-NEXT:   Size:

lld/test/ELF/undefined-glob.s

 # REQUIRES: x86
 
 # RUN: echo '.globl foo1; foo1:' | \
 # RUN:   llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t1.o
 # RUN: echo '.globl foo2; foo2:' | \
 # RUN:   llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t2.o
 # RUN: echo '.globl foo32; foo32:' | \
 # RUN:   llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t3.o
 # RUN: echo '.globl bar; bar:' | \
 # RUN:   llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t4.o
 # RUN: rm -f %t.a
 # RUN: llvm-ar rcs %t.a %t1.o %t2.o %t3.o %t4.o
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 
 # RUN: ld.lld -o %t.exe %t.o %t.a
 # RUN: llvm-readobj --symbols %t.exe | FileCheck --check-prefix=NO-OPT %s
 
+# NO-OPT: Symbols [
 # NO-OPT-NOT: foo
 # NO-OPT-NOT: bar
 
 # RUN: ld.lld -o %t.exe %t.o %t.a --undefined-glob foo1
 # RUN: llvm-readobj --symbols %t.exe | FileCheck --check-prefix=FOO1 %s
 
 # FOO1: foo1
 # FOO1-NOT: foo2