From b5bf9b64d23a9077c39e9bf5fcd6dc005d0c4057 Mon Sep 17 00:00:00 2001
From: Dmitri Gribenko <gribozavr@gmail.com>
Date: Mon, 28 Jan 2013 17:31:40 +0000
Subject: [PATCH] FileCheck'ize and merge tests

llvm-svn: 173697
---
 clang/test/Preprocessor/stringize_space.c  | 12 +++++++++++-
 clang/test/Preprocessor/stringize_space2.c |  6 ------
 2 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 clang/test/Preprocessor/stringize_space2.c

diff --git a/clang/test/Preprocessor/stringize_space.c b/clang/test/Preprocessor/stringize_space.c
index 263cff831b3f..2d79d478e39d 100644
--- a/clang/test/Preprocessor/stringize_space.c
+++ b/clang/test/Preprocessor/stringize_space.c
@@ -1,4 +1,14 @@
-// RUN: %clang_cc1 -E %s | grep -- '-"" , - "" , -"" , - ""'
+// RUN: %clang_cc1 -E %s | FileCheck --strict-whitespace %s
 
 #define A(b) -#b  ,  - #b  ,  -# b  ,  - # b
 A()
+
+// CHECK: {{^}}-"" , - "" , -"" , - ""{{$}}
+
+
+#define t(x) #x
+t(a
+c)
+
+// CHECK: {{^}}"a c"{{$}}
+
diff --git a/clang/test/Preprocessor/stringize_space2.c b/clang/test/Preprocessor/stringize_space2.c
deleted file mode 100644
index a87d78e40437..000000000000
--- a/clang/test/Preprocessor/stringize_space2.c
+++ /dev/null
@@ -1,6 +0,0 @@
-/* RUN: %clang_cc1 -E %s | grep 'a c'
- */
-#define t(x) #x
-t(a
-c)
-