[llvm] r361621 - [llvm-objdump][test] Fix for spurious matches against file paths

James Henderson via llvm-commits llvm-commits at lists.llvm.org
Fri May 24 03:07:24 PDT 2019


Author: jhenderson
Date: Fri May 24 03:07:24 2019
New Revision: 361621

URL: http://llvm.org/viewvc/llvm-project?rev=361621&view=rev
Log:
[llvm-objdump][test] Fix for spurious matches against file paths

r361479 added tests that did --implicit-check-not=main, but a user found
that they failed on his machine, due to it having 'main' in a file path
printed earlier in the output. This test fixes this issue by making the
check pattern more explicit.

Modified:
    llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-missing-source.test
    llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-no-debug-info.test
    llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-relative-paths.test

Modified: llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-missing-source.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-missing-source.test?rev=361621&r1=361620&r2=361621&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-missing-source.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-missing-source.test Fri May 24 03:07:24 2019
@@ -7,7 +7,7 @@
 # RUN: llc -o %t.o -filetype=obj -mtriple=x86_64-pc-linux %t.ll
 # RUN: llc -o %t2.o -filetype=obj -mtriple=x86_64-pc-linux %t2.ll
 
-# RUN: llvm-objdump --source %t.o | FileCheck %s --implicit-check-not=main
+# RUN: llvm-objdump --source %t.o | FileCheck %s --implicit-check-not='main()'
 # RUN: llvm-objdump --source %t2.o | FileCheck %s --check-prefixes=CHECK,SOURCE
 
 # CHECK:       0000000000000010 main:

Modified: llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-no-debug-info.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-no-debug-info.test?rev=361621&r1=361620&r2=361621&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-no-debug-info.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-no-debug-info.test Fri May 24 03:07:24 2019
@@ -6,7 +6,7 @@
 # RUN: llvm-objcopy --strip-debug %t.o %t2.o
 
 # RUN: llvm-objdump --source %t.o | FileCheck %s --check-prefixes=CHECK,SOURCE
-# RUN: llvm-objdump --source %t2.o | FileCheck %s --implicit-check-not=main
+# RUN: llvm-objdump --source %t2.o | FileCheck %s --implicit-check-not='main()'
 
 # CHECK:       0000000000000010 main:
 # SOURCE-NEXT: ; int main() {

Modified: llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-relative-paths.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-relative-paths.test?rev=361621&r1=361620&r2=361621&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-relative-paths.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-relative-paths.test Fri May 24 03:07:24 2019
@@ -17,18 +17,18 @@
 
 # RUN: cd %t
 # RUN: llvm-objdump --source a/a.o | FileCheck %s --check-prefixes=CHECK,SOURCE
-# RUN: llvm-objdump --source a/b.o | FileCheck %s --implicit-check-not=main
-# RUN: llvm-objdump --source a/c.o | FileCheck %s --implicit-check-not=main
-# RUN: llvm-objdump --source a/d.o | FileCheck %s --implicit-check-not=main
+# RUN: llvm-objdump --source a/b.o | FileCheck %s --implicit-check-not='main()'
+# RUN: llvm-objdump --source a/c.o | FileCheck %s --implicit-check-not='main()'
+# RUN: llvm-objdump --source a/d.o | FileCheck %s --implicit-check-not='main()'
 # RUN: cd a
-# RUN: llvm-objdump --source a.o | FileCheck %s --implicit-check-not=main
+# RUN: llvm-objdump --source a.o | FileCheck %s --implicit-check-not='main()'
 # RUN: llvm-objdump --source b.o | FileCheck %s --check-prefixes=CHECK,SOURCE
 # RUN: llvm-objdump --source c.o | FileCheck %s --check-prefixes=CHECK,SOURCE
-# RUN: llvm-objdump --source d.o | FileCheck %s --implicit-check-not=main
+# RUN: llvm-objdump --source d.o | FileCheck %s --implicit-check-not='main()'
 # RUN: cd b
-# RUN: llvm-objdump --source ../a.o | FileCheck %s --implicit-check-not=main
-# RUN: llvm-objdump --source ../b.o | FileCheck %s --implicit-check-not=main
-# RUN: llvm-objdump --source ../c.o | FileCheck %s --implicit-check-not=main
+# RUN: llvm-objdump --source ../a.o | FileCheck %s --implicit-check-not='main()'
+# RUN: llvm-objdump --source ../b.o | FileCheck %s --implicit-check-not='main()'
+# RUN: llvm-objdump --source ../c.o | FileCheck %s --implicit-check-not='main()'
 # RUN: llvm-objdump --source ../d.o | FileCheck %s --check-prefixes=CHECK,SOURCE
 
 # CHECK:       0000000000000010 main:




More information about the llvm-commits mailing list