Skip to content

refactor run scripts to a single macros with includes #5538

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

Merged
merged 17 commits into from
May 24, 2025
Merged

refactor run scripts to a single macros with includes #5538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
08495c5
Refactor the CMake scripts into a single script
byrnHDF May 15, 2025
21e011a
Refactor out grepTest
byrnHDF May 15, 2025
9728b52
Merge branch 'HDFGroup:develop' into develop-refactor-run-scripts
byrnHDF May 15, 2025
de794cf
Add values for TEST_EXPECT
byrnHDF May 16, 2025
0258dbd
Update examples script
byrnHDF May 20, 2025
4854179
Remove reference to invalid matrix variable
byrnHDF May 20, 2025
f8c1738
Skip CI example tests issues
byrnHDF May 20, 2025
92208f8
Correct missing semicolon
byrnHDF May 21, 2025
14a200a
Remove extra newline
byrnHDF May 21, 2025
395ace8
Fix examples script
byrnHDF May 21, 2025
04ca44b
Merge branch 'HDFGroup:develop' into develop-refactor-run-scripts
byrnHDF May 21, 2025
3e95ddb
Update some failing tests due to not using options
byrnHDF May 21, 2025
e3d0d51
Adjust args to do grep testing
byrnHDF May 22, 2025
9491206
Merge branch 'HDFGroup:develop' into develop-refactor-run-scripts
byrnHDF May 22, 2025
55d0fe3
Correct script grep usage and options
byrnHDF May 22, 2025
1e3daf0
remove debug message
byrnHDF May 22, 2025
a1d6004
Merge develop changes
byrnHDF May 22, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/aocc-cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@ jobs:
- name: CMake Run Parallel Tests
shell: bash
run: |
ctest . -R MPI_TEST -C ${{ inputs.build_mode }} -V
ctest . -R MPI_TEST -E "_by_chunk|_by_pattern" -C ${{ inputs.build_mode }} -V
working-directory: ${{ runner.workspace }}/build
2 changes: 1 addition & 1 deletion .github/workflows/main-cmake-par-spc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- name: CMake Run Tests
run: ctest . -E MPI_TEST --parallel 2 -C ${{ inputs.build_mode }} -V
working-directory: ${{ runner.workspace }}/build
if: ${{ matrix.run_tests && (inputs.thread_safety != 'TS') }}
if: ${{ inputs.thread_safety != 'TS' }}

- name: CMake Run Parallel Tests
run: ctest . -R MPI_TEST -C ${{ inputs.build_mode }} -V
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main-cmake-par.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ jobs:
- name: CMake Run Tests
run: ctest . -E MPI_TEST --parallel 2 -C ${{ inputs.build_mode }} -V
working-directory: ${{ runner.workspace }}/build
if: ${{ matrix.run_tests && (inputs.thread_safety != 'TS') }}
if: ${{ inputs.thread_safety != 'TS' }}

