[NFC] Split `Darwin/asan-symbolize-partial-report-with-module-map.cc`.

Split `Darwin/asan-symbolize-partial-report-with-module-map.cc` into two
separate test cases due to them testing slightly different things.

llvm-svn: 363640

diff --git a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-no-external-symbolizer.cc b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-no-external-symbolizer.cc
new file mode 100644 (file)
index 0000000..2839366
--- /dev/null
+++ b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-no-external-symbolizer.cc
@@ -0,0 +1,37 @@
+// When `external_symbolizer_path` is empty on Darwin we fallback on using
+// dladdr as the symbolizer which means we get the symbol name
+// but no source location. The current implementation also doesn't try to
+// change the module name so we end up with the full name so we actually don't
+// need the module map here.
+
+// RUN: %clangxx_asan -O0 -g %s -o %t.executable
+// RUN: %env_asan_opts=symbolize=1,print_module_map=0,external_symbolizer_path= not %run %t.executable > %t2.log 2>&1
+// RUN: FileCheck -input-file=%t2.log -check-prefix=CHECK-PS %s
+// RUN: %asan_symbolize --force-system-symbolizer < %t2.log > %t2.fully_symbolized
+// RUN: FileCheck -input-file=%t2.fully_symbolized -check-prefix=CHECK-FS %s
+
+#include <cstdlib>
+
+// Partially symbolicated back-trace where symbol is available but
+// source location is not and instead module name and offset are
+// printed.
+// CHECK-PS: WRITE of size 4
+// CHECK-PS: #0 0x{{.+}} in foo ({{.+}}.executable:{{.+}}+0x{{.+}})
+// CHECK-PS: #1 0x{{.+}} in main ({{.+}}.executable:{{.+}}+0x{{.+}})
+
+// CHECK-FS: WRITE of size 4
+
+extern "C" void foo(int* a) {
+  // CHECK-FS: #0 0x{{.+}} in foo {{.*}}asan-symbolize-partial-report-no-external-symbolizer.cc:[[@LINE+1]]
+  *a = 5;
+}
+
+int main() {
+  int* a = (int*) malloc(sizeof(int));
+  if (!a)
+    return 0;
+  free(a);
+  // CHECK-FS: #1 0x{{.+}} in main {{.*}}asan-symbolize-partial-report-no-external-symbolizer.cc:[[@LINE+1]]
+  foo(a);
+  return 0;
+}

diff --git a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cc b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cc
index 7a0b1717d0633113fd9227fc7481ff15bbbebf49..84964885e60f5b479b2c06b767b55f991b589c62 100644 (file)
--- a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cc
@@ -1,18 +1,3 @@
-// When `external_symbolizer_path` is empty on Darwin we fallback on using
-// dladdr as the symbolizer which means we get the symbol name
-// but no source location. The current implementation also doesn't try to
-// change the module name so we end up with the full name so we actually don't
-// need the module map here.
-
-// RUN: %clangxx_asan -O0 -g %s -o %t.executable
-// RUN: %env_asan_opts=symbolize=1,print_module_map=0,external_symbolizer_path= not %run %t.executable > %t2.log 2>&1
-// RUN: FileCheck -input-file=%t2.log -check-prefix=CHECK-PS %s
-// RUN: %asan_symbolize --force-system-symbolizer < %t2.log > %t2.fully_symbolized
-// RUN: FileCheck -input-file=%t2.fully_symbolized -check-prefix=CHECK-FS %s
-
-// Due a quirk in the way atos reports module names we have to use the module
-// map here, otherwise we don't know what the full path to the module is.
-
 // FIXME(dliew): We currently have to use module map for this test due to the atos
 // symbolizer changing the module name from an absolute path to just the file name.
 // rdar://problem/49784442
@@ -20,12 +5,12 @@
 // Simulate partial symbolication (can happen with %L specifier) by printing
 // out %L's fallback which will print the module name and offset instead of a
 // source location.
-// RUN: %clangxx_asan -O0 -g %s -o %t2.executable
-// RUN: %env_asan_opts=symbolize=1,print_module_map=1,stack_trace_format='"    #%%n %%p %%F %%M"' not %run %t.executable > %t2.log 2>&1
-// RUN: FileCheck -input-file=%t2.log -check-prefix=CHECK-PS %s
+// RUN: %clangxx_asan -O0 -g %s -o %t.executable
+// RUN: %env_asan_opts=symbolize=1,print_module_map=1,stack_trace_format='"    #%%n %%p %%F %%M"' not %run %t.executable > %t.log 2>&1
+// RUN: FileCheck -input-file=%t.log -check-prefix=CHECK-PS %s
 // Now try to full symbolicate using the module map.
-// RUN: %asan_symbolize --module-map %t2.log --force-system-symbolizer < %t2.log > %t2.fully_symbolized
-// RUN: FileCheck -input-file=%t2.fully_symbolized -check-prefix=CHECK-FS %s
+// RUN: %asan_symbolize --module-map %t.log --force-system-symbolizer < %t.log > %t.fully_symbolized
+// RUN: FileCheck -input-file=%t.fully_symbolized -check-prefix=CHECK-FS %s
 
 #include <cstdlib>