From d47f41ea137097f8c30e96cc94903ec074c53bc6 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:21:38 -0500
Subject: [PATCH] Use variable for ignore-eol usage. (#3592)

* Add last_test depends properties
---
 tools/test/h5dump/CMakeTests.cmake    | 8 ++++----
 tools/test/misc/CMakeTestsClear.cmake | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index 7ce8f435947..5080c51b8fe 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -553,7 +553,7 @@
       )
       add_test (
           NAME H5DUMP-${resultfile}-output-cmp
-          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
+          COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${resultfile}.txt ${resultfile}.exp
       )
       set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES
           DEPENDS H5DUMP-${resultfile}
@@ -618,7 +618,7 @@
       )
       add_test (
           NAME H5DUMP-${resultfile}-output-cmp
-          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
+          COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${resultfile}.txt ${resultfile}.exp
       )
       set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES
           DEPENDS H5DUMP-${resultfile}
@@ -626,7 +626,7 @@
       )
       add_test (
           NAME H5DUMP-${resultfile}-output-cmp-ddl
-          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${ddlfile}.txt ${ddlfile}.exp
+          COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${ddlfile}.txt ${ddlfile}.exp
       )
       set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES
           DEPENDS H5DUMP-${resultfile}-output-cmp
@@ -672,7 +672,7 @@
       )
       add_test (
           NAME H5DUMP-output-cmp-${resultfile}
-          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
+          COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${resultfile}.txt ${resultfile}.exp
       )
       set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES
           DEPENDS H5DUMP-output-${resultfile}
diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake
index 5e307aa3fcc..a5549724cf4 100644
--- a/tools/test/misc/CMakeTestsClear.cmake
+++ b/tools/test/misc/CMakeTestsClear.cmake
@@ -99,6 +99,10 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_DIR}/runTest.cmake"
       )
+      if (last_test)
+        set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
+      set (last_test "H5CLEAR_CMP-${testname}")
     endif ()
   endmacro ()
 
@@ -117,6 +121,10 @@
               -D "TEST_ERRREF=${resultfile}.err"
               -P "${HDF_RESOURCES_DIR}/runTest.cmake"
       )
+      if (last_test)
+        set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
+      set (last_test "H5CLEAR_CMP-${testname}")
     endif ()
   endmacro ()