aganea updated this revision to Diff 197990. aganea added a comment. Changed to use `FileCheck` instead of `grep`
Repository: rC Clang CHANGES SINCE LAST ACTION https://reviews.llvm.org/D61496/new/ https://reviews.llvm.org/D61496 Files: clang/trunk/test/Preprocessor/indent_macro.c clang/trunk/test/Preprocessor/macro_fn_varargs_named.c clang/trunk/test/Preprocessor/macro_not_define.c clang/trunk/test/Preprocessor/macro_rparen_scan.c Index: clang/trunk/test/Preprocessor/macro_rparen_scan.c =================================================================== --- clang/trunk/test/Preprocessor/macro_rparen_scan.c +++ clang/trunk/test/Preprocessor/macro_rparen_scan.c @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 -E %s | grep '^3 ;$' +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace +// CHECK:3 ; /* Right paren scanning, hard case. Should expand to 3. */ #define i(x) 3 Index: clang/trunk/test/Preprocessor/macro_not_define.c =================================================================== --- clang/trunk/test/Preprocessor/macro_not_define.c +++ clang/trunk/test/Preprocessor/macro_not_define.c @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 -E %s | grep '^ # define X 3$' +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace +// CHECK: # define X 3 #define H # #define D define Index: clang/trunk/test/Preprocessor/macro_fn_varargs_named.c =================================================================== --- clang/trunk/test/Preprocessor/macro_fn_varargs_named.c +++ clang/trunk/test/Preprocessor/macro_fn_varargs_named.c @@ -1,6 +1,9 @@ -// RUN: %clang_cc1 -E %s | grep '^a: x$' -// RUN: %clang_cc1 -E %s | grep '^b: x y, z,h$' -// RUN: %clang_cc1 -E %s | grep '^c: foo(x)$' +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace --check-prefix 1 +// 1:a: x +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace --check-prefix 2 +// 2:b: x y, z,h +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace --check-prefix 3 +// 3:c: foo(x) #define A(b, c...) b c a: A(x) Index: clang/trunk/test/Preprocessor/indent_macro.c =================================================================== --- clang/trunk/test/Preprocessor/indent_macro.c +++ clang/trunk/test/Preprocessor/indent_macro.c @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 -E %s | grep '^ zzap$' +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace +// CHECK: zzap // zzap is on a new line, should be indented. #define BLAH zzap
Index: clang/trunk/test/Preprocessor/macro_rparen_scan.c =================================================================== --- clang/trunk/test/Preprocessor/macro_rparen_scan.c +++ clang/trunk/test/Preprocessor/macro_rparen_scan.c @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 -E %s | grep '^3 ;$' +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace +// CHECK:3 ; /* Right paren scanning, hard case. Should expand to 3. */ #define i(x) 3 Index: clang/trunk/test/Preprocessor/macro_not_define.c =================================================================== --- clang/trunk/test/Preprocessor/macro_not_define.c +++ clang/trunk/test/Preprocessor/macro_not_define.c @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 -E %s | grep '^ # define X 3$' +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace +// CHECK: # define X 3 #define H # #define D define Index: clang/trunk/test/Preprocessor/macro_fn_varargs_named.c =================================================================== --- clang/trunk/test/Preprocessor/macro_fn_varargs_named.c +++ clang/trunk/test/Preprocessor/macro_fn_varargs_named.c @@ -1,6 +1,9 @@ -// RUN: %clang_cc1 -E %s | grep '^a: x$' -// RUN: %clang_cc1 -E %s | grep '^b: x y, z,h$' -// RUN: %clang_cc1 -E %s | grep '^c: foo(x)$' +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace --check-prefix 1 +// 1:a: x +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace --check-prefix 2 +// 2:b: x y, z,h +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace --check-prefix 3 +// 3:c: foo(x) #define A(b, c...) b c a: A(x) Index: clang/trunk/test/Preprocessor/indent_macro.c =================================================================== --- clang/trunk/test/Preprocessor/indent_macro.c +++ clang/trunk/test/Preprocessor/indent_macro.c @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 -E %s | grep '^ zzap$' +// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace +// CHECK: zzap // zzap is on a new line, should be indented. #define BLAH zzap
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits