llvm-symbolizer: Extract individual test cases now that it's easier to use directly...

Pulling out the split-dwarf tests by way of example of how I think
llvm-symbolizer should be tested going forward. Open to
debate/discussion, though.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@352004 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/DebugInfo/llvm-symbolizer.test b/test/DebugInfo/llvm-symbolizer.test
index 33d83c45cf5c531ea8b1db839e48350b0b5e358f..4c8e7ec9f0c6fee5dcf4a837b30ceab9a48c96af 100644 (file)
--- a/test/DebugInfo/llvm-symbolizer.test
+++ b/test/DebugInfo/llvm-symbolizer.test
@@ -19,46 +19,14 @@ RUN: echo "\"%t/dwarfdump-test3.elf-x86-64 space\" 0x62d" >> %t.input
 RUN: echo "%p/Inputs/macho-universal 0x1f84" >> %t.input
 RUN: echo "%p/Inputs/macho-universal:i386 0x1f67" >> %t.input
 RUN: echo "%p/Inputs/macho-universal:x86_64 0x100000f05" >> %t.input
-RUN: echo "%p/Inputs/llvm-symbolizer-dwo-test 0x400514" >> %t.input
 RUN: echo "%p/Inputs/llvm-symbolizer-local-mem-func-gcc.elf-x86-64 0x61a" >> %t.input
-RUN: echo "%p/Inputs/fission-ranges.elf-x86_64 0x720" >> %t.input
 RUN: echo "%p/Inputs/arange-overlap.elf-x86_64 0x714" >> %t.input
-RUN: cp %p/Inputs/split-dwarf-test.dwo %t
-RUN: echo "%p/Inputs/split-dwarf-test 0x400504" >> %t.input
-RUN: echo "%p/Inputs/split-dwarf-test 0x4004f4" >> %t.input
 RUN: echo "%p/Inputs/cross-cu-inlining.x86_64-macho.o 0x17" >> %t.input
-RUN: cp %p/Inputs/split-dwarf-multiple-cu.dwo %t
-RUN: echo "%p/Inputs/split-dwarf-multiple-cu.o 0x4" >> %t.input
-RUN: cp %p/Inputs/split-dwarf-addr-object-relocation.dwo %t
-RUN: echo "%p/Inputs/split-dwarf-addr-object-relocation.o 0x14" >> %t.input
-RUN: cp %p/Inputs/split-dwarf-dwp.o %t
-RUN: cp %p/Inputs/split-dwarf-dwp.o.dwp %t
-RUN: echo "%t/split-dwarf-dwp.o 0x4" >> %t.input
 
 RUN: cd %t
 RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \
 RUN:    --default-arch=i386 < %t.input | FileCheck --check-prefix=CHECK --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
-
-RUN: echo "%p/Inputs/split-dwarf-test-nogmlt 0x400504" >> %t.input
-RUN: echo "%p/Inputs/split-dwarf-test-nogmlt 0x4004f4" >> %t.input
-RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \
-RUN:    --default-arch=i386 < %t.input | FileCheck --check-prefix=SPLIT --check-prefix=DWO %s
-
-Ensure we get gmlt like results in the absence of a .dwo file but the presence of gmlt-like data in the executable
-
-RUN: rm %t/split-dwarf-test.dwo
-RUN: echo "%p/Inputs/split-dwarf-test 0x400504" >> %t.input
-RUN: echo "%p/Inputs/split-dwarf-test 0x4004f4" >> %t.input
-RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \
-RUN:    --default-arch=i386 < %t.input | FileCheck --check-prefix=SPLIT --check-prefix=NODWO %s
-
-RUN: cp %p/Inputs/split-dwarf-dwp.o %t/split-dwarf-dwp-different-name.o
-RUN: echo "%t/split-dwarf-dwp-different-name.o 0x54" > %t.input
-RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \
-RUN:    --default-arch=i386 --dwp=%p/Inputs/split-dwarf-dwp.o.dwp < %t.input | FileCheck --check-prefix=DWP %s
-
 CHECK:       main
 CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test.cc:16
 
@@ -125,28 +93,13 @@ CHECK:      main
 CHECK:      _Z3inci
 CHECK:      _Z3inci
 
-CHECK: main
-CHECK-NEXT: llvm-symbolizer-dwo-test.cc:11
-
 CHECK-NOT: local_mem_func
 CHECK: _ZZ2f1vEN3foo14local_mem_funcEv
 CHECK-NEXT: {{.*}}local-mem-func.cpp:3:0
 
