[PATCH] D21588: [asan] Relax a flaky invalid-pointer-pairs test

[Anna Zaks via llvm-commits]

zaks.anna created this revision.
zaks.anna added reviewers: filcab, kubabrecka.
zaks.anna added subscribers: aizatsky, llvm-commits.
Herald added a subscriber: kubabrecka.

This test is flaky. Specifically, on some Mac configurations we see the __sanitizer_ptr_cmp as the 0th frame. Let's relax it to not require that f is in frame #0.

==61396==ERROR: AddressSanitizer: invalid-pointer-pair: 0x01e00510 0x01e004d0
    #0 0x18f5a3 in __sanitizer_ptr_cmp ... libclang_rt.asan_osx_dynamic.dylib+0xaf5a3)
    #1 0xdd924 in f(char, char*, char*) ... invalid-pointer-pairs.cc:14:14

http://reviews.llvm.org/D21588

Files:
  test/asan/TestCases/invalid-pointer-pairs.cc

Index: test/asan/TestCases/invalid-pointer-pairs.cc
===================================================================
--- test/asan/TestCases/invalid-pointer-pairs.cc
+++ test/asan/TestCases/invalid-pointer-pairs.cc
@@ -13,10 +13,10 @@
   // [[PTR1:0x[0-9a-f]+]] [[PTR2:0x[0-9a-f]+]]
   switch (c) {
   case 'g':
-    // CMP: #0 {{.*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+1]]:14
+    // CMP: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+1]]:14
     return p > q;
   case 's':
-    // SUB: #0 {{.*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+1]]:14
+    // SUB: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+1]]:14
     return p - q;
   case 'k': {
     // OK-NOT: ERROR
@@ -26,7 +26,7 @@
   case 'f': {
     char *p3 = p + 20;
     free(p);
-    // FREE: #0 {{.*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+2]]:14
+    // FREE: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+2]]:14
     // FREE: freed by thread
     return p < p3;
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D21588.61482.patch
Type: text/x-patch
Size: 1272 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160622/9da8822a/attachment.bin>