+++ /dev/null
-RUN: rm -rf %t && mkdir -p %t
-RUN: cd %t
-RUN: cp %p/Inputs/split-dwarf-empty.dwo %t
-RUN: echo "%p/Inputs/split-dwarf-empty.o 0xdeadbeef" > %t.input
-
-RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \
-RUN: --default-arch=i386 < %t.input | FileCheck %s
-
-CHECK: ??
-CHECK: ??:0:0
--- /dev/null
+cd and copy the DWO into the same directory so that it can be found by the
+symbolizer.
+RUN: rm -rf %t && mkdir -p %t
+RUN: cd %t
+RUN: cp %p/Inputs/split-dwarf-empty.dwo %t
+RUN: llvm-symbolizer --inlining --obj=%p/Inputs/split-dwarf-empty.o 0xdeadbeef | FileCheck %s
+
+CHECK: ??
+CHECK: ??:0:0
-RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \
-RUN: --default-arch=i386 --obj=%p/Inputs/split-dwarf-no-skel-address.o 0x4 | FileCheck %s
+Copy the DWO and then cd into the output directory, so that the symbolizer would
+find the DWO if it attempted to.
+RUN: rm -rf %t && mkdir -p %t
+RUN: cd %t
+RUN: cp %p/Inputs/split-dwarf-no-skel-address.dwo %t
+RUN: llvm-symbolizer --inlining --no-demangle \
+RUN: --obj=%p/Inputs/split-dwarf-no-skel-address.o 0x4 | FileCheck %s
Built from the following source:
void f1();
RUN: echo "%p/Inputs/dwarfdump-test2.elf-x86-64 0x4004f4" >> %t.input
RUN: echo "%p/Inputs/dwarfdump-test4.elf-x86-64 0x62c" >> %t.input
-RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \
-RUN: < %t.input | FileCheck --check-prefix=CHECK --check-prefix=SPLIT --check-prefix=DWO %s
+RUN: llvm-symbolizer < %t.input | FileCheck %s
CHECK: main
CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test.cc:16
CHECK: _start
-CHECK: _Z1fii
+CHECK: f(int, int)
CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test.cc:11
-CHECK: DummyClass
+CHECK: DummyClass
CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test.cc:4
-CHECK: a
+CHECK: a
CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test2-helper.cc:2
-CHECK: main
+CHECK: main
CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test2-main.cc:4
-CHECK: _Z1cv
+CHECK: c()
CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test4-part1.cc:2