diff --git a/compiler-rt/test/sanitizer_common/TestCases/Darwin/print-module-map.cpp b/compiler-rt/test/sanitizer_common/TestCases/print-module-map.cpp rename from compiler-rt/test/sanitizer_common/TestCases/Darwin/print-module-map.cpp rename to compiler-rt/test/sanitizer_common/TestCases/print-module-map.cpp --- a/compiler-rt/test/sanitizer_common/TestCases/Darwin/print-module-map.cpp +++ b/compiler-rt/test/sanitizer_common/TestCases/print-module-map.cpp @@ -1,6 +1,12 @@ // Checks that module map does not print at 0, prints once after aborting with 1, // and prints once before and after aborting with 2 +// mac header is "Process module map" +// posix header is "Process memory map follows" +// windows header is "Dumping process modules" +// using regex "(P|p)rocess (module|memory).*:" to match all three variants +// we should consider unifying the message cross platform + // RUN: %clangxx -DUSING_%tool_name %s -o %t -w // RUN: %env_tool_opts="print_module_map=0" not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-MM0 @@ -31,10 +37,10 @@ } // CHECK: SUMMARY: -// CHECK-MM0-NOT: Process module map: -// CHECK-MM1-NOT: Process module map: -// CHECK-MM2: Process module map: +// CHECK-MM0-NOT: {{(P|p)rocess (module|memory).*:}} +// CHECK-MM1-NOT: {{(P|p)rocess (module|memory).*:}} +// CHECK-MM2: {{(P|p)rocess (module|memory).*:}} // CHECK: ABORTING -// CHECK-MM0-NOT: Process module map: -// CHECK-MM1-NEXT: Process module map: -// CHECK-MM2-NEXT: Process module map: +// CHECK-MM0-NOT: {{(P|p)rocess (module|memory).*:}} +// CHECK-MM1-NEXT: {{(P|p)rocess (module|memory).*:}} +// CHECK-MM2-NEXT: {{(P|p)rocess (module|memory).*:}}