Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use variable for ignore-eol usage. #3592

Merged
merged 2 commits into from
Sep 25, 2023
Merged

Use variable for ignore-eol usage. #3592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87a188c
Use variable for ignore-eol usage.
byrnHDF Sep 25, 2023
7849c0b
Add last_test depends properties
byrnHDF Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/test/h5dump/CMakeTests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -618,15 +618,15 @@
)
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}
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
)
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
Expand Down Expand Up @@ -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}
Expand Down
8 changes: 8 additions & 0 deletions tools/test/misc/CMakeTestsClear.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()

Expand All @@ -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 ()

Expand Down