12 files changed, 45 insertions, 45 deletions

diff --git a/test/Coverage/ast-printing.c b/test/Coverage/ast-printing.c
index 640dc29f394e6..182bd4d1b25a9 100644
--- a/test/Coverage/ast-printing.c
+++ b/test/Coverage/ast-printing.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -fsyntax-only %s
-// RUN: clang-cc -ast-print %s
-// RUN: clang-cc -ast-dump %s
-// RUN: clang-cc -ast-print-xml -o %t %s
+// RUN: %clang_cc1 -fsyntax-only %s
+// RUN: %clang_cc1 -ast-print %s
+// RUN: %clang_cc1 -ast-dump %s
+// RUN: %clang_cc1 -ast-print-xml -o %t %s
 
 #include "c-language-features.inc"
diff --git a/test/Coverage/ast-printing.cpp b/test/Coverage/ast-printing.cpp
index d627fca3522e6..e86e799a8f6ef 100644
--- a/test/Coverage/ast-printing.cpp
+++ b/test/Coverage/ast-printing.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -fsyntax-only %s
-// RUN: clang-cc -ast-print %s
-// RUN: clang-cc -ast-dump %s
-// FIXME: clang-cc -ast-print-xml -o %t %s
+// RUN: %clang_cc1 -fsyntax-only %s
+// RUN: %clang_cc1 -ast-print %s
+// RUN: %clang_cc1 -ast-dump %s
+// FIXME: %clang_cc1 -ast-print-xml -o %t %s
 
 #include "cxx-language-features.inc"
diff --git a/test/Coverage/ast-printing.m b/test/Coverage/ast-printing.m
index a864e2d72b881..d9c97d43d4638 100644
--- a/test/Coverage/ast-printing.m
+++ b/test/Coverage/ast-printing.m
@@ -1,5 +1,5 @@
-// RUN: clang -cc1 -fsyntax-only %s
-// RUN: clang -cc1 -ast-print %s
-// RUN: clang -cc1 -ast-dump %s
+// RUN: %clang_cc1 -fsyntax-only %s
+// RUN: %clang_cc1 -ast-print %s
+// RUN: %clang_cc1 -ast-dump %s
 
 #include "objc-language-features.inc"
diff --git a/test/Coverage/codegen-gnu.m b/test/Coverage/codegen-gnu.m
index 194809261458a..6e7790dc5a702 100644
--- a/test/Coverage/codegen-gnu.m
+++ b/test/Coverage/codegen-gnu.m
@@ -1,3 +1,3 @@
-// RUN: clang -cc1 -triple i386-unknown-unknown -fgnu-runtime -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -fgnu-runtime -emit-llvm -o %t %s
 
 #include "objc-language-features.inc"
diff --git a/test/Coverage/codegen-next.m b/test/Coverage/codegen-next.m
index d78f93e61d2d7..978b443f0fa66 100644
--- a/test/Coverage/codegen-next.m
+++ b/test/Coverage/codegen-next.m
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 -emit-llvm -o %t %s
-// RUN: clang -cc1 -g -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -emit-llvm -o %t %s
 
 #include "objc-language-features.inc"
diff --git a/test/Coverage/codegen.c b/test/Coverage/codegen.c
index f1d7fcc88672b..8e5195cc39efb 100644
--- a/test/Coverage/codegen.c
+++ b/test/Coverage/codegen.c
@@ -1,7 +1,7 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o %t %s
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o %t %s
-// RUN: clang-cc -triple i386-unknown-unknown -g -emit-llvm-bc -o %t %s
-// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm-bc -o %t %s
-// RUN: clang-cc -triple x86_64-unknown-unknown -g -emit-llvm-bc -o %t %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm-bc -o %t %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -g -emit-llvm-bc -o %t %s
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm-bc -o %t %s
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -g -emit-llvm-bc -o %t %s
 
 #include "c-language-features.inc"
