[cfe-commits] r173482 - in /cfe/trunk/test/Preprocessor: macro_expandloc.c macro_expandloc2.c

[Dmitri Gribenko]

Author: gribozavr
Date: Fri Jan 25 14:33:53 2013
New Revision: 173482

URL: http://llvm.org/viewvc/llvm-project?rev=173482&view=rev
Log:
Migrate tests to -verify and merge them

Removed:
    cfe/trunk/test/Preprocessor/macro_expandloc2.c
Modified:
    cfe/trunk/test/Preprocessor/macro_expandloc.c

Modified: cfe/trunk/test/Preprocessor/macro_expandloc.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/macro_expandloc.c?rev=173482&r1=173481&r2=173482&view=diff
==============================================================================
--- cfe/trunk/test/Preprocessor/macro_expandloc.c (original)
+++ cfe/trunk/test/Preprocessor/macro_expandloc.c Fri Jan 25 14:33:53 2013
@@ -1,6 +1,13 @@
-// RUN: %clang_cc1 %s -E 2>&1 | grep '#include'
+// RUN: %clang_cc1 -E -verify %s
 #define FOO 1
 
 // The error message should be on the #include line, not the 1.
+
+// expected-error at +1 {{expected "FILENAME" or <FILENAME>}}
 #include FOO
 
+#define BAR BAZ
+
+// expected-error at +1 {{expected "FILENAME" or <FILENAME>}}
+#include BAR
+

Removed: cfe/trunk/test/Preprocessor/macro_expandloc2.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/macro_expandloc2.c?rev=173481&view=auto
==============================================================================
--- cfe/trunk/test/Preprocessor/macro_expandloc2.c (original)
+++ cfe/trunk/test/Preprocessor/macro_expandloc2.c (removed)
@@ -1,6 +0,0 @@
-// RUN: %clang_cc1 %s -E 2>&1 | grep '#include'
-#define FOO BAR
-
-// The error message should be on the #include line, not the 1.
-#include FOO
-