mirrors/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2026-09-25 04:09:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Correct filtered test file cleanup paths (#5562)

Browse Source
This commit is contained in:
Matt L
2025-06-04 12:56:46 -05:00
committed by GitHub
parent 029bca0540
commit 17c16b659a
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HDF5Examples/config/cmake/runExecute.cmake
-6
View File
@@ -11,12 +11,6 @@
#
# runExecute.cmake executes a command included by runTest.cmake.
set(TEST_OUTPUT_FILTERED "${TEST_OUTPUT}_filtered")
set(TEST_REFERENCE_FILTERED "${TEST_REFERENCE}_filtered")
set(TEST_ERR_FILTERED "${TEST_OUTPUT}.err_filtered")
set(TEST_ERRREF_FILTERED "${TEST_ERRREF}_filtered")
macro(FILTER_FILE filename filters filters_replace)
# avoid modifying external variables
set(filename_int "${filename}")
HDF5Examples/config/cmake/runTest.cmake
+14 -8
View File
@@ -14,6 +14,12 @@
cmake_policy(SET CMP0007 NEW)
cmake_policy(SET CMP0053 NEW)
set(TEST_OUTPUT_FILTERED "${TEST_OUTPUT}_filtered")
set(TEST_REFERENCE_FILTERED "${TEST_REFERENCE}_filtered")
set(TEST_ERR_FILTERED "${TEST_OUTPUT}.err_filtered")
set(TEST_ERRREF_FILTERED "${TEST_ERRREF}_filtered")
# arguments checking
if (NOT TEST_PROGRAM)
message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
@@ -90,20 +96,20 @@ if (NOT DEFINED ENV{HDF5_NOCLEANUP})
file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
endif ()
if (EXISTS "${FILTERED_OUTPUT}")
file (REMOVE ${FILTERED_OUTPUT})
if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT_FILTERED}")
file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT_FILTERED})
endif ()
if (EXISTS "${FILTERED_REFERENCE}")
file (REMOVE ${FILTERED_REFERENCE})
if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE_FILTERED}")
file (REMOVE ${TEST_FOLDER}/${TEST_REFERENCE_FILTERED})
endif ()
if (EXISTS "${FILTERED_ERR}")
file (REMOVE ${FILTERED_ERR})
if (EXISTS "${TEST_FOLDER}/${TEST_ERR_FILTERED}")
file (REMOVE ${TEST_FOLDER}/${TEST_ERR_FILTERED})
endif ()
if (EXISTS "${FILTERED_ERRREF}")
file (REMOVE ${FILTERED_ERRREF})
if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF_FILTERED}")
file (REMOVE ${TEST_FOLDER}/${TEST_ERRREF_FILTERED})
endif ()
if (TEST_DELETE_LIST)
config/cmake/runExecute.cmake
-6
View File
@@ -11,12 +11,6 @@
#
# runExecute.cmake executes a command included by runTest.cmake.
set(TEST_OUTPUT_FILTERED "${TEST_OUTPUT}_filtered")
set(TEST_REFERENCE_FILTERED "${TEST_REFERENCE}_filtered")
set(TEST_ERR_FILTERED "${TEST_OUTPUT}.err_filtered")
set(TEST_ERRREF_FILTERED "${TEST_ERRREF}_filtered")
macro(FILTER_FILE filename filters filters_replace)
# avoid modifying external variables
set(filename_int "${filename}")
config/cmake/runTest.cmake
+14 -8
View File
@@ -14,6 +14,12 @@
cmake_policy(SET CMP0007 NEW)
cmake_policy(SET CMP0053 NEW)
set(TEST_OUTPUT_FILTERED "${TEST_OUTPUT}_filtered")
set(TEST_REFERENCE_FILTERED "${TEST_REFERENCE}_filtered")
set(TEST_ERR_FILTERED "${TEST_OUTPUT}.err_filtered")
set(TEST_ERRREF_FILTERED "${TEST_ERRREF}_filtered")
# arguments checking
if (NOT TEST_PROGRAM)
message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
@@ -90,20 +96,20 @@ if (NOT DEFINED ENV{HDF5_NOCLEANUP})
file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
endif ()
if (EXISTS "${FILTERED_OUTPUT}")
file (REMOVE ${FILTERED_OUTPUT})
if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT_FILTERED}")
file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT_FILTERED})
endif ()
if (EXISTS "${FILTERED_REFERENCE}")
file (REMOVE ${FILTERED_REFERENCE})
if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE_FILTERED}")
file (REMOVE ${TEST_FOLDER}/${TEST_REFERENCE_FILTERED})
endif ()
if (EXISTS "${FILTERED_ERR}")
file (REMOVE ${FILTERED_ERR})
if (EXISTS "${TEST_FOLDER}/${TEST_ERR_FILTERED}")
file (REMOVE ${TEST_FOLDER}/${TEST_ERR_FILTERED})
endif ()
if (EXISTS "${FILTERED_ERRREF}")
file (REMOVE ${FILTERED_ERRREF})
if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF_FILTERED}")
file (REMOVE ${TEST_FOLDER}/${TEST_ERRREF_FILTERED})
endif ()
if (TEST_DELETE_LIST)