-CHECK: main
-CHECK-NEXT: {{.*}}fission-ranges.cc:6
-
 CHECK: _ZN1S3bazEv
 CHECK-NEXT: {{.*}}arange-overlap.cc:6
 
-DWO: _Z2f2v
-NODWO: {{^f2$}}
-SPLIT-NEXT: {{.*}}split-dwarf-test.cpp
-SPLIT-NEXT: main
-SPLIT-NEXT: {{.*}}split-dwarf-test.cpp
-
-SPLIT: _Z2f1v
-SPLIT-NEXT: {{.*}}split-dwarf-test.cpp
-
 ; func has been inlined into main by LTO. Check that the symbolizer is able
 ; to resolve the cross-cu reference and retrieve func's name
 CHECK: func
@@ -154,21 +107,6 @@ CHECK-NEXT: /tmp{{[/\\]}}cross-cu-inlining.c:16:3
 CHECK-NEXT: main
 CHECK-NEXT: /tmp{{[/\\]}}cross-cu-inlining.c:11:0
 
-CHECK:      f2
-CHECK-NEXT: split-dwarf-multiple-cu.cpp:3:3
-CHECK-NEXT: f3
-CHECK-NEXT: split-dwarf-multiple-cu.cpp:6:0
-
-CHECK:      f2
-CHECK-NEXT: split-dwarf-addr-object-relocation.cpp:3:3
-CHECK-NEXT: f3
-CHECK-NEXT: split-dwarf-addr-object-relocation.cpp:6:0
-
-DWP:      f2
-DWP-NEXT: split-dwarf-dwp.cpp:3:3
-DWP-NEXT: main
-DWP-NEXT: split-dwarf-dwp.cpp:10:0
-
 RUN: echo "unexisting-file 0x1234" > %t.input2
 RUN: llvm-symbolizer < %t.input2 2>&1 | FileCheck %s --check-prefix=MISSING-FILE
 

diff --git a/test/DebugInfo/Inputs/llvm-symbolizer-dwo-test b/test/tools/llvm-symbolizer/Inputs/dwo-test
similarity index 100%
rename from test/DebugInfo/Inputs/llvm-symbolizer-dwo-test
rename to test/tools/llvm-symbolizer/Inputs/dwo-test

diff --git a/test/DebugInfo/Inputs/fission-ranges.cc b/test/tools/llvm-symbolizer/Inputs/fission-ranges.cc
similarity index 100%
rename from test/DebugInfo/Inputs/fission-ranges.cc
rename to test/tools/llvm-symbolizer/Inputs/fission-ranges.cc

diff --git a/test/DebugInfo/Inputs/fission-ranges.elf-x86_64 b/test/tools/llvm-symbolizer/Inputs/fission-ranges.elf-x86_64
similarity index 100%
rename from test/DebugInfo/Inputs/fission-ranges.elf-x86_64
rename to test/tools/llvm-symbolizer/Inputs/fission-ranges.elf-x86_64

diff --git a/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.cpp b/test/tools/llvm-symbolizer/Inputs/split-dwarf-addr-object-relocation.cpp
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.cpp
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-addr-object-relocation.cpp

diff --git a/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.dwo b/test/tools/llvm-symbolizer/Inputs/split-dwarf-addr-object-relocation.dwo
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.dwo
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-addr-object-relocation.dwo

diff --git a/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.o b/test/tools/llvm-symbolizer/Inputs/split-dwarf-addr-object-relocation.o
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.o
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-addr-object-relocation.o

diff --git a/test/DebugInfo/Inputs/split-dwarf-dwp.cpp b/test/tools/llvm-symbolizer/Inputs/split-dwarf-dwp.cpp
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-dwp.cpp
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-dwp.cpp

diff --git a/test/DebugInfo/Inputs/split-dwarf-dwp.o b/test/tools/llvm-symbolizer/Inputs/split-dwarf-dwp.o
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-dwp.o
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-dwp.o

diff --git a/test/DebugInfo/Inputs/split-dwarf-dwp.o.dwp b/test/tools/llvm-symbolizer/Inputs/split-dwarf-dwp.o.dwp
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-dwp.o.dwp
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-dwp.o.dwp

diff --git a/test/DebugInfo/Inputs/split-dwarf-multiple-cu.cpp b/test/tools/llvm-symbolizer/Inputs/split-dwarf-multiple-cu.cpp
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-multiple-cu.cpp
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-multiple-cu.cpp

