Skip to content
This repository was archived by the owner on May 21, 2019. It is now read-only.

Commit d52bb2c

Browse files
author
Maxim Ostapenko
committed
[asan] Reduce flakiness of halt_on_error-torture.cc testcase.
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. Differential Revision: https://reviews.llvm.org/D22309 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@275539 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 48ccea3 commit d52bb2c

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@
99
//
1010
// Collisions are unlikely but still possible so we need the ||.
1111
// RUN: %env_asan_opts=halt_on_error=false:suppress_equal_pcs=false %run %t 10 20 >10.txt 2>&1 || true
12-
// This one is racy although _very_ unlikely to fail:
13-
// RUN: FileCheck %s < 10.txt
14-
// RUN: FileCheck --check-prefix=CHECK-COLLISION %s < 1.txt || FileCheck --check-prefix=CHECK-NO-COLLISION %s < 1.txt
12+
// RUN: FileCheck --check-prefix=CHECK-COLLISION %s < 10.txt || FileCheck --check-prefix=CHECK-NO-COLLISION %s < 10.txt
1513
//
1614
// Collisions are unlikely but still possible so we need the ||.
1715
// RUN: %env_asan_opts=halt_on_error=false %run %t 10 20 >10.txt 2>&1 || true
18-
// This one is racy although _very_ unlikely to fail:
19-
// RUN: FileCheck %s < 10.txt
20-
// RUN: FileCheck --check-prefix=CHECK-COLLISION %s < 1.txt || FileCheck --check-prefix=CHECK-NO-COLLISION %s < 1.txt
16+
// RUN: FileCheck --check-prefix=CHECK-COLLISION %s < 10.txt || FileCheck --check-prefix=CHECK-NO-COLLISION %s < 10.txt
2117

2218
#include <stdio.h>
2319
#include <stdlib.h>

0 commit comments

Comments
 (0)