summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/coverage-and-lsan.cc2
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/coverage-caller-callee.cc2
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/coverage-direct-large.cc2
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/coverage-direct.cc4
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/coverage-disabled.cc2
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/coverage-fork-direct.cc2
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/coverage-fork.cc2
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/coverage-maybe-open-file.cc2
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/coverage-module-unloaded.cc6
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/coverage-sandboxing.cc4
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/coverage.cc4
11 files changed, 16 insertions, 16 deletions
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-and-lsan.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-and-lsan.cc
index 0f8eb780505..f0d371f1593 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage-and-lsan.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage-and-lsan.cc
@@ -1,6 +1,6 @@
// Make sure coverage is dumped even if there are reported leaks.
//
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 %s -o %t
+// RUN: %clangxx_asan -fsanitize-coverage=1 %s -o %t
//
// RUN: rm -rf %T/coverage-and-lsan
//
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-caller-callee.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-caller-callee.cc
index c2395f19ebb..cd318962b8e 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage-caller-callee.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage-caller-callee.cc
@@ -1,7 +1,7 @@
// Test caller-callee coverage with large number of threads
// and various numbers of callers and callees.
-// RUN: %clangxx_asan -mllvm -asan-coverage=4 %s -o %t
+// RUN: %clangxx_asan -fsanitize-coverage=4 %s -o %t
// RUN: ASAN_OPTIONS=coverage=1:verbosity=1 %run %t 10 1 2>&1 | FileCheck %s --check-prefix=CHECK-10-1
// RUN: ASAN_OPTIONS=coverage=1:verbosity=1 %run %t 9 2 2>&1 | FileCheck %s --check-prefix=CHECK-9-2
// RUN: ASAN_OPTIONS=coverage=1:verbosity=1 %run %t 7 3 2>&1 | FileCheck %s --check-prefix=CHECK-7-3
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-direct-large.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-direct-large.cc
index b340da5aaf8..78aa68621ad 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage-direct-large.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage-direct-large.cc
@@ -1,7 +1,7 @@
// Test for direct coverage writing with lots of data.
// Current implementation maps output file in chunks of 64K. This test overflows
// 1 chunk.
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 -O0 %s -o %t
+// RUN: %clangxx_asan -fsanitize-coverage=1 -O0 %s -o %t
// RUN: rm -rf %T/coverage-direct-large
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-direct.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-direct.cc
index 7fe2514b315..2cc1aed0a0f 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage-direct.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage-direct.cc
@@ -1,6 +1,6 @@
// Test for direct coverage writing with dlopen.
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 -DSHARED %s -shared -o %T/libcoverage_direct_test_1.so -fPIC
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 -DSO_DIR=\"%T\" %s -o %t
+// RUN: %clangxx_asan -fsanitize-coverage=1 -DSHARED %s -shared -o %T/libcoverage_direct_test_1.so -fPIC
+// RUN: %clangxx_asan -fsanitize-coverage=1 -DSO_DIR=\"%T\" %s -o %t
// RUN: rm -rf %T/coverage-direct
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-disabled.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-disabled.cc
index 315c3125b46..a75b26dc02e 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage-disabled.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage-disabled.cc
@@ -1,6 +1,6 @@
// Test that no data is collected without a runtime flag.
//
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 %s -o %t
+// RUN: %clangxx_asan -fsanitize-coverage=1 %s -o %t
//
// RUN: rm -rf %T/coverage-disabled
//
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-fork-direct.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-fork-direct.cc
index 7489b72505a..51cbbd821b8 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage-fork-direct.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage-fork-direct.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 %s -o %t
+// RUN: %clangxx_asan -fsanitize-coverage=1 %s -o %t
// RUN: rm -rf %T/coverage-fork-direct
// RUN: mkdir -p %T/coverage-fork-direct && cd %T/coverage-fork-direct
// RUN: (ASAN_OPTIONS=coverage=1:coverage_direct=1:verbosity=1 %run %t; \
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-fork.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-fork.cc
index 28b2a49840b..38c20094260 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage-fork.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage-fork.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 %s -o %t
+// RUN: %clangxx_asan -fsanitize-coverage=1 %s -o %t
// RUN: export ASAN_OPTIONS=coverage=1:coverage_direct=0:verbosity=1
// RUN: rm -rf %T/coverage-fork
// RUN: mkdir -p %T/coverage-fork && cd %T/coverage-fork
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-maybe-open-file.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-maybe-open-file.cc
index 1cd2253e598..4664cef7f5a 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage-maybe-open-file.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage-maybe-open-file.cc
@@ -1,7 +1,7 @@
// FIXME: https://code.google.com/p/address-sanitizer/issues/detail?id=316
// XFAIL: android
//
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 %s -o %t
+// RUN: %clangxx_asan -fsanitize-coverage=1 %s -o %t
// RUN: rm -rf %T/coverage-maybe-open-file
// RUN: mkdir -p %T/coverage-maybe-open-file && cd %T/coverage-maybe-open-file
// RUN: ASAN_OPTIONS=coverage=1 %run %t | FileCheck %s --check-prefix=CHECK-success
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-module-unloaded.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-module-unloaded.cc
index 4b64a0313e0..449841e7818 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage-module-unloaded.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage-module-unloaded.cc
@@ -1,8 +1,8 @@
// Check that unloading a module doesn't break coverage dumping for remaining
// modules.
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 -DSHARED %s -shared -o %T/libcoverage_module_unloaded_test_1.so -fPIC
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 -DSHARED %s -shared -o %T/libcoverage_module_unloaded_test_2.so -fPIC
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 -DSO_DIR=\"%T\" %s -o %t
+// RUN: %clangxx_asan -fsanitize-coverage=1 -DSHARED %s -shared -o %T/libcoverage_module_unloaded_test_1.so -fPIC
+// RUN: %clangxx_asan -fsanitize-coverage=1 -DSHARED %s -shared -o %T/libcoverage_module_unloaded_test_2.so -fPIC
+// RUN: %clangxx_asan -fsanitize-coverage=1 -DSO_DIR=\"%T\" %s -o %t
// RUN: export ASAN_OPTIONS=coverage=1:verbosity=1
// RUN: mkdir -p %T/coverage-module-unloaded && cd %T/coverage-module-unloaded
// RUN: %run %t 2>&1 | FileCheck %s
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-sandboxing.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-sandboxing.cc
index 6af9865f420..56f9c40f4cc 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage-sandboxing.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage-sandboxing.cc
@@ -1,5 +1,5 @@
-// RUN: %clangxx_asan -mllvm -asan-coverage=2 -DSHARED %s -shared -o %T/libcoverage_sandboxing_test.so -fPIC
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 %s -o %t -Wl,-R,\$ORIGIN -L%T -lcoverage_sandboxing_test
+// RUN: %clangxx_asan -fsanitize-coverage=2 -DSHARED %s -shared -o %T/libcoverage_sandboxing_test.so -fPIC
+// RUN: %clangxx_asan -fsanitize-coverage=1 %s -o %t -Wl,-R,\$ORIGIN -L%T -lcoverage_sandboxing_test
// RUN: export ASAN_OPTIONS=coverage=1:verbosity=1
// RUN: rm -rf %T/coverage_sandboxing_test
// RUN: mkdir %T/coverage_sandboxing_test && cd %T/coverage_sandboxing_test
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage.cc b/compiler-rt/test/asan/TestCases/Linux/coverage.cc
index 5af4d69b0ed..741c66718b4 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage.cc
@@ -1,5 +1,5 @@
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 -DSHARED %s -shared -o %T/libcoverage_test.so -fPIC
-// RUN: %clangxx_asan -mllvm -asan-coverage=1 %s -o %t -Wl,-R,\$ORIGIN -L%T -lcoverage_test
+// RUN: %clangxx_asan -fsanitize-coverage=1 -DSHARED %s -shared -o %T/libcoverage_test.so -fPIC
+// RUN: %clangxx_asan -fsanitize-coverage=1 %s -o %t -Wl,-R,\$ORIGIN -L%T -lcoverage_test
// RUN: export ASAN_OPTIONS=coverage=1:verbosity=1
// RUN: mkdir -p %T/coverage && cd %T/coverage
// RUN: %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-main
OpenPOWER on IntegriCloud