diff --git a/test/DebugInfo/Inputs/split-dwarf-multiple-cu.dwo b/test/tools/llvm-symbolizer/Inputs/split-dwarf-multiple-cu.dwo
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-multiple-cu.dwo
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-multiple-cu.dwo

diff --git a/test/DebugInfo/Inputs/split-dwarf-multiple-cu.o b/test/tools/llvm-symbolizer/Inputs/split-dwarf-multiple-cu.o
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-multiple-cu.o
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-multiple-cu.o

diff --git a/test/DebugInfo/Inputs/split-dwarf-test b/test/tools/llvm-symbolizer/Inputs/split-dwarf-test
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-test
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-test

diff --git a/test/DebugInfo/Inputs/split-dwarf-test-nogmlt b/test/tools/llvm-symbolizer/Inputs/split-dwarf-test-nogmlt
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-test-nogmlt
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-test-nogmlt

diff --git a/test/DebugInfo/Inputs/split-dwarf-test.cc b/test/tools/llvm-symbolizer/Inputs/split-dwarf-test.cc
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-test.cc
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-test.cc

diff --git a/test/DebugInfo/Inputs/split-dwarf-test.cpp b/test/tools/llvm-symbolizer/Inputs/split-dwarf-test.cpp
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-test.cpp
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-test.cpp

diff --git a/test/DebugInfo/Inputs/split-dwarf-test.dwo b/test/tools/llvm-symbolizer/Inputs/split-dwarf-test.dwo
similarity index 100%
rename from test/DebugInfo/Inputs/split-dwarf-test.dwo
rename to test/tools/llvm-symbolizer/Inputs/split-dwarf-test.dwo

diff --git a/test/tools/llvm-symbolizer/dwo.test b/test/tools/llvm-symbolizer/dwo.test
new file mode 100644 (file)
index 0000000..c2c72f5
--- /dev/null
+++ b/test/tools/llvm-symbolizer/dwo.test
@@ -0,0 +1,4 @@
+RUN: llvm-symbolizer --obj=%p/Inputs/dwo-test 0x400514 | FileCheck %s
+
+CHECK: main
+CHECK-NEXT: llvm-symbolizer-dwo-test.cc:11

diff --git a/test/tools/llvm-symbolizer/fission-ranges.test b/test/tools/llvm-symbolizer/fission-ranges.test
new file mode 100644 (file)
index 0000000..4d35ed4
--- /dev/null
+++ b/test/tools/llvm-symbolizer/fission-ranges.test
@@ -0,0 +1,4 @@
+RUN: llvm-symbolizer --obj=%p/Inputs/fission-ranges.elf-x86_64 0x720 | FileCheck %s
+
+CHECK: main
+CHECK-NEXT: {{.*}}fission-ranges.cc:6

diff --git a/test/tools/llvm-symbolizer/split-debug.test b/test/tools/llvm-symbolizer/split-debug.test
index 7474cd6e6f248cd7731e91df7f9b027127417406..8904683228df66acfc20ebc395b867c2a94a808a 100644 (file)
--- a/test/tools/llvm-symbolizer/split-debug.test
+++ b/test/tools/llvm-symbolizer/split-debug.test
@@ -20,7 +20,7 @@
 RUN: mkdir -p %t/.debug
 RUN: llvm-objcopy --keep-section=.debug_info %p/Inputs/addr.exe %t/.debug/addr
 RUN: llvm-objcopy --strip-debug --add-gnu-debuglink=%t/.debug/addr %p/Inputs/addr.exe %t/addr.exe
-RUN: llvm-symbolizer -print-address -obj=%t/addr.exe < %p/Inputs/addr.inp | FileCheck %s
+RUN: llvm-symbolizer -print-address -obj=%t/addr.exe 0x40054d | FileCheck %s
 
 #CHECK: 0x40054d
 #CHECK: {{[/\]+}}tmp{{[/\]+}}x.c:14:0

