Index: test/Analysis/complex.c
===================================================================
--- test/Analysis/complex.c	(revision 113070)
+++ test/Analysis/complex.c	(working copy)
@@ -1,7 +1,7 @@
-// RUN: %clang_cc1 -analyze -analyzer-experimental-internal-checks -analyzer-check-objc-mem -analyzer-store=basic -analyzer-constraints=basic -verify -Wno-unreachable-code %s
-// RUN: %clang_cc1 -analyze -analyzer-experimental-internal-checks -analyzer-check-objc-mem -analyzer-store=basic -analyzer-constraints=range -verify -Wno-unreachable-code %s
-// RUN: %clang_cc1 -analyze -analyzer-experimental-internal-checks -analyzer-check-objc-mem -analyzer-store=region -analyzer-constraints=basic -verify -Wno-unreachable-code %s
-// RUN: %clang_cc1 -analyze -analyzer-experimental-internal-checks -analyzer-check-objc-mem -analyzer-store=region -analyzer-constraints=range -verify -Wno-unreachable-code %s
+// RUN: %clang --analyze -Xanalyzer -analyzer-experimental-internal-checks -Xanalyzer -analyzer-check-objc-mem -Xanalyzer -analyzer-store=basic -Xanalyzer -analyzer-constraints=basic -Xclang -verify -Wno-unreachable-code %s
+// RUN: %clang --analyze -Xanalyzer -analyzer-experimental-internal-checks -Xanalyzer -analyzer-check-objc-mem -Xanalyzer -analyzer-store=basic -Xanalyzer -analyzer-constraints=range -Xclang -verify -Wno-unreachable-code %s
+// RUN: %clang --analyze -Xanalyzer -analyzer-experimental-internal-checks -Xanalyzer -analyzer-check-objc-mem -Xanalyzer -analyzer-store=region -Xanalyzer -analyzer-constraints=basic -Xclang -verify -Wno-unreachable-code %s
+// RUN: %clang --analyze -Xanalyzer -analyzer-experimental-internal-checks -Xanalyzer -analyzer-check-objc-mem -Xanalyzer -analyzer-store=region -Xanalyzer -analyzer-constraints=range -Xclang -verify -Wno-unreachable-code %s
 
 #include <stdint.h>
 
Index: test/Lexer/digraph.c
===================================================================
--- test/Lexer/digraph.c	(revision 113070)
+++ test/Lexer/digraph.c	(working copy)
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify < %s
+// RUN: %clang -fsyntax-only -Xclang -verify  %s
 
 %:include <stdint.h>
 
Index: test/Misc/predefines.c
===================================================================
--- test/Misc/predefines.c	(revision 113070)
+++ test/Misc/predefines.c	(working copy)
@@ -1,4 +1,4 @@
-/* RUN: %clang_cc1 -fsyntax-only -verify -std=c89 -pedantic-errors %s
+/* RUN: %clang -fsyntax-only -Xclang -verify -std=c89 -pedantic-errors %s
  * rdar://6814950
  */
 #include <stdint.h>
Index: test/Preprocessor/objc-pp.m
===================================================================
--- test/Preprocessor/objc-pp.m	(revision 113070)
+++ test/Preprocessor/objc-pp.m	(working copy)
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -fsyntax-only -verify -pedantic
+// RUN: %clang %s -fsyntax-only -Xclang -verify -pedantic
 
 #import <stdint.h>  // no warning on #import in objc mode.
 
Index: test/Sema/const-ptr-int-ptr-cast.c
===================================================================
--- test/Sema/const-ptr-int-ptr-cast.c	(revision 113070)
+++ test/Sema/const-ptr-int-ptr-cast.c	(working copy)
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang -fsyntax-only -Xclang -verify %s
 
 #include <stdint.h>
 
Index: test/Sema/init.c
===================================================================
--- test/Sema/init.c	(revision 113070)
+++ test/Sema/init.c	(working copy)
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -verify -fsyntax-only
+// RUN: %clang %s -Xclang -verify -fsyntax-only
 
 #include <stddef.h>
 #include <stdint.h>
@@ -49,12 +49,15 @@
   return bp;
 }
 
+// Because there is no _Bool type when -fms-extensions
+#ifndef WIN32
 int pbool(void) {
   typedef const _Bool cbool;
   _Bool pbool1 = (void *) 0;
   cbool pbool2 = &pbool;
   return pbool2;
 }
+#endif
 
 
 // rdar://5870981