diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp --- a/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp +++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp @@ -45,16 +45,22 @@ return (int)(size_t)res; } -// CHECK-asan: rw-p {{.*}} [low shadow] +// In the regex below, the x permission is matched with a '.'. We would +// like '-', but sometimes 'x' is set, causing buildbot flakiness. +// This might be due to READ_IMPLIES_EXEC being set (when it occurs all +// regions with r also have x). +// TODO: investigate further and change 'rw{{[-x]}}p' back to 'rw-p' + +// CHECK-asan: rw{{[-r]}}p {{.*}} [low shadow] // CHECK-asan: ---p {{.*}} [shadow gap] -// CHECK-asan: rw-p {{.*}} [high shadow] +// CHECK-asan: rw{{[-r]}}p {{.*}} [high shadow] // CHECK-msan: ---p {{.*}} [invalid] -// CHECK-msan: rw-p {{.*}} [shadow{{.*}}] +// CHECK-msan: rw{{[-r]}}p {{.*}} [shadow{{.*}}] // CHECK-msan: ---p {{.*}} [origin{{.*}}] -// CHECK-tsan: rw-p {{.*}} [shadow] -// CHECK-tsan: rw-p {{.*}} [meta shadow] +// CHECK-tsan: rw{{[-r]}}p {{.*}} [shadow] +// CHECK-tsan: rw{{[-r]}}p {{.*}} [meta shadow] // Nothing interesting with standalone LSan and UBSan. // CHECK-lsan: decorate_proc_maps