[PATCH] D22309: [asan] Reduce flakiness of halt_on_error-torture.cc testcase.

[Maxim Ostapenko via llvm-commits]

m.ostapenko created this revision.
m.ostapenko added reviewers: kcc, eugenis, rnk.
m.ostapenko added subscribers: MatzeB, llvm-commits, ygribov.
m.ostapenko set the repository for this revision to rL LLVM.
m.ostapenko added a project: Sanitizers.
Herald added a subscriber: kubabrecka.

It seems in some situations we have clashes on very first error so test only prints "nested bug in the same thread, aborting" rather than "use-after-poison", so remove corresponding "// RUN: FileCheck %s < 10.txt" line.
Also, the two last "// RUN: FileCheck --check-prefix=CHECK-COLLISION %s < 1.txt || FileCheck --check-prefix=CHECK-NO-COLLISION %s < 1.txt" look wrong, they should check 10.txt. Fix these lines too.

Repository:
  rL LLVM

http://reviews.llvm.org/D22309

Files:
  test/asan/TestCases/Posix/halt_on_error-torture.cc

Index: test/asan/TestCases/Posix/halt_on_error-torture.cc
===================================================================
--- test/asan/TestCases/Posix/halt_on_error-torture.cc
+++ test/asan/TestCases/Posix/halt_on_error-torture.cc
@@ -9,15 +9,11 @@
 //
 // Collisions are unlikely but still possible so we need the ||.
 // RUN: %env_asan_opts=halt_on_error=false:suppress_equal_pcs=false %run %t 10 20 >10.txt 2>&1 || true
-// This one is racy although _very_ unlikely to fail:
-// RUN: FileCheck %s < 10.txt
-// RUN: FileCheck --check-prefix=CHECK-COLLISION %s < 1.txt || FileCheck --check-prefix=CHECK-NO-COLLISION %s < 1.txt
+// RUN: FileCheck --check-prefix=CHECK-COLLISION %s < 10.txt || FileCheck --check-prefix=CHECK-NO-COLLISION %s < 10.txt
 //
 // Collisions are unlikely but still possible so we need the ||.
 // RUN: %env_asan_opts=halt_on_error=false %run %t 10 20 >10.txt 2>&1 || true
-// This one is racy although _very_ unlikely to fail:
-// RUN: FileCheck %s < 10.txt
-// RUN: FileCheck --check-prefix=CHECK-COLLISION %s < 1.txt || FileCheck --check-prefix=CHECK-NO-COLLISION %s < 1.txt
+// RUN: FileCheck --check-prefix=CHECK-COLLISION %s < 10.txt || FileCheck --check-prefix=CHECK-NO-COLLISION %s < 10.txt
 
 #include <stdio.h>
 #include <stdlib.h>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D22309.63833.patch
Type: text/x-patch
Size: 1272 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160713/0ddf606a/attachment.bin>