Imported Upstream version 1.6.0+dfsg1

[rustc.git] / src / compiler-rt / test / asan / TestCases / initialization-blacklist.cc

diff --git a/src/compiler-rt/test/asan/TestCases/initialization-blacklist.cc b/src/compiler-rt/test/asan/TestCases/initialization-blacklist.cc
index b6b459bdd0c9cecca9e40d807a01bf8c140812d6..3a98fc63eeee27d2ded2ccd110647a1b366cd894 100644 (file)
--- a/src/compiler-rt/test/asan/TestCases/initialization-blacklist.cc
+++ b/src/compiler-rt/test/asan/TestCases/initialization-blacklist.cc
@@ -2,19 +2,16 @@
 
 // RUN: %clangxx_asan -O0 %s %p/Helpers/initialization-blacklist-extra.cc\
 // RUN:   %p/Helpers/initialization-blacklist-extra2.cc \
-// RUN:   -fsanitize-blacklist=%p/Helpers/initialization-blacklist.txt \
-// RUN:   -fsanitize=init-order -o %t
-// RUN: ASAN_OPTIONS=check_initialization_order=true %run %t 2>&1
+// RUN:   -fsanitize-blacklist=%p/Helpers/initialization-blacklist.txt -o %t
+// RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
 // RUN: %clangxx_asan -O1 %s %p/Helpers/initialization-blacklist-extra.cc\
 // RUN:   %p/Helpers/initialization-blacklist-extra2.cc \
-// RUN:   -fsanitize-blacklist=%p/Helpers/initialization-blacklist.txt \
-// RUN:   -fsanitize=init-order -o %t
-// RUN: ASAN_OPTIONS=check_initialization_order=true %run %t 2>&1
+// RUN:   -fsanitize-blacklist=%p/Helpers/initialization-blacklist.txt -o %t
+// RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
 // RUN: %clangxx_asan -O2 %s %p/Helpers/initialization-blacklist-extra.cc\
 // RUN:   %p/Helpers/initialization-blacklist-extra2.cc \
-// RUN:   -fsanitize-blacklist=%p/Helpers/initialization-blacklist.txt \
-// RUN:   -fsanitize=init-order -o %t
-// RUN: ASAN_OPTIONS=check_initialization_order=true %run %t 2>&1
+// RUN:   -fsanitize-blacklist=%p/Helpers/initialization-blacklist.txt -o %t
+// RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
 
 // Function is defined in another TU.
 int readBadGlobal();