[test][asan] Another try to fix Windows bot

Update pattern on Linux and Darwin for consistency.

diff --git a/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp
index c4c40ca..9b25b00 100644 (file)
--- a/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp
+++ b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp
@@ -19,13 +19,14 @@
 // RUN:  | sed -e "s/__asan_version_mismatch_check_v[0-9]+/__asan_version_mismatch_check/" \
 // RUN:  > %t.exports
 //
-// RUN: grep -e "INTERFACE_\(WEAK_\)\?FUNCTION"                                \
-// RUN:  %t.asan_interface.inc                                                 \
-// RUN:  %p/../../../../lib/ubsan/ubsan_interface.inc                          \
-// RUN:  %p/../../../../lib/sanitizer_common/sanitizer_common_interface.inc    \
+// RUN: sed ':a;N;$!ba;s/([\n ]*/(/g'                                             \
+// RUN:  %t.asan_interface.inc                                                    \
+// RUN:  %p/../../../../lib/ubsan/ubsan_interface.inc                             \
+// RUN:  %p/../../../../lib/sanitizer_common/sanitizer_common_interface.inc       \
 // RUN:  %p/../../../../lib/sanitizer_common/sanitizer_common_interface_posix.inc \
-// RUN:  %p/../../../../lib/sanitizer_common/sanitizer_coverage_interface.inc  \
-// RUN:  | grep -v "__sanitizer_weak_hook"                                     \
+// RUN:  %p/../../../../lib/sanitizer_common/sanitizer_coverage_interface.inc     \
+// RUN:  | grep -e "INTERFACE_\(WEAK_\)\?FUNCTION"                                \
+// RUN:  | grep -v "__sanitizer_weak_hook"                                        \
 // RUN:  | sed -e "s/.*(//" -e "s/).*//" > %t.imports
 //
 // RUN: cat %t.imports | sort | uniq > %t.imports-sorted

diff --git a/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cpp b/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cpp
index 0f7407c..ce1255c 100644 (file)
--- a/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cpp
+++ b/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cpp
@@ -13,7 +13,7 @@
 // RUN:  | sed -e "s/__asan_version_mismatch_check_v[0-9]+/__asan_version_mismatch_check/" \
 // RUN:  > %t.exports
 //
-// RUN:  sed ':a;N;$!ba;s/[\n ]//g;s/)/)\n/g'                                      \
+// RUN: sed ':a;N;$!ba;s/([\n ]*/(/g'                                              \
 // RUN:  %t.asan_interface.inc                                                     \
 // RUN:  %p/../../../../lib/ubsan/ubsan_interface.inc                              \
 // RUN:  %p/../../../../lib/sanitizer_common/sanitizer_common_interface.inc        \

diff --git a/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cpp b/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cpp
index 5626757..58808d4 100644 (file)
--- a/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cpp
+++ b/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cpp
@@ -15,7 +15,7 @@
 // [BEWARE: be really careful with the sed commands, as this test can be run
 //  from different environments with different shells and seds]
 //
-// RUN: sed ':a;N;$!ba;s/[\n ]//g;s/)/)\n/g'                                   \
+// RUN: sed ':a;N;$!ba;s/([\n ]*/(/g'                                          \
 // RUN:  %p/../../../../lib/asan/asan_interface.inc                            \
 // RUN:  %p/../../../../lib/ubsan/ubsan_interface.inc                          \
 // RUN:  %p/../../../../lib/sanitizer_common/sanitizer_common_interface.inc    \
@@ -23,7 +23,7 @@
 // RUN:  | grep -e "^INTERFACE_FUNCTION"                                       \
 // RUN:  | sed -e "s/.*(//" -e "s/).*//" > %t.imports1
 //
-// RUN: sed ':a;N;$!ba;s/[\n ]//g;s/)/)\n/g'                                   \
+// RUN: sed ':a;N;$!ba;s/([\n ]*/(/g'                                          \
 // RUN:  %p/../../../../lib/asan/asan_interface.inc                            \
 // RUN:  %p/../../../../lib/ubsan/ubsan_interface.inc                          \
 // RUN:  %p/../../../../lib/sanitizer_common/sanitizer_common_interface.inc    \