[llvm] 200ac6c - [llvm-objcopy][test] Fix tests when path contains "bar"

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2020-01-30T17:56:12-08:00
New Revision: 200ac6c3d88a1816c7ea86d5cde85e115a809542

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

LOG: [llvm-objcopy][test] Fix tests when path contains "bar"

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

Added: 
    

Modified: 
    llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test
    llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test b/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test
index c9d21ac8b2ee..7b2ed218d7a1 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test
@@ -3,12 +3,13 @@
 
 # RUN: yaml2obj --docnum=1 %s -o %t.o
 # 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
 
 # RUN: llvm-objcopy -j .text -j .rela.text1 %t.o %t2.o
 # RUN: llvm-readobj --symbols %t2.o | FileCheck %s --check-prefix=BAR
 
-# BAR: bar
+# CHECK-NOT: Name: bar
+# BAR: Name: bar
 
 --- !ELF
 FileHeader:
@@ -43,7 +44,7 @@ Symbols:
 
 # RUN: yaml2obj --docnum=2 %s -o %t.o
 # RUN: llvm-objcopy -j .keep_me %t.o %t2.o
-# RUN: llvm-readobj --symbols %t2.o | FileCheck %s --implicit-check-not=bar
+# RUN: llvm-readobj --symbols %t2.o | FileCheck %s
 
 --- !ELF
 FileHeader:

diff  --git a/llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test b/llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test
index ca39ec620139..651d92fab3ba 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test
@@ -5,12 +5,13 @@
 # RUN: yaml2obj %s -o %t.o
 ## 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 --implicit-check-not='] bar' --implicit-check-not=.blag
 
-# VALIDATE: String dump of section '.strtab':
-# VALIDATE: bazfoobar
-# VALIDATE: String dump of section '.shstrtab':
-# VALIDATE: .blam.blah.blag
+# VALIDATE:      String dump of section '.strtab':
+# VALIDATE-NEXT: [     1] bazfoobar
+# VALIDATE-EMPTY:
+# VALIDATE-NEXT: String dump of section '.shstrtab':
+# VALIDATE-NEXT: [     1] .blam.blah.blag
 
 ## Case 1: Basic copy.
 # RUN: llvm-objcopy %t.o %t.copy
@@ -57,7 +58,7 @@
 ## Case 5: Remove symbol.
 # RUN: llvm-objcopy %t.o %t.remove-symbol -N foobar
 # RUN: llvm-readobj --symbols %t.remove-symbol \
-# RUN:   | FileCheck %s --check-prefix=REMOVE-SYMBOL --implicit-check-not foobar
+# RUN:   | FileCheck %s --check-prefix=REMOVE-SYMBOL --implicit-check-not='Name: foobar'
 
 # REMOVE-SYMBOL: Symbols [
 # REMOVE-SYMBOL:   Name: bar (