summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-10-31 14:50:33 (GMT)
committerBrad King <brad.king@kitware.com>2022-10-31 14:50:33 (GMT)
commit4180159758c0941de2ffa7d180dbb1b22441db4c (patch)
tree9de47c78dc08de1faac5385d617bd36041a291fc
parent46c1693602fa7ae8d1cd332228dad10ea98a6877 (diff)
downloadCMake-4180159758c0941de2ffa7d180dbb1b22441db4c.zip
CMake-4180159758c0941de2ffa7d180dbb1b22441db4c.tar.gz
CMake-4180159758c0941de2ffa7d180dbb1b22441db4c.tar.bz2
Tests: Provide RunCMake.CommandLine compare_files data more robustly
The `lf` and `crlf` files need to have exact LF and CRLF newlines, respectively. Previously we used the Git `eol` attribute for this, but occasionally the Git work tree ends up without the conversion. It is unclear why that happens, so try to avoid the problem by treating their content as binary instead.
-rw-r--r--Tests/RunCMake/CommandLine/compare_files/.gitattributes4
-rw-r--r--Tests/RunCMake/CommandLine/compare_files/crlf2
2 files changed, 3 insertions, 3 deletions
diff --git a/Tests/RunCMake/CommandLine/compare_files/.gitattributes b/Tests/RunCMake/CommandLine/compare_files/.gitattributes
index 91d5c10..d03da96 100644
--- a/Tests/RunCMake/CommandLine/compare_files/.gitattributes
+++ b/Tests/RunCMake/CommandLine/compare_files/.gitattributes
@@ -1,2 +1,2 @@
-crlf eol=crlf
-lf eol=lf
+crlf -text -whitespace
+lf -text
diff --git a/Tests/RunCMake/CommandLine/compare_files/crlf b/Tests/RunCMake/CommandLine/compare_files/crlf
index a29bdeb..495181c 100644
--- a/Tests/RunCMake/CommandLine/compare_files/crlf
+++ b/Tests/RunCMake/CommandLine/compare_files/crlf
@@ -1 +1 @@
-line1
+line1