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 8966054..a23fb77 100644
--- 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 011de3b..2983f2d 100644
--- 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 41748ac..30597a0 100644
--- 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 );
+