- name: CMake Run Parallel Tests
run: ctest . -R MPI_TEST -C ${{ inputs.build_mode }} -V
run: ctest . -R MPI_TEST -E "_by_chunk|_by_pattern" -C ${{ inputs.build_mode }} -V
working-directory: ${{ runner.workspace }}/build
if: ${{ matrix.run_tests && (inputs.thread_safety != 'TS') }}
if: ${{ inputs.thread_safety != 'TS' }}
2 changes: 1 addition & 1 deletion .github/workflows/nvhpc-cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,5 @@ jobs:
- name: CMake Run Parallel Tests
shell: bash
run: |
ctest . -R MPI_TEST -C ${{ inputs.build_mode }} -V
ctest . -R MPI_TEST -E "_by_chunk|_by_pattern" -C ${{ inputs.build_mode }} -V
working-directory: ${{ runner.workspace }}/build
2 changes: 1 addition & 1 deletion HDF5Examples/C/H5FLT/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ if (H5EX_BUILD_TESTING)
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-D "TEST_OUTPUT=${testname}.ddl.out"
-D "TEST_FILTER=PARAMS { ([0-9]) [-]?[0-9]+ ([0-9] [0-9] [0-9] [0-9] [0-9] [0-9]) }\n"
-D "TEST_FILTER_REPLACE=PARAMS { \\1 XXXX \\2 }\n"
-D "TEST_FILTER_REPLACE=PARAMS { \\\\1 XXXX \\\\2 }\n"
-D "TEST_EXPECT=0"
-D "TEST_REFERENCE=${testname}.ddl"
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
Expand Down
3 changes: 2 additions & 1 deletion HDF5Examples/C/H5PAR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ if (H5EX_BUILD_TESTING)
-D "TEST_EXPECT=0"
-D "TEST_SKIP_COMPARE=TRUE"
-D "TEST_OUTPUT=${testname}.out"
-D "TEST_GREP_COMPARE=TRUE"
-D "TEST_REFERENCE:STRING=PHDF5 example finished with no errors"
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
-P "${H5EX_RESOURCES_DIR}/grepTest.cmake"
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
)
set_tests_properties (MPI_TEST_${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall)
set (last_test "MPI_TEST_${EXAMPLE_VARNAME}_${testname}")
Expand Down
3 changes: 2 additions & 1 deletion HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ if (H5EX_BUILD_TESTING)
-D "TEST_EXPECT=0"
-D "TEST_SKIP_COMPARE=TRUE"
-D "TEST_OUTPUT=${testname}.out"
-D "TEST_GREP_COMPARE=TRUE"
-D "TEST_REFERENCE:STRING=PHDF5 example finished with no errors"
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
-P "${H5EX_RESOURCES_DIR}/grepTest.cmake"
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
)
set_tests_properties (MPI_TEST_${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS MPI_TEST_${EXAMPLE_VARNAME}_f90_${testname}-clearall)
add_test (
Expand Down
4 changes: 2 additions & 2 deletions HDF5Examples/JAVA/H5D/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if (H5EX_BUILD_TESTING)
add_test (
NAME ${EXAMPLE_VARNAME}_jnative-h5-${resultfile}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
-D "TEST_JAVA=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
-D "TEST_PROGRAM=${resultfile}"
-D "TEST_ARGS:STRING=${ARGN};${CMD_ARGS}"
-D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${EXAMPLE_VARNAME}J_${resultfile}_JAR_FILE}"
Expand All @@ -61,7 +61,7 @@ if (H5EX_BUILD_TESTING)
-D "TEST_REFERENCE=${resultfile}.txt"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_SKIP_COMPARE=TRUE"
-P "${H5EX_RESOURCES_DIR}/jrunTest.cmake"
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${resultfile} PROPERTIES DEPENDS ${last_test})
Expand Down
4 changes: 2 additions & 2 deletions HDF5Examples/JAVA/H5G/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if (H5EX_BUILD_TESTING)
add_test (
NAME ${EXAMPLE_VARNAME}_jnative-h5-${resultfile}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
-D "TEST_JAVA=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
-D "TEST_PROGRAM=${resultfile}"
-D "TEST_ARGS:STRING=${ARGN};${CMD_ARGS}"
-D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${EXAMPLE_VARNAME}J_${resultfile}_JAR_FILE}"
Expand All @@ -61,7 +61,7 @@ if (H5EX_BUILD_TESTING)
-D "TEST_REFERENCE=${resultfile}.txt"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_SKIP_COMPARE=TRUE"
-P "${H5EX_RESOURCES_DIR}/jrunTest.cmake"
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${resultfile} PROPERTIES DEPENDS ${last_test})
Expand Down
4 changes: 2 additions & 2 deletions HDF5Examples/JAVA/H5T/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if (H5EX_BUILD_TESTING)
add_test (
NAME ${EXAMPLE_VARNAME}_jnative-h5-${resultfile}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
-D "TEST_JAVA=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
-D "TEST_PROGRAM=${resultfile}"
-D "TEST_ARGS:STRING=${ARGN};${CMD_ARGS}"
-D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${EXAMPLE_VARNAME}J_${resultfile}_JAR_FILE}"
Expand All @@ -61,7 +61,7 @@ if (H5EX_BUILD_TESTING)
-D "TEST_REFERENCE=${resultfile}.txt"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_SKIP_COMPARE=TRUE"
-P "${H5EX_RESOURCES_DIR}/jrunTest.cmake"
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${resultfile} PROPERTIES DEPENDS ${last_test})
Expand Down
4 changes: 2 additions & 2 deletions HDF5Examples/JAVA/TUTR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if (H5EX_BUILD_TESTING)
add_test (
NAME ${EXAMPLE_VARNAME}_jnative-h5-${resultfile}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
-D "TEST_JAVA=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
-D "TEST_PROGRAM=${resultfile}"
-D "TEST_ARGS:STRING=${ARGN};${CMD_ARGS}"
-D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${EXAMPLE_VARNAME}J_${resultfile}_JAR_FILE}"
Expand All @@ -61,7 +61,7 @@ if (H5EX_BUILD_TESTING)
-D "TEST_REFERENCE=${resultfile}.txt"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_SKIP_COMPARE=TRUE"
-P "${H5EX_RESOURCES_DIR}/jrunTest.cmake"
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${resultfile} PROPERTIES DEPENDS ${last_test})
Expand Down
251 changes: 0 additions & 251 deletions HDF5Examples/config/cmake/grepTest.cmake
View file
Open in desktop

This file was deleted.

Loading
Loading