From d3b30c45fa5b39f4df21de34d703906dba573df8 Mon Sep 17 00:00:00 2001 From: Kuba Brecka Date: Tue, 7 Jul 2015 09:55:00 +0000 Subject: [asan] Add missing $ASAN_OPTIONS to some test cases Since http://reviews.llvm.org/D10294, ASan test cases now respect default env. options via `ASAN_OPTION=$ASAN_OPTIONS:additional_options=xxx`. This patch adds this to a few test cases where it's still missing. Differential Revision: http://reviews.llvm.org/D10988 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@241571 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/asan/TestCases/sleep_before_dying.c | 2 +- test/asan/TestCases/strcspn-1.c | 2 +- test/asan/TestCases/strcspn-2.c | 2 +- test/asan/TestCases/strpbrk-1.c | 2 +- test/asan/TestCases/strpbrk-2.c | 2 +- test/asan/TestCases/strspn-1.c | 2 +- test/asan/TestCases/strspn-2.c | 2 +- test/asan/TestCases/strstr-1.c | 2 +- test/asan/TestCases/strstr-2.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/asan/TestCases/sleep_before_dying.c b/test/asan/TestCases/sleep_before_dying.c index 28ae0bf66..2029f572a 100644 --- a/test/asan/TestCases/sleep_before_dying.c +++ b/test/asan/TestCases/sleep_before_dying.c @@ -1,5 +1,5 @@ // RUN: %clang_asan -O2 %s -o %t -// RUN: env ASAN_OPTIONS="sleep_before_dying=1" not %run %t 2>&1 | FileCheck %s +// RUN: env ASAN_OPTIONS="$ASAN_OPTIONS:sleep_before_dying=1" not %run %t 2>&1 | FileCheck %s #include int main() { diff --git a/test/asan/TestCases/strcspn-1.c b/test/asan/TestCases/strcspn-1.c index 5a19222e6..ef02a0495 100644 --- a/test/asan/TestCases/strcspn-1.c +++ b/test/asan/TestCases/strcspn-1.c @@ -1,5 +1,5 @@ // Test string s1 overflow in strcspn function -// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s +// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s // Test intercept_strspn asan option // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strspn=false %run %t 2>&1 diff --git a/test/asan/TestCases/strcspn-2.c b/test/asan/TestCases/strcspn-2.c index 288380fd6..aa82aa60a 100644 --- a/test/asan/TestCases/strcspn-2.c +++ b/test/asan/TestCases/strcspn-2.c @@ -1,5 +1,5 @@ // Test stopset overflow in strcspn function -// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s +// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s // Test intercept_strcspn asan option // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strspn=false %run %t 2>&1 diff --git a/test/asan/TestCases/strpbrk-1.c b/test/asan/TestCases/strpbrk-1.c index bc7b58976..7cd45bd09 100644 --- a/test/asan/TestCases/strpbrk-1.c +++ b/test/asan/TestCases/strpbrk-1.c @@ -1,5 +1,5 @@ // Test string s1 overflow in strpbrk function -// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s +// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s // Test intercept_strpbrk asan option // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strpbrk=false %run %t 2>&1 diff --git a/test/asan/TestCases/strpbrk-2.c b/test/asan/TestCases/strpbrk-2.c index 7247622f1..0d50c002a 100644 --- a/test/asan/TestCases/strpbrk-2.c +++ b/test/asan/TestCases/strpbrk-2.c @@ -1,5 +1,5 @@ // Test stopset overflow in strpbrk function -// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s +// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s // Test intercept_strpbrk asan option // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strpbrk=false %run %t 2>&1 diff --git a/test/asan/TestCases/strspn-1.c b/test/asan/TestCases/strspn-1.c index b35d72828..24d0d2daa 100644 --- a/test/asan/TestCases/strspn-1.c +++ b/test/asan/TestCases/strspn-1.c @@ -1,5 +1,5 @@ // Test string s1 overflow in strspn function -// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s +// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s // Test intercept_strspn asan option // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strspn=false %run %t 2>&1 diff --git a/test/asan/TestCases/strspn-2.c b/test/asan/TestCases/strspn-2.c index 530d94c16..e4621e5bf 100644 --- a/test/asan/TestCases/strspn-2.c +++ b/test/asan/TestCases/strspn-2.c @@ -1,5 +1,5 @@ // Test stopset overflow in strspn function -// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s +// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s // Test intercept_strspn asan option // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strspn=false %run %t 2>&1 diff --git a/test/asan/TestCases/strstr-1.c b/test/asan/TestCases/strstr-1.c index 1cbe6e9bd..193334e9b 100644 --- a/test/asan/TestCases/strstr-1.c +++ b/test/asan/TestCases/strstr-1.c @@ -1,5 +1,5 @@ // Test haystack overflow in strstr function -// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s +// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s // Test intercept_strstr asan option // Disable other interceptors because strlen may be called inside strstr diff --git a/test/asan/TestCases/strstr-2.c b/test/asan/TestCases/strstr-2.c index 4e97d6be7..cd116212f 100644 --- a/test/asan/TestCases/strstr-2.c +++ b/test/asan/TestCases/strstr-2.c @@ -1,5 +1,5 @@ // Test needle overflow in strstr function -// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s +// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s // Test intercept_strstr asan option // Disable other interceptors because strlen may be called inside strstr -- cgit v1.2.1