aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Buka <vitalybuka@google.com>2022-11-21 18:44:43 -0800
committerVitaly Buka <vitalybuka@google.com>2022-11-21 18:45:40 -0800
commita27089101edf7b5bc23e2478e30f6b183703fa20 (patch)
tree602e37998ff0f01265add84dd4838df08ef6455d
parenta2dc9f367c6be90589626a575f61ebea5409eee0 (diff)
downloadllvm-a27089101edf7b5bc23e2478e30f6b183703fa20.zip
llvm-a27089101edf7b5bc23e2478e30f6b183703fa20.tar.gz
llvm-a27089101edf7b5bc23e2478e30f6b183703fa20.tar.bz2
[test][asan] Another try to fix Windows bot
Update pattern on Linux and Darwin for consistency.
-rw-r--r--compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp13
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cpp2
-rw-r--r--compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cpp4
3 files changed, 10 insertions, 9 deletions
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
--- 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 0f7407cf..ce1255c 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 5626757..58808d4 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 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 \