FileCheck'ize tests

llvm-svn: 173484

diff --git a/clang/test/Preprocessor/hash_line.c b/clang/test/Preprocessor/hash_line.c
index 4f724df..64edae0 100644 (file)
--- a/clang/test/Preprocessor/hash_line.c
+++ b/clang/test/Preprocessor/hash_line.c
@@ -1,7 +1,10 @@
 // The 1 and # should not go on the same line.
-// RUN: %clang_cc1 %s -E | not grep "1 #"
-// RUN: %clang_cc1 %s -E | grep '^1$'
-// RUN: %clang_cc1 %s -E | grep '^      #$'
+// RUN: %clang_cc1 -E %s | FileCheck --strict-whitespace %s
+// CHECK-NOT: 1{{.*}}#
+// CHECK: {{^1$}}
+// CHECK-NOT: 1{{.*}}#
+// CHECK: {{^      #$}}
+// CHECK-NOT: 1{{.*}}#
 1
 #define EMPTY
 EMPTY #

diff --git a/clang/test/Preprocessor/macro_expand.c b/clang/test/Preprocessor/macro_expand.c
index 4dc0357..cf98a2c 100644 (file)
--- a/clang/test/Preprocessor/macro_expand.c
+++ b/clang/test/Preprocessor/macro_expand.c
@@ -1,11 +1,10 @@
-// RUN: %clang_cc1 -E %s | grep '^A: Y$'
-// RUN: %clang_cc1 -E %s | grep '^B: f()$'
-// RUN: %clang_cc1 -E %s | grep '^C: for()$'
+// RUN: %clang_cc1 -E %s | FileCheck --strict-whitespace %s
 
 #define X() Y
 #define Y() X
 
 A: X()()()
+// CHECK: {{^}}A: Y{{$}}
 
 // PR3927
 #define f(x) h(x
@@ -14,6 +13,9 @@ A: X()()()
 B: f(f))
 C: for(for))
 
+// CHECK: {{^}}B: f(){{$}}
+// CHECK: {{^}}C: for(){{$}}
+
 // rdar://6880648
 #define f(x,y...) y
 f()