From: Georgii Rymar Date: Tue, 14 Apr 2020 15:04:48 +0000 (+0300) Subject: [LLVM/tools][test] - Remove/fix dead check prefixes. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82bfe3b1774b32539fedb0750467618e187c85b2;p=platform%2Fupstream%2Fllvm.git [LLVM/tools][test] - Remove/fix dead check prefixes. We have a few unused/broken FileCheck prefixes in `llvm/test/tools`. This patch fixes it. Differential revision: https://reviews.llvm.org/D78110 --- diff --git a/llvm/test/tools/llvm-dwp/X86/merge.test b/llvm/test/tools/llvm-dwp/X86/merge.test index ea0adcc..ff86084 100644 --- a/llvm/test/tools/llvm-dwp/X86/merge.test +++ b/llvm/test/tools/llvm-dwp/X86/merge.test @@ -1,5 +1,5 @@ RUN: llvm-dwp %p/../Inputs/merge/notypes/c.dwo %p/../Inputs/merge/notypes/ab.dwp -o - | \ -RUN: llvm-dwarfdump -v - | FileCheck --check-prefix=CHECK --check-prefix=NOTYP %s +RUN: llvm-dwarfdump -v - | FileCheck --check-prefix=CHECK %s DWP from a DWO (c.dwo) and a DWP (ab.dwp, created from a.dwo and b.dwo) Make sure the entries for A and B are updated correctly when read/processed from ab.dwp diff --git a/llvm/test/tools/llvm-objcopy/COFF/patch-debug-dir.test b/llvm/test/tools/llvm-objcopy/COFF/patch-debug-dir.test index 19685be..1192a18 100644 --- a/llvm/test/tools/llvm-objcopy/COFF/patch-debug-dir.test +++ b/llvm/test/tools/llvm-objcopy/COFF/patch-debug-dir.test @@ -17,8 +17,8 @@ # SECTIONS-NEXT: VirtualSize: # SECTIONS-NEXT: VirtualAddress: # SECTIONS-NEXT: RawDataSize: -# SECTIONS-NEXT-PRE: PointerToRawData: 0x800 -# SECTIONS-NEXT-POST: PointerToRawData: 0x400 +# SECTIONS-PRE-NEXT: PointerToRawData: 0x600 +# SECTIONS-POST-NEXT: PointerToRawData: 0x400 --- !COFF OptionalHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/set-section-flags-multiple.test b/llvm/test/tools/llvm-objcopy/ELF/set-section-flags-multiple.test index dd469ab..b72ed42 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/set-section-flags-multiple.test +++ b/llvm/test/tools/llvm-objcopy/ELF/set-section-flags-multiple.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy --set-section-flags=.foo=alloc --set-section-flags=.bar=code %t %t.2 -# RUN: llvm-readobj --sections %t.2 | FileCheck %s --check-prefixes=CHECK,ALLOC,WRITE +# RUN: llvm-readobj --sections %t.2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/MachO/strip-all.test b/llvm/test/tools/llvm-objcopy/MachO/strip-all.test index fe2bc97..4ff31f5 100644 --- a/llvm/test/tools/llvm-objcopy/MachO/strip-all.test +++ b/llvm/test/tools/llvm-objcopy/MachO/strip-all.test @@ -9,7 +9,7 @@ # RUN: llvm-objcopy --strip-all %t.exec %t.exec.stripped # RUN: llvm-readobj --sections --relocations --symbols %t.exec.stripped \ -# RUN: | FileCheck --check-prefixes=COMMON,EXEC %s +# RUN: | FileCheck --check-prefix=COMMON %s # RUN: llvm-objcopy --strip-all %t.dwarf %t.dwarf.stripped # RUN: llvm-readobj --sections --relocations --symbols %t.dwarf.stripped \ diff --git a/llvm/test/tools/llvm-readobj/archive.test b/llvm/test/tools/llvm-readobj/archive.test index 5b61320..a51c2d6 100644 --- a/llvm/test/tools/llvm-readobj/archive.test +++ b/llvm/test/tools/llvm-readobj/archive.test @@ -8,8 +8,8 @@ # RUN: yaml2obj --docnum=3 %s -o %t.dir/trivial.obj.coff-arm # RUN: llvm-ar rc %t.a %t.dir/trivial.obj.elf-x86-64 %t.dir/trivial.obj.elf-i386 %t.dir/trivial.obj.coff-arm -# RUN: llvm-readobj --all %t.a | FileCheck %s -DARFILE="%t.a" --check-prefixes=HEADER,LLVM,COFF -# RUN: llvm-readelf --all %t.a | FileCheck %s -DARFILE="%t.a" --check-prefixes=HEADER,GNU,COFF +# RUN: llvm-readobj --all %t.a | FileCheck %s -DARFILE="%t.a" --check-prefixes=LLVM,COFF +# RUN: llvm-readelf --all %t.a | FileCheck %s -DARFILE="%t.a" --check-prefixes=GNU,COFF # LLVM: {{^$}} # LLVM-NEXT: File: [[ARFILE]](trivial.obj.elf-x86-64) diff --git a/llvm/test/tools/llvm-symbolizer/split-dwarf.test b/llvm/test/tools/llvm-symbolizer/split-dwarf.test index e8185ce..614db96 100644 --- a/llvm/test/tools/llvm-symbolizer/split-dwarf.test +++ b/llvm/test/tools/llvm-symbolizer/split-dwarf.test @@ -5,7 +5,7 @@ RUN: cp %p/Inputs/split-dwarf-test.dwo %t RUN: cd %t RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \ -RUN: --obj=%p/Inputs/split-dwarf-test 0x400504 0x4004f4 | FileCheck --check-prefix=CHECK --check-prefix=SPLIT --check-prefix=DWO %s +RUN: --obj=%p/Inputs/split-dwarf-test 0x400504 0x4004f4 | FileCheck --check-prefix=SPLIT --check-prefix=DWO %s Ensure we get the same results in the absence of gmlt-like data in the executable but the presence of a .dwo file