summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compiler-rt/lib/asan/Makefile.old2
-rw-r--r--compiler-rt/lib/asan/output_tests/global-overflow.cc3
-rw-r--r--compiler-rt/lib/asan/output_tests/large_func_test.cc3
-rw-r--r--compiler-rt/lib/asan/output_tests/null_deref.cc3
-rw-r--r--compiler-rt/lib/asan/output_tests/use-after-free.cc3
5 files changed, 9 insertions, 5 deletions
diff --git a/compiler-rt/lib/asan/Makefile.old b/compiler-rt/lib/asan/Makefile.old
index fd648aac9ff..d0217b1d0a6 100644
--- a/compiler-rt/lib/asan/Makefile.old
+++ b/compiler-rt/lib/asan/Makefile.old
@@ -338,7 +338,7 @@ lint:
third_party/cpplint/cpplint.py --filter=$(LLVM_LINT_FILTER) $(ADDRESS_SANITIZER_CPP)
third_party/cpplint/cpplint.py --filter=$(RTL_LINT_FITLER) asan_*.cc asan_*.h
third_party/cpplint/cpplint.py --filter=$(RTL_LINT_FITLER) interception/interception*.h interception/interception*.cc
- third_party/cpplint/cpplint.py --filter=$(TEST_LINT_FITLER) tests/*.cc
+ third_party/cpplint/cpplint.py --filter=$(TEST_LINT_FITLER) tests/*.cc output_tests/*.cc
get_third_party:
rm -rf third_party
diff --git a/compiler-rt/lib/asan/output_tests/global-overflow.cc b/compiler-rt/lib/asan/output_tests/global-overflow.cc
index bd835946688..a63eb733365 100644
--- a/compiler-rt/lib/asan/output_tests/global-overflow.cc
+++ b/compiler-rt/lib/asan/output_tests/global-overflow.cc
@@ -9,7 +9,8 @@ int main(int argc, char **argv) {
int res = YYY[argc * 10]; // BOOOM
// Check-Common: {{READ of size 1 at 0x.* thread T0}}
// Check-Common: {{ #0 0x.* in main .*global-overflow.cc:9}}
- // Check-Common: {{0x.* is located 0 bytes to the right of global variable .*YYY.* of size 10}}
+ // Check-Common: {{0x.* is located 0 bytes to the right of global variable}}
+ // Check-Common: {{.*YYY.* of size 10}}
res += XXX[argc] + ZZZ[argc];
return res;
}
diff --git a/compiler-rt/lib/asan/output_tests/large_func_test.cc b/compiler-rt/lib/asan/output_tests/large_func_test.cc
index de450e9b92a..ec2c4ddc437 100644
--- a/compiler-rt/lib/asan/output_tests/large_func_test.cc
+++ b/compiler-rt/lib/asan/output_tests/large_func_test.cc
@@ -32,7 +32,8 @@ int main(int argc, char **argv) {
delete x;
}
-// Check-Common: {{.*ERROR: AddressSanitizer heap-buffer-overflow on address 0x.* at pc 0x.* bp 0x.* sp 0x.*}}
+// Check-Common: {{.*ERROR: AddressSanitizer heap-buffer-overflow on address}}
+// Check-Common: {{0x.* at pc 0x.* bp 0x.* sp 0x.*}}
// Check-Common: {{READ of size 4 at 0x.* thread T0}}
// Check-Common: {{ #0 0x.* in LargeFunction .*large_func_test.cc:15}}
// Check-Common: {{ #1 0x.* in main .*large_func_test.cc:3[012]}}
diff --git a/compiler-rt/lib/asan/output_tests/null_deref.cc b/compiler-rt/lib/asan/output_tests/null_deref.cc
index 82e5e569dcd..e0fac94b244 100644
--- a/compiler-rt/lib/asan/output_tests/null_deref.cc
+++ b/compiler-rt/lib/asan/output_tests/null_deref.cc
@@ -6,7 +6,8 @@ int main() {
NullDeref((int*)0);
}
-// Check-Common: {{.*ERROR: AddressSanitizer crashed on unknown address 0x0*00028 .*pc 0x.*}}
+// Check-Common: {{.*ERROR: AddressSanitizer crashed on unknown address}}
+// Check-Common: {{0x0*00028 .*pc 0x.*}}
// Check-Common: {{AddressSanitizer can not provide additional info. ABORTING}}
// atos on Mac cannot resolve the file:line info for frame 0 on the O1 level
diff --git a/compiler-rt/lib/asan/output_tests/use-after-free.cc b/compiler-rt/lib/asan/output_tests/use-after-free.cc
index 6fa829fab5f..a782d62dc50 100644
--- a/compiler-rt/lib/asan/output_tests/use-after-free.cc
+++ b/compiler-rt/lib/asan/output_tests/use-after-free.cc
@@ -5,7 +5,8 @@ int main() {
return x[5];
}
-// Check-Common: {{.*ERROR: AddressSanitizer heap-use-after-free on address 0x.* at pc 0x.* bp 0x.* sp 0x.*}}
+// Check-Common: {{.*ERROR: AddressSanitizer heap-use-after-free on address}}
+// Check-Common: {{0x.* at pc 0x.* bp 0x.* sp 0x.*}}
// Check-Common: {{READ of size 1 at 0x.* thread T0}}
// Check-Common: {{ #0 0x.* in main .*use-after-free.cc:5}}
// Check-Common: {{0x.* is located 5 bytes inside of 10-byte region .0x.*,0x.*}}
OpenPOWER on IntegriCloud