summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2023-09-26 03:16:43 (GMT)
committerGitHub <noreply@github.com>2023-09-26 03:16:43 (GMT)
commit55565382d2a6ae444ec5bc039f83b6b3bfb6730c (patch)
treef953dc573aa5354e28be862a8810cebcc6a0c3b6 /tools
parent54188a2f320f95900c3612860438280aaddc7204 (diff)
downloadhdf5-hdf5-1_10_11.zip
hdf5-hdf5-1_10_11.tar.gz
hdf5-hdf5-1_10_11.tar.bz2
Create 11011 tarball (#3596)hdf5-1_10_11hdf5_1_10_11
* Use variable for ignore-eol usage. (#3592) * Add last_test depends properties * Just print status on CMake below 3.14 (#3595) * updated bin/release to fix CMake tar.gz and zip files for saip and zlib. Removed the use of -commons linking option on Darwin as COMMON and EQUIVALENCE are no long used. Release of HDF5 1.10.11. --------- Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/test/h5dump/CMakeTests.cmake8
-rw-r--r--tools/test/misc/CMakeTestsClear.cmake8
2 files changed, 12 insertions, 4 deletions
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index 7ce8f43..5080c51 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 5e307aa..a554972 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 ()