From 71aca88f38d1e3ed41cb9e5aeb1ed0102914e487 Mon Sep 17 00:00:00 2001 From: Kuba Brecka Date: Thu, 19 Nov 2015 17:28:46 +0000 Subject: [tsan] Implement "%env_tsan_opts" substitution to inherit default TSAN_OPTIONS We already have %env_asan_opts for ASan, let's implement the same for TSan. Differential Revision: http://reviews.llvm.org/D14698 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@253579 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/tsan/allocator_returns_null.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/tsan/allocator_returns_null.cc') diff --git a/test/tsan/allocator_returns_null.cc b/test/tsan/allocator_returns_null.cc index cde706bc8..66930076a 100644 --- a/test/tsan/allocator_returns_null.cc +++ b/test/tsan/allocator_returns_null.cc @@ -4,11 +4,11 @@ // // RUN: %clangxx_tsan -O0 %s -o %t // RUN: not %run %t malloc 2>&1 | FileCheck %s --check-prefix=CHECK-mCRASH -// RUN: TSAN_OPTIONS=allocator_may_return_null=0 not %run %t malloc 2>&1 | FileCheck %s --check-prefix=CHECK-mCRASH -// RUN: TSAN_OPTIONS=allocator_may_return_null=0 not %run %t calloc 2>&1 | FileCheck %s --check-prefix=CHECK-cCRASH -// RUN: TSAN_OPTIONS=allocator_may_return_null=0 not %run %t calloc-overflow 2>&1 | FileCheck %s --check-prefix=CHECK-coCRASH -// RUN: TSAN_OPTIONS=allocator_may_return_null=0 not %run %t realloc 2>&1 | FileCheck %s --check-prefix=CHECK-rCRASH -// RUN: TSAN_OPTIONS=allocator_may_return_null=0 not %run %t realloc-after-malloc 2>&1 | FileCheck %s --check-prefix=CHECK-mrCRASH +// RUN: %env_tsan_opts=allocator_may_return_null=0 not %run %t malloc 2>&1 | FileCheck %s --check-prefix=CHECK-mCRASH +// RUN: %env_tsan_opts=allocator_may_return_null=0 not %run %t calloc 2>&1 | FileCheck %s --check-prefix=CHECK-cCRASH +// RUN: %env_tsan_opts=allocator_may_return_null=0 not %run %t calloc-overflow 2>&1 | FileCheck %s --check-prefix=CHECK-coCRASH +// RUN: %env_tsan_opts=allocator_may_return_null=0 not %run %t realloc 2>&1 | FileCheck %s --check-prefix=CHECK-rCRASH +// RUN: %env_tsan_opts=allocator_may_return_null=0 not %run %t realloc-after-malloc 2>&1 | FileCheck %s --check-prefix=CHECK-mrCRASH #include #include -- cgit v1.2.3