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

[Benjamin Barenblat via Phabricator via llvm-commits]

bbaren marked 2 inline comments as done.
bbaren added inline comments.


================
Comment at: lld/test/COFF/start-lib.ll:26
 ; TEST2-NOT: Name: foo
-; TEST2: bar
+; TEST2: {{[[:<:]]bar}}
 ; TEST2-NOT: Name: foo
----------------
rupprecht wrote:
> I'm not sure what this is supposed to be. Can it just be `Name: bar`? Ditto for `TEST3-NOT` below
`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`.


================
Comment at: lld/test/COFF/start-lib.ll:35
 ; RUN: FileCheck --check-prefix=TEST3 %s < %t3.thinlto.map
-; TEST3-NOT: foo
-; TEST3-NOT: bar
+; TEST3-NOT: {{[[:<:]]foo}}
+; TEST3-NOT: {{[[:<:]]bar}}
----------------
MaskRay wrote:
> Is `{{ }}foo` good enough?
> 
> The map file is something like `00001010 00000000     0                 bar`
Yes, that works great. Changed.


================
Comment at: llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test:6
 # RUN: llvm-objcopy -j .other.section %t.o %t2.o
-# RUN: llvm-readobj --symbols %t2.o | FileCheck %s --implicit-check-not=bar
+# RUN: llvm-readobj --symbols %t2.o | FileCheck %s --check-prefix=NOBAR
+
----------------
jhenderson wrote:
> rupprecht wrote:
> > 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
> 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"`).
Obviated by D72358.


================
Comment at: llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test:7-8
 ## Sanity check that the strings have been pooled.
 # RUN: llvm-readobj %t.o --string-dump .strtab --string-dump .shstrtab \
-# RUN:   | FileCheck %s --check-prefix=VALIDATE --implicit-check-not=bar --implicit-check-not=.blag
+# RUN:   | FileCheck %s --check-prefix=VALIDATE
 
----------------
jhenderson wrote:
> rupprecht wrote:
> > Same here, read from stdin
> See my above comment/comment in D72357.
Also obviated by D72358.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D72360/new/

https://reviews.llvm.org/D72360