Avoid the need for diff --strip-trailing-cr in Windows tests
#4223
| Job | Run time |
|---|---|
| 2m 56s | |
| 4m 58s | |
| 5m 32s | |
| 4m 35s | |
| 1m 34s | |
| 6m 17s | |
| 2m 27s | |
| 6m 56s | |
| 6m 25s | |
| 6m 13s | |
| 5m 29s | |
| 6m 14s | |
| 4m 21s | |
| 4m 35s | |
| 7m 9s | |
| 7m 21s | |
| 2m 28s | |
| 2m 39s | |
| 2m 34s | |
| 3m 35s | |
| 2m 12s | |
| 2m 1s | |
| 1m 58s | |
| 1m 47s | |
| 1h 42m 16s |