diff --git a/test/Coverage/html-diagnostics.c b/test/Coverage/html-diagnostics.c
index 3079632e1205a..6971f58f6aa4d 100644
--- a/test/Coverage/html-diagnostics.c
+++ b/test/Coverage/html-diagnostics.c
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t
-// RUN: clang-cc -analyze -analyzer-output=html -checker-cfref -o %t %s
+// RUN: %clang_cc1 -analyze -analyzer-output=html -checker-cfref -o %t %s
 // RUN: cat %t/*.html | FileCheck %s
 
 // CHECK: <h3>Annotated Source Code</h3>
diff --git a/test/Coverage/html-print.c b/test/Coverage/html-print.c
index dab156b145a84..a3f29c6f36f86 100644
--- a/test/Coverage/html-print.c
+++ b/test/Coverage/html-print.c
@@ -1,3 +1,3 @@
-// RUN: clang-cc -emit-html -o %t %s
+// RUN: %clang_cc1 -emit-html -o %t %s
 
 #include "c-language-features.inc"
diff --git a/test/Coverage/parse-callbacks.c b/test/Coverage/parse-callbacks.c
index e29b38bd0d26f..02f3a8374bc70 100644
--- a/test/Coverage/parse-callbacks.c
+++ b/test/Coverage/parse-callbacks.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -parse-noop %s
-// RUN: clang-cc -parse-print-callbacks %s
+// RUN: %clang_cc1 -parse-noop %s
+// RUN: %clang_cc1 -parse-print-callbacks %s
 
 #include "c-language-features.inc"
diff --git a/test/Coverage/parse-callbacks.m b/test/Coverage/parse-callbacks.m
index 7666d19432d38..f023d3d0648b7 100644
--- a/test/Coverage/parse-callbacks.m
+++ b/test/Coverage/parse-callbacks.m
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 -parse-noop %s
-// RUN: clang -cc1 -parse-print-callbacks %s
+// RUN: %clang_cc1 -parse-noop %s
+// RUN: %clang_cc1 -parse-print-callbacks %s
 
 #include "objc-language-features.inc"
diff --git a/test/Coverage/targets.c b/test/Coverage/targets.c
index 23990e06d3931..c9f6f8d88d593 100644
--- a/test/Coverage/targets.c
+++ b/test/Coverage/targets.c
@@ -1,22 +1,22 @@
-// RUN: clang-cc -g -triple armv6-apple-darwin9 -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple armv6-unknown-unknown -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple bfin-unknown-unknown -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple i686-apple-darwin9 -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple i686-pc-linux-gnu -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple i686-unknown-dragonfly -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple i686-unknown-unknown -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple i686-unknown-win32 -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple pic16-unknown-unknown -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple powerpc-apple-darwin9 -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple powerpc-unknown-unknown -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple powerpc64-apple-darwin9 -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple powerpc64-unknown-unknown -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple sparc-unknown-solaris -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple sparc-unknown-unknown -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple x86_64-apple-darwin9 -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple x86_64-pc-linux-gnu -emit-llvm -o %t %s
-// RUN: clang-cc -g -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple armv6-apple-darwin9 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple armv6-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple bfin-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple i686-apple-darwin9 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple i686-pc-linux-gnu -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple i686-unknown-dragonfly -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple i686-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple i686-unknown-win32 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple pic16-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple powerpc-apple-darwin9 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple powerpc-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple powerpc64-apple-darwin9 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple powerpc64-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple sparc-unknown-solaris -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple sparc-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple x86_64-apple-darwin9 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple x86_64-pc-linux-gnu -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -triple x86_64-unknown-unknown -emit-llvm -o %t %s
 
 // <rdar://problem/7181838> clang 1.0 fails to compile Python 2.6
-// RUN: clang -ccc-host-triple x86_64-apple-darwin9 -### -S %s -mmacosx-version-min=10.4
+// RUN: %clang -ccc-host-triple x86_64-apple-darwin9 -### -S %s -mmacosx-version-min=10.4
 
diff --git a/test/Coverage/verbose.c b/test/Coverage/verbose.c
index a75557b3fdee8..72451d4620c12 100644
--- a/test/Coverage/verbose.c
+++ b/test/Coverage/verbose.c
@@ -1 +1 @@
-// RUN: clang-cc -fsyntax-only -v %s
+// RUN: %clang_cc1 -fsyntax-only -v %s