On Oct 26, 2009, at 3:51 PM, Edward O'Callaghan wrote: > Author: evocallaghan > Date: Mon Oct 26 17:51:02 2009 > New Revision: 85170 > > URL: http://llvm.org/viewvc/llvm-project?rev=85170&view=rev > Log: > Convert a few tests to FileCheck for PR5307.
nice, thanks for doing this Edward! Note that these preprocessor tests are whitespace sensitive. Please pass -strict-whitespace to FileCheck so that it doesn't ignore whitespace differences. -Chris > > Modified: > cfe/trunk/test/Preprocessor/c99-6_10_3_3_p4.c > cfe/trunk/test/Preprocessor/macro_disable3.c > cfe/trunk/test/Preprocessor/macro_rparen_scan2.c > > Modified: cfe/trunk/test/Preprocessor/c99-6_10_3_3_p4.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/c99-6_10_3_3_p4.c?rev=85170&r1=85169&r2=85170&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- cfe/trunk/test/Preprocessor/c99-6_10_3_3_p4.c (original) > +++ cfe/trunk/test/Preprocessor/c99-6_10_3_3_p4.c Mon Oct 26 > 17:51:02 2009 > @@ -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"; > + > > Modified: cfe/trunk/test/Preprocessor/macro_disable3.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/macro_disable3.c?rev=85170&r1=85169&r2=85170&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- cfe/trunk/test/Preprocessor/macro_disable3.c (original) > +++ cfe/trunk/test/Preprocessor/macro_disable3.c Mon Oct 26 17:51:02 > 2009 > @@ -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])))); > + > > Modified: cfe/trunk/test/Preprocessor/macro_rparen_scan2.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/macro_rparen_scan2.c?rev=85170&r1=85169&r2=85170&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- cfe/trunk/test/Preprocessor/macro_rparen_scan2.c (original) > +++ cfe/trunk/test/Preprocessor/macro_rparen_scan2.c Mon Oct 26 > 17:51:02 2009 > @@ -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 ); > + > > > _______________________________________________ > cfe-commits mailing list > [email protected] > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
