[lld] f0f4d41 - [lld][test] Make tests pass when the test directory matches `bar`

[Fangrui Song via llvm-commits]

Author: Benjamin Barenblat
Date: 2020-03-06T13:27:02-08:00
New Revision: f0f4d41631a9018865376fd0041bf9b995b32a78

URL: https://github.com/llvm/llvm-project/commit/f0f4d41631a9018865376fd0041bf9b995b32a78
DIFF: https://github.com/llvm/llvm-project/commit/f0f4d41631a9018865376fd0041bf9b995b32a78.diff

LOG: [lld][test] Make tests pass when the test directory matches `bar`

Reviewed By: jhenderson, MaskRay

Differential Revision: https://reviews.llvm.org/D72360

Added: 
    

Modified: 
    lld/test/COFF/start-lib.ll
    lld/test/ELF/assignment-archive.s
    lld/test/ELF/lto/linker-script-symbols-assign.ll
    lld/test/ELF/undefined-glob.s

Removed: 
    


################################################################################
diff  --git a/lld/test/COFF/start-lib.ll b/lld/test/COFF/start-lib.ll
index c48c167ff1b4..ac12db067ffa 100644
--- a/lld/test/COFF/start-lib.ll
+++ b/lld/test/COFF/start-lib.ll
@@ -22,9 +22,10 @@
 ; 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-NOT: Name: foo
+; TEST2:     Address Size Align Out In Symbol
+; TEST2-NOT:                           {{ }}foo{{$}}
+; TEST2:                               {{ }}bar{{$}}
+; TEST2-NOT:                           {{ }}foo{{$}}
 ;
 ; RUN: lld-link -out:%t3.exe -entry:main -opt:noref -lldmap:%t3.map \
 ; RUN:     %t.obj -start-lib %t1.obj %t2.obj
@@ -32,8 +33,9 @@
 ; 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:     Address Size Align Out In Symbol
+; 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"

diff  --git a/lld/test/ELF/assignment-archive.s b/lld/test/ELF/assignment-archive.s
index d6e9610842db..f71c331f1743 100644
--- a/lld/test/ELF/assignment-archive.s
+++ b/lld/test/ELF/assignment-archive.s
@@ -7,6 +7,7 @@
 # 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

diff  --git a/lld/test/ELF/lto/linker-script-symbols-assign.ll b/lld/test/ELF/lto/linker-script-symbols-assign.ll
index e5e267507cc3..079113e1fcfd 100644
--- a/lld/test/ELF/lto/linker-script-symbols-assign.ll
+++ b/lld/test/ELF/lto/linker-script-symbols-assign.ll
@@ -3,7 +3,7 @@
 
 ; 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
+; RUN: llvm-nm %t2.lto.o | count 0
 
 ; CHECK-NOT: bar
 ; CHECK-NOT: foo

diff  --git a/lld/test/ELF/undefined-glob.s b/lld/test/ELF/undefined-glob.s
index 30d7adeefc90..f6d692acf2eb 100644
--- a/lld/test/ELF/undefined-glob.s
+++ b/lld/test/ELF/undefined-glob.s
@@ -14,7 +14,7 @@
 # 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
+# RUN: llvm-nm %t.exe | FileCheck --check-prefix=NO-OPT %s
 
 # NO-OPT-NOT: foo
 # NO-OPT-NOT: bar