diff --git a/test/tools/llvm-symbolizer/split-dwarf-addr-object-relocation.test b/test/tools/llvm-symbolizer/split-dwarf-addr-object-relocation.test
new file mode 100644 (file)
index 0000000..d98756d
--- /dev/null
+++ b/test/tools/llvm-symbolizer/split-dwarf-addr-object-relocation.test
@@ -0,0 +1,11 @@
+RUN: rm -rf %t
+RUN: mkdir -p %t
+RUN: cp %p/Inputs/split-dwarf-addr-object-relocation.dwo %t
+
+RUN: cd %t
+RUN: llvm-symbolizer --obj=%p/Inputs/split-dwarf-addr-object-relocation.o 0x14 | FileCheck %s
+
+CHECK:      f2
+CHECK-NEXT: split-dwarf-addr-object-relocation.cpp:3:3
+CHECK-NEXT: f3
+CHECK-NEXT: split-dwarf-addr-object-relocation.cpp:6:0

diff --git a/test/tools/llvm-symbolizer/split-dwarf-dwp.test b/test/tools/llvm-symbolizer/split-dwarf-dwp.test
new file mode 100644 (file)
index 0000000..71ecca4
--- /dev/null
+++ b/test/tools/llvm-symbolizer/split-dwarf-dwp.test
@@ -0,0 +1,12 @@
+RUN: rm -rf %t
+RUN: mkdir -p %t
+
+RUN: cp %p/Inputs/split-dwarf-dwp.o %t/split-dwarf-dwp-different-name.o
+
+RUN: llvm-symbolizer --dwp=%p/Inputs/split-dwarf-dwp.o.dwp \
+RUN:     --obj=%t/split-dwarf-dwp-different-name.o 0x54 | FileCheck %s
+
+CHECK:      f2
+CHECK-NEXT: split-dwarf-dwp.cpp:3:3
+CHECK-NEXT: main
+CHECK-NEXT: split-dwarf-dwp.cpp:10:0

diff --git a/test/tools/llvm-symbolizer/split-dwarf-multiple-cu.test b/test/tools/llvm-symbolizer/split-dwarf-multiple-cu.test
new file mode 100644 (file)
index 0000000..465816f
--- /dev/null
+++ b/test/tools/llvm-symbolizer/split-dwarf-multiple-cu.test
@@ -0,0 +1,12 @@
+RUN: rm -rf %t
+RUN: mkdir -p %t
+RUN: cp %p/Inputs/split-dwarf-multiple-cu.dwo %t
+
+RUN: cd %t
+RUN: llvm-symbolizer --obj=%p/Inputs/split-dwarf-multiple-cu.o 0x4 | FileCheck %s
+
+CHECK:      f2
+CHECK-NEXT: split-dwarf-multiple-cu.cpp:3:3
+CHECK-NEXT: f3
+CHECK-NEXT: split-dwarf-multiple-cu.cpp:6:0
+

diff --git a/test/tools/llvm-symbolizer/split-dwarf.test b/test/tools/llvm-symbolizer/split-dwarf.test
new file mode 100644 (file)
index 0000000..e8185ce
--- /dev/null
+++ b/test/tools/llvm-symbolizer/split-dwarf.test
@@ -0,0 +1,32 @@
+RUN: rm -rf %t
+RUN: mkdir -p %t
+
+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
+
+Ensure we get the same results in the absence of gmlt-like data in the executable but the presence of a .dwo file
+
+RUN: echo "%p/Inputs/split-dwarf-test-nogmlt 0x400504" >> %t.input
+RUN: echo "%p/Inputs/split-dwarf-test-nogmlt 0x4004f4" >> %t.input
+RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \
+RUN:    --default-arch=i386 --obj=%p/Inputs/split-dwarf-test-nogmlt 0x400504 0x4004f4 | FileCheck --check-prefix=SPLIT --check-prefix=DWO %s
+
+Ensure we get gmlt like results in the absence of a .dwo file but the presence of gmlt-like data in the executable
+
+RUN: rm %t/split-dwarf-test.dwo
+RUN: echo "%p/Inputs/split-dwarf-test 0x400504" >> %t.input
+RUN: echo "%p/Inputs/split-dwarf-test 0x4004f4" >> %t.input
+RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \
+RUN:    --default-arch=i386 --obj=%p/Inputs/split-dwarf-test 0x400504 0x4004f4 | FileCheck --check-prefix=SPLIT --check-prefix=NODWO %s
+
+DWO: _Z2f2v
+NODWO: {{^f2$}}
+SPLIT-NEXT: {{.*}}split-dwarf-test.cpp
+SPLIT-NEXT: main
+SPLIT-NEXT: {{.*}}split-dwarf-test.cpp
+
+SPLIT: _Z2f1v
+SPLIT-NEXT: {{.*}}split-dwarf-test.cpp