From 19ae1175ae8d2597d16ea5ce7bb9f0993cd6765c Mon Sep 17 00:00:00 2001
From: Tim Northover <tnorthover@apple.com>
Date: Mon, 12 Aug 2013 12:51:05 +0000
Subject: Fix FileCheck --check-prefix lines.

Various tests had sprung up over the years which had --check-prefix=ABC on the
RUN line, but "CHECK-ABC:" later on. This happened to work before, but was
strictly incorrect. FileCheck is getting stricter soon though.

Patch by Ron Ofir.

llvm-svn: 188174
---
 clang/test/Rewriter/blockcast3.mm                | 4 ++--
 clang/test/Rewriter/inner-block-helper-funcs.mm  | 2 +-
 clang/test/Rewriter/line-generation-test.m       | 4 ++--
 clang/test/Rewriter/rewrite-cast-ivar-access.mm  | 2 +-
 clang/test/Rewriter/rewrite-category-property.mm | 2 +-
 clang/test/Rewriter/rewrite-line-directive.m     | 4 ++--
 clang/test/Rewriter/rewrite-message-expr.mm      | 2 +-
 clang/test/Rewriter/rewrite-modern-typeof.mm     | 2 +-
 clang/test/Rewriter/rewrite-typeof.mm            | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'clang/test/Rewriter')

diff --git a/clang/test/Rewriter/blockcast3.mm b/clang/test/Rewriter/blockcast3.mm
index 697a465..1d82609 100644
--- a/clang/test/Rewriter/blockcast3.mm
+++ b/clang/test/Rewriter/blockcast3.mm
@@ -1,8 +1,8 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %t.mm -o %t-rw.cpp
-// RUN: FileCheck -check-prefix LP --input-file=%t-rw.cpp %s
+// RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o %t-modern-rw.cpp
-// RUN: FileCheck -check-prefix LP --input-file=%t-modern-rw.cpp %s
+// RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-modern-rw.cpp %s
 // radar 7607781
 
 typedef struct {
diff --git a/clang/test/Rewriter/inner-block-helper-funcs.mm b/clang/test/Rewriter/inner-block-helper-funcs.mm
index fb565b6..92ef7e9 100644
--- a/clang/test/Rewriter/inner-block-helper-funcs.mm
+++ b/clang/test/Rewriter/inner-block-helper-funcs.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
-// RUN: FileCheck  -check-prefix LP --input-file=%t-rw.cpp %s
+// RUN: FileCheck  -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
 // rdar://9846759
 
 typedef void (^dispatch_block_t)(void);
diff --git a/clang/test/Rewriter/line-generation-test.m b/clang/test/Rewriter/line-generation-test.m
index dad7371..0e666e1 100644
--- a/clang/test/Rewriter/line-generation-test.m
+++ b/clang/test/Rewriter/line-generation-test.m
@@ -1,8 +1,8 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang_cc1 -fms-extensions -rewrite-objc -g %t.mm -o %t-rw.cpp
-// RUN: FileCheck  -check-prefix LINE --input-file=%t-rw.cpp %s
+// RUN: FileCheck  -check-prefix CHECK-LINE --input-file=%t-rw.cpp %s
 // RUN: %clang_cc1 -fms-extensions -rewrite-objc %t.mm -o %t-rwnog.cpp
-// RUN: FileCheck  -check-prefix NOLINE --input-file=%t-rwnog.cpp %s
+// RUN: FileCheck  -check-prefix CHECK-NOLINE --input-file=%t-rwnog.cpp %s
 // rdar://13138170
 
 __attribute__((objc_root_class)) @interface MyObject {
diff --git a/clang/test/Rewriter/rewrite-cast-ivar-access.mm b/clang/test/Rewriter/rewrite-cast-ivar-access.mm
index 4e50ff1..d5c2796 100644
--- a/clang/test/Rewriter/rewrite-cast-ivar-access.mm
+++ b/clang/test/Rewriter/rewrite-cast-ivar-access.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
-// RUN: FileCheck -check-prefix LP --input-file=%t-rw.cpp %s
+// RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
 // radar 7575882
 
 @interface F {
diff --git a/clang/test/Rewriter/rewrite-category-property.mm b/clang/test/Rewriter/rewrite-category-property.mm
index 50ef432..c0f530e 100644
--- a/clang/test/Rewriter/rewrite-category-property.mm
+++ b/clang/test/Rewriter/rewrite-category-property.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
-// RUN: FileCheck -check-prefix LP --input-file=%t-rw.cpp %s
+// RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
 // radar 7630636
 
 @class Y, Z;
diff --git a/clang/test/Rewriter/rewrite-line-directive.m b/clang/test/Rewriter/rewrite-line-directive.m
index 5c4e957..ec50a83 100644
--- a/clang/test/Rewriter/rewrite-line-directive.m
+++ b/clang/test/Rewriter/rewrite-line-directive.m
@@ -1,8 +1,8 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang -fms-extensions -rewrite-objc %t.mm -o %t-rw.cpp
-// RUN: FileCheck -check-prefix LP --input-file=%t-rw.cpp %s
+// RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
 // RUN: %clang -g -fms-extensions -rewrite-objc %t.mm -o %t-rw.cpp
-// RUN: FileCheck -check-prefix LPG --input-file=%t-rw.cpp %s
+// RUN: FileCheck -check-prefix CHECK-LPG --input-file=%t-rw.cpp %s
 // rdar://13138170
 
 int z();
diff --git a/clang/test/Rewriter/rewrite-message-expr.mm b/clang/test/Rewriter/rewrite-message-expr.mm
index 72569cb..04e27e5 100644
--- a/clang/test/Rewriter/rewrite-message-expr.mm
+++ b/clang/test/Rewriter/rewrite-message-expr.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
-// RUN: FileCheck -check-prefix LP --input-file=%t-rw.cpp %s
+// RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
 // radar 7617047
 
 @interface Baz
diff --git a/clang/test/Rewriter/rewrite-modern-typeof.mm b/clang/test/Rewriter/rewrite-modern-typeof.mm
index a493c11..91e0b62 100644
--- a/clang/test/Rewriter/rewrite-modern-typeof.mm
+++ b/clang/test/Rewriter/rewrite-modern-typeof.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
-// RUN: FileCheck -check-prefix LP --input-file=%t-rw.cpp %s
+// RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -Wno-attributes -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 
 typedef unsigned long size_t;
diff --git a/clang/test/Rewriter/rewrite-typeof.mm b/clang/test/Rewriter/rewrite-typeof.mm
index 02c36f8..f6790ea 100644
--- a/clang/test/Rewriter/rewrite-typeof.mm
+++ b/clang/test/Rewriter/rewrite-typeof.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
-// RUN: FileCheck -check-prefix LP --input-file=%t-rw.cpp %s
+// RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
 
 extern "C" {
 extern "C" void *_Block_copy(const void *aBlock);
-- 
cgit v1.1