Skip to content

Commit 19349a5

Browse files
committed
Ignore LF/CRLF differences when comparing text files
Matters on Windows.
1 parent fb58b81 commit 19349a5

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2468,7 +2468,7 @@ if(CBF_ENABLE_FORTRAN)
24682468
FIXTURES_CLEANUP xds_binary-flat)
24692469

24702470
add_test(NAME xds_binary-flat-cmp
2471-
COMMAND ${CMAKE_COMMAND} -E compare_files
2471+
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol
24722472
"${data_output}/test_xds_bin_testflatout_orig.out"
24732473
"${CBF__DATA}/test_xds_bin_testflatout.out")
24742474
set_tests_properties(xds_binary-flat-cmp PROPERTIES
@@ -2495,7 +2495,7 @@ if(CBF_ENABLE_FORTRAN)
24952495
FIXTURES_CLEANUP xds_binary-flatpacked)
24962496

24972497
add_test(NAME xds_binary-flatpacked-cmp
2498-
COMMAND ${CMAKE_COMMAND} -E compare_files
2498+
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol
24992499
"${data_output}/test_xds_bin_testflatpackedout_orig.out"
25002500
"${CBF__DATA}/test_xds_bin_testflatpackedout.out")
25012501
set_tests_properties(xds_binary-flatpacked-cmp PROPERTIES
@@ -2522,7 +2522,7 @@ if(CBF_ENABLE_FORTRAN)
25222522
FIXTURES_CLEANUP fcb_read_image-flat)
25232523

25242524
add_test(NAME fcb_read_image-flat-cmp
2525-
COMMAND ${CMAKE_COMMAND} -E compare_files
2525+
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol
25262526
"${data_output}/test_fcb_read_testflatout_orig.out"
25272527
"${CBF__DATA}/test_fcb_read_testflatout.out")
25282528
set_tests_properties(fcb_read_image-flat-cmp PROPERTIES
@@ -2549,7 +2549,7 @@ if(CBF_ENABLE_FORTRAN)
25492549
FIXTURES_CLEANUP fcb_read_image-flatpacked)
25502550

25512551
add_test(NAME fcb_read_image-flatpacked-cmp
2552-
COMMAND ${CMAKE_COMMAND} -E compare_files
2552+
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol
25532553
"${data_output}/test_fcb_read_testflatpackedout_orig.out"
25542554
"${CBF__DATA}/test_fcb_read_testflatpackedout.out")
25552555
set_tests_properties(fcb_read_image-flatpacked-cmp PROPERTIES
@@ -2635,7 +2635,7 @@ if(CBF_ENABLE_PYTHON)
26352635
FIXTURES_CLEANUP pycbf-test1-standardize-numbers)
26362636

26372637
add_test(NAME pycbf-test1-cmp
2638-
COMMAND ${CMAKE_COMMAND} -E compare_files
2638+
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol
26392639
"${data_output}/pycbf_test1_orig.out"
26402640
"${CBF__DATA}/pycbf_test1.out")
26412641
set_tests_properties(pycbf-test1-cmp PROPERTIES
@@ -2675,7 +2675,7 @@ if(CBF_ENABLE_PYTHON)
26752675
FIXTURES_CLEANUP pycbf-test2-standardize-numbers)
26762676

26772677
add_test(NAME pycbf-test2-cmp
2678-
COMMAND ${CMAKE_COMMAND} -E compare_files
2678+
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol
26792679
"${data_output}/pycbf_test2_orig.out"
26802680
"${CBF__DATA}/pycbf_test2.out")
26812681
set_tests_properties(pycbf-test2-cmp PROPERTIES
@@ -2726,7 +2726,7 @@ if(CBF_ENABLE_PYTHON)
27262726
FIXTURES_CLEANUP pycbf-test4-standardize-numbers)
27272727

27282728
add_test(NAME pycbf-test4-cmp
2729-
COMMAND ${CMAKE_COMMAND} -E compare_files
2729+
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol
27302730
"${data_output}/pycbf_test4_orig.out"
27312731
"${CBF__DATA}/pycbf_test4.out")
27322732
set_tests_properties(pycbf-test4-cmp PROPERTIES
@@ -2765,7 +2765,7 @@ if(CBF_ENABLE_PYTHON)
27652765
FIXTURES_CLEANUP pycbf-fel1-standardize-numbers)
27662766

27672767
add_test(NAME pycbf-fel1-cmp
2768-
COMMAND ${CMAKE_COMMAND} -E compare_files
2768+
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol
27692769
"${data_output}/fel_test1_orig.out"
27702770
"${CBF__DATA}/fel_test1.out")
27712771
set_tests_properties(pycbf-fel1-cmp PROPERTIES
@@ -2804,7 +2804,7 @@ if(CBF_ENABLE_PYTHON)
28042804
FIXTURES_CLEANUP pycbf-fel2-standardize-numbers)
28052805

28062806
add_test(NAME pycbf-fel2-cmp
2807-
COMMAND ${CMAKE_COMMAND} -E compare_files
2807+
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol
28082808
"${data_output}/fel_test2_orig.out"
28092809
"${CBF__DATA}/fel_test2.out")
28102810
set_tests_properties(pycbf-fel2-cmp PROPERTIES
@@ -2843,7 +2843,7 @@ if(CBF_ENABLE_PYTHON)
28432843
FIXTURES_CLEANUP pycbf-fel3-standardize-numbers)
28442844

28452845
add_test(NAME pycbf-fel3-cmp
2846-
COMMAND ${CMAKE_COMMAND} -E compare_files
2846+
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol
28472847
"${data_output}/fel_test3_orig.out"
28482848
"${CBF__DATA}/fel_test3.out")
28492849
set_tests_properties(pycbf-fel3-cmp PROPERTIES

0 commit comments

Comments
 (0)