[compiler-rt] a270891 - [test][asan] Another try to fix Windows bot

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2022-11-21T18:45:40-08:00
New Revision: a27089101edf7b5bc23e2478e30f6b183703fa20

URL: https://github.com/llvm/llvm-project/commit/a27089101edf7b5bc23e2478e30f6b183703fa20
DIFF: https://github.com/llvm/llvm-project/commit/a27089101edf7b5bc23e2478e30f6b183703fa20.diff

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

Update pattern on Linux and Darwin for consistency.

Added: 
    

Modified: 
    compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp
    compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cpp
    compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cpp

Removed: 
    


################################################################################
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 c4c40ca2f754..9b25b0023a6f 100644
--- 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 0f7407cffda8..ce1255c95783 100644
--- 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 562675732b81..58808d438761 100644
--- 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 
diff erent environments with 
diff erent 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    \