Fixing tests on Windows

Author: Machiry

clang/lib/CConv/CConv.cpp

@@ -110,13 +110,13 @@ ArgumentsAdjuster getIgnoreCheckedPointerAdjuster() {
     for (size_t i = 0, e = Args.size(); i < e; ++i) {
       StringRef Arg = Args[i];
       AdjustedArgs.push_back(Args[i]);
-      if (Arg == "-fcheckedc-convert-tool") {
+      if (Arg == "-fcheckedc-convert-tool")
         HasAdjuster = true;
-        break;
-      }
     }
-    if (!DisableCCTypeChecker && !HasAdjuster)
+    if (!DisableCCTypeChecker && !HasAdjuster) {
+      AdjustedArgs.push_back("-Xclang");
       AdjustedArgs.push_back("-fcheckedc-convert-tool");
+    }
     return AdjustedArgs;
   };
 }

clang/test/CheckedCRewriter/basic.c

@@ -11,6 +11,7 @@
 extern _Itype_for_any(T) void *malloc(size_t size) : itype(_Array_ptr<T>) byte_count(size);
 extern _Itype_for_any(T) void *realloc(void *pointer : itype(_Array_ptr<T>) byte_count(1), size_t size) : itype(_Array_ptr<T>) byte_count(size);
 extern _Itype_for_any(T) void *calloc(size_t nmemb, size_t size) : itype(_Array_ptr<T>) byte_count(nmemb * size);
+extern _Unchecked char *strcpy(char * restrict dest, const char * restrict src : itype(restrict _Nt_array_ptr<const char>));
 
 void basic1() {
 	char data[] = "abcdefghijklmnop";
@@ -23,7 +24,7 @@ void basic1() {
 }
 
 //CHECK_NOALL: char data[] = "abcdefghijklmnop";
-//CHECK_ALL: char data _Checked[17] =  "abcdefghijklmnop";
+//CHECK_ALL: char data _Nt_checked[17] =  "abcdefghijklmnop";
 //CHECK: char *buffer = malloc<char>(50);
 
 char* basic2(int temp) {
@@ -46,8 +47,8 @@ char* basic2(int temp) {
 	}
 }
 //CHECK: char * basic2(int temp) {
-//CHECK_ALL: char data _Checked[17] =  "abcdefghijklmnop";
-//CHECK_ALL: char data2 _Checked[65] =  "abcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnop";
+//CHECK_ALL: char data _Nt_checked[17] =  "abcdefghijklmnop";
+//CHECK_ALL: char data2 _Nt_checked[65] =  "abcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnop";
 //CHECK: char *buffer = malloc<char>(8);
 //CHECK: char *buffer = malloc<char>(1024);
 
@@ -194,7 +195,7 @@ struct student * new_student() {
 }
 //CHECK: _Ptr<struct student> new_student(void) {
 //CHECK_NOALL: char name[] = "Bilbo Baggins";
-//CHECK_ALL: char name _Checked[14] =  "Bilbo Baggins";
+//CHECK_ALL: char name _Nt_checked[14] =  "Bilbo Baggins";
 //CHECK: _Ptr<struct student> new_s =  malloc<struct student>(sizeof(struct student));
 
 int main() {

clang/test/CheckedCRewriter/extstructfields.c

@@ -1,3 +1,4 @@
+// UNSUPPORTED: system-windows
 // RUN: CPATH=$CHECKED_CPATH:$CPATH cconv-standalone %s -- | FileCheck -match-full-lines %s
 // RUN: CPATH=$CHECKED_CPATH:$CPATH cconv-standalone %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -