Fixed tests where grep was not matching the linefeed

[aganea]

Summary

The files below have been synced by Tortoise as CRLF, and it looks like they are like that in the depot as well (I'm still using the SVN setup)
Strangely svn diff shows them as LF.
The issue is that grep 'something$' doesn't match the newline inside the MINGW32 bash (mintty).

[lebedev.ri]

The tests should be fixed to use FileCheck.

[probinson]

Checked-in files should not have CRLF endings, in general (there are a very few exceptions, and these aren't among them).
If the checked-in files have LF endings but your tool checks them out with CRLF then that is a problem with your config, or with the tool.
Adding dos2unix to the RUN lines is the wrong fix, either way.

[aganea]

Changed to use FileCheck instead of grep

[aganea]

In D61496#1489523, @probinson wrote:

Checked-in files should not have CRLF endings, in general (there are a very few exceptions, and these aren't among them).
If the checked-in files have LF endings but your tool checks them out with CRLF then that is a problem with your config, or with the tool.
Adding dos2unix to the RUN lines is the wrong fix, either way.

Yeah I've realized that :) This is caused by svn on Windows which sets svn:eol-style=native by default, which causes local files to be saved in the "native" format, which is CRLF on Windows (even though in upstream they are LF) When files are commited, normally svn should convert them back to LF (or at least that's the contract for svn:eol-style=native).

native
This causes the file to contain the EOL markers that are native to the operating system on which Subversion was run. In other words, if a user on a Windows machine checks out a working copy that contains a file with an svn:eol-style property set to native, that file will contain CRLF EOL markers. A Unix user checking out a working copy that contains the same file will see LF EOL markers in his copy of the file.

Note that Subversion will actually store the file in the repository using normalized LF EOL markers regardless of the operating system. This is basically transparent to the user, though.

I'm using the MINGW32 bash to run the tests/check-all because it comes with all the Unix tools (grep, sed, ...) that Windows doesn't have.
The bug here is that the GNU grep only matches LF, not CRLF.

[lebedev.ri]

Sure, this looks better.

clang/trunk/test/Preprocessor/indent_macro.c

1–2 ↗

(On Diff #197990)

Separate with newline

clang/trunk/test/Preprocessor/macro_fn_varargs_named.c

1–6 ↗

(On Diff #197990)

// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace --check-prefix CHECK-1
// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace --check-prefix CHECK-2
// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace --check-prefix CHECK-3

// CHECK-1:a: x
// CHECK-2:b: x y, z,h
// CHECK-3:c: foo(x)

[aganea]

clang/trunk/test/Preprocessor/indent_macro.c

1–2 ↗

(On Diff #197990)

What do you mean? Between RUN and CHECK? There's already a newline a L3.

test/Preprocessor/indent_macro.c

-// 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
    BLAH
 

test/Preprocessor/macro_fn_varargs_named.c

-// 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 CHECK-1
+// CHECK-1:a: x
+// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace --check-prefix CHECK-2
+// CHECK-2:b: x y, z,h
+// RUN: %clang_cc1 -E %s | FileCheck %s --match-full-lines --strict-whitespace --check-prefix CHECK-3
+// CHECK-3:c: foo(x)
 
 #define A(b, c...) b c
 a: A(x)
 b: A(x, y, z,h)
 
 #define B(b, c...) foo(b, ## c)
 c: B(x)

test/Preprocessor/macro_not_define.c

-// 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 
  
  #define DEFINE(a, b) H D a b 
  
  DEFINE(X, 3) 
 

test/Preprocessor/macro_rparen_scan.c

-// 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 
 #define a i(yz 
 #define b ) 
 a b ) ;