Convert a few tests to FileCheck for PR5307.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@85170 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Preprocessor/c99-6_10_3_3_p4.c b/test/Preprocessor/c99-6_10_3_3_p4.c
index 89660549b9a13c11e4a9db85bf5805ce4412dbc4..a23fb77602de98c4089662368ebc151ebe2f9e2f 100644 (file)
--- a/test/Preprocessor/c99-6_10_3_3_p4.c
+++ b/test/Preprocessor/c99-6_10_3_3_p4.c
@@ -1,6 +1,9 @@
-// RUN: clang-cc -E %s | grep -F 'char p[] = "x ## y";'
+// RUN: clang-cc -E %s | FileCheck %s
 #define hash_hash # ## # 
 #define mkstr(a) # a 
 #define in_between(a) mkstr(a) 
 #define join(c, d) in_between(c hash_hash d) 
 char p[] = join(x, y);
+
+// CHECK: char p[] = "x ## y";
+

diff --git a/test/Preprocessor/macro_disable3.c b/test/Preprocessor/macro_disable3.c
index 011de3beed3d8db398de9eee3c637964ddf3944e..2983f2d9a45205ceb9e9fc1ce333c85d5eaae74a 100644 (file)
--- a/test/Preprocessor/macro_disable3.c
+++ b/test/Preprocessor/macro_disable3.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E | grep -F 'f(2 * (f(2 * (z[0]))));'
+// RUN: clang-cc %s -E | FileCheck %s
 // Check for C99 6.10.3.4p2.
 
 #define f(a) f(x * (a)) 
@@ -6,3 +6,5 @@
 #define z z[0] 
 f(f(z)); 
 
+// CHECK: f(2 * (f(2 * (z[0]))));
+

diff --git a/test/Preprocessor/macro_rparen_scan2.c b/test/Preprocessor/macro_rparen_scan2.c
index 41748ac459b9c80364e83c472ce13b5cc4c11ae4..30597a00973f4aebf796c71e920ae3a339d30507 100644 (file)
--- a/test/Preprocessor/macro_rparen_scan2.c
+++ b/test/Preprocessor/macro_rparen_scan2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep -F 'static int glob = (1 + 1 );'
+// RUN: clang-cc -E %s | FileCheck %s
 
 #define R_PAREN ) 
 
@@ -6,3 +6,5 @@
 
 static int glob = (1 + FUNC(1 R_PAREN ); 
 
+// CHECK: static int glob = (1 + 1 );
+