[PATCH] [ASan] Test churn for setting ASAN_OPTIONS=symbolize_vs_style=false

[Alexey Samsonov]

================
Comment at: test/asan/TestCases/Darwin/suppressions-darwin.cc:7
@@ -6,3 +6,3 @@
 // RUN: echo "interceptor_name:memmove" > %t.supp
-// RUN: ASAN_OPTIONS="suppressions='%t.supp'" %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s
+// RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:"suppressions='%t.supp'" %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s
 
----------------
Looks like quotes should enclose the whole string here
  ASAN_OPTIONS="$ASAN_OPTIONS:suppressions='%t.supp'"

================
Comment at: test/asan/TestCases/Linux/leak.cc:6
@@ +5,3 @@
+// RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=1 not %run %t  2>&1 | FileCheck %s
+// RUN: env ASAN_OPTIONS=symbolize_vs_style=false             not %run %t  2>&1 | FileCheck %s
+// RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0     %run %t
----------------
Huh? Why not
  env ASAN_OPTIONS=$ASAN_OPTIONS
?

================
Comment at: test/asan/TestCases/Linux/malloc_delete_mismatch.cc:33
@@ -32,2 +32,2 @@
 // ALLOC-STACK: #{{.*}}main
-// CHECK: HINT: {{.*}} you may set ASAN_OPTIONS=alloc_dealloc_mismatch=0
+// CHECK: HINT: {{.*}} you may set ASAN_OPTIONS=$ASAN_OPTIONS:alloc_dealloc_mismatch=0
----------------
No, I don't think we need to modify this line ;)

================
Comment at: test/asan/TestCases/Posix/log_path_fork_test.cc.disabled:4
@@ -3,3 +3,3 @@
 // Set verbosity to 1 so that the log files are opened prior to fork().
-// RUN: env ASAN_OPTIONS="log_path=%t.log verbosity=1" not %run %t 2> %t.out
+// RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:"log_path=%t.log verbosity=1" not %run %t 2> %t.out
 // RUN: for f in %t.log.* ; do FileCheck %s < $f; done
----------------
Same note about quotes.

================
Comment at: test/asan/TestCases/Windows/report_globals_reload_dll.cc:4
@@ -3,3 +3,3 @@
 // RUN: %clang_cl_asan -O0 -DEXE %s -Fe%te.exe
-// RUN: env ASAN_OPTIONS=report_globals=1 %run %te.exe %t.dll 2>&1 | FileCheck %s
+// RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:report_globals=1:symbolize_vs_style=false %run %te.exe %t.dll 2>&1 | FileCheck %s
 
----------------
You sure you need both?

================
Comment at: test/asan/TestCases/atol_strict.c:4
@@ -3,3 +3,3 @@
 // RUN: %run %t test1 2>&1
-// RUN: ASAN_OPTIONS=strict_string_checks=false %run %t test1 2>&1
-// RUN: ASAN_OPTIONS=strict_string_checks=true not %run %t test1 2>&1 | FileCheck %s --check-prefix=CHECK1
+// RUN: env ASAN_OPTIONS=strict_string_checks=false %run %t test1 2>&1
+// RUN: env ASAN_OPTIONS=strict_string_checks=true not %run %t test1 2>&1 | FileCheck %s --check-prefix=CHECK1
----------------
This test doesn't have `$ASAN_OPTIONS`, is it intentional?

================
Comment at: test/asan/TestCases/atoll_strict.c:4
@@ -3,3 +3,3 @@
 // RUN: %run %t test1 2>&1
-// RUN: ASAN_OPTIONS=strict_string_checks=false %run %t test1 2>&1
-// RUN: ASAN_OPTIONS=strict_string_checks=true not %run %t test1 2>&1 | FileCheck %s --check-prefix=CHECK1
+// RUN: env ASAN_OPTIONS=strict_string_checks=false %run %t test1 2>&1
+// RUN: env ASAN_OPTIONS=strict_string_checks=true not %run %t test1 2>&1 | FileCheck %s --check-prefix=CHECK1
----------------
This test doesn't have `$ASAN_OPTIONS`, is it intentional?

================
Comment at: test/asan/TestCases/strcasestr-1.c:6
@@ -5,3 +5,3 @@
 // Disable other interceptors because strlen may be called inside strcasestr
-// RUN: ASAN_OPTIONS=intercept_strstr=false:replace_str=false %run %t 2>&1
+// RUN: env ASAN_OPTIONS=intercept_strstr=false:replace_str=false %run %t 2>&1
 
----------------
This test doesn't have `$ASAN_OPTIONS`, is it intentional?

================
Comment at: test/asan/TestCases/strcasestr_strict.c:3
@@ -2,3 +2,3 @@
 // RUN: %clang_asan %s -o %t && %run %t 2>&1
-// RUN: ASAN_OPTIONS=strict_string_checks=false %run %t 2>&1
-// RUN: ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s
+// RUN: env ASAN_OPTIONS=strict_string_checks=false %run %t 2>&1
+// RUN: env ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s
----------------
This test doesn't have `$ASAN_OPTIONS`, is it intentional?(more cases below)

================
Comment at: test/asan/TestCases/suppressions-exec-relative-location.cc:12
@@ -11,3 +11,3 @@
 // RUN:   %T/suppressions-exec-relative-location/supp.txt
-// RUN: ASAN_OPTIONS="suppressions=supp.txt" \
+// RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:"suppressions=supp.txt" \
 // RUN:   %run %T/suppressions-exec-relative-location/exec 2>&1 | \
----------------
quotes (here and below)

http://reviews.llvm.org/D10294

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/