From 39c6d87dee01fa6ca9a99becfef61d8b77bfeb43 Mon Sep 17 00:00:00 2001 From: jhendersonHDF Date: Mon, 23 Jun 2025 07:35:54 -0500 Subject: [PATCH] Fix tools testfile URLs for subfiling tests (#5621) --- tools/test/h5dump/CMakeVFDTests.cmake | 14 +++++++------- ...t_subfiling_precreate_rank_0.h5.subfile.config | 0 ...t_subfiling_precreate_rank_0.h5.subfile_1_of_2 | Bin ...t_subfiling_precreate_rank_0.h5.subfile_2_of_2 | Bin .../test_subfiling_stripe_sizes.h5.subfile.config | 0 .../test_subfiling_stripe_sizes.h5.subfile_1_of_1 | Bin 6 files changed, 7 insertions(+), 7 deletions(-) rename tools/test/{h5dump => }/testfiles/test_subfiling_precreate_rank_0.h5.subfile.config (100%) rename tools/test/{h5dump => }/testfiles/test_subfiling_precreate_rank_0.h5.subfile_1_of_2 (100%) rename tools/test/{h5dump => }/testfiles/test_subfiling_precreate_rank_0.h5.subfile_2_of_2 (100%) rename tools/test/{h5dump => }/testfiles/test_subfiling_stripe_sizes.h5.subfile.config (100%) rename tools/test/{h5dump => }/testfiles/test_subfiling_stripe_sizes.h5.subfile_1_of_1 (100%) diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake index 0be228bcf2a..2fb96ee00f5 100644 --- a/tools/test/h5dump/CMakeVFDTests.cmake +++ b/tools/test/h5dump/CMakeVFDTests.cmake @@ -35,7 +35,7 @@ set (HDF5_SF2_VFD_H5DUMP_FILES foreach (vfdtest ${VFD_LIST}) if (vfdtest STREQUAL "subfiling") foreach (h5_tfile ${HDF5_SF_VFD_H5DUMP_FILES}) - file(COPY "${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tfile}" DESTINATION "${PROJECT_BINARY_DIR}/${vfdtest}") + file(COPY "${HDF5_TOOLS_TST_DIR}/testfiles/${h5_tfile}" DESTINATION "${PROJECT_BINARY_DIR}/${vfdtest}") execute_process( COMMAND ls -i ${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile} OUTPUT_VARIABLE OUTPUT_VALUE @@ -43,11 +43,11 @@ foreach (vfdtest ${VFD_LIST}) ) string(REGEX MATCH "^ *([0-9]+) *" INODE_VALUE "${OUTPUT_VALUE}") string(STRIP ${INODE_VALUE} INODE_STR) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tfile}.subfile_1_of_1" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.subfile_${INODE_STR}_1_of_1" "HDF5_SF_VFD_H5DUMP_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tfile}.subfile.config" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.subfile_${INODE_STR}.config" "HDF5_SF_VFD_H5DUMP_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_tfile}.subfile_1_of_1" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.subfile_${INODE_STR}_1_of_1" "HDF5_SF_VFD_H5DUMP_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_tfile}.subfile.config" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.subfile_${INODE_STR}.config" "HDF5_SF_VFD_H5DUMP_files") endforeach () foreach (h5_tfile ${HDF5_SF2_VFD_H5DUMP_FILES}) - file(COPY "${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tfile}" DESTINATION "${PROJECT_BINARY_DIR}/${vfdtest}") + file(COPY "${HDF5_TOOLS_TST_DIR}/testfiles/${h5_tfile}" DESTINATION "${PROJECT_BINARY_DIR}/${vfdtest}") execute_process( COMMAND ls -i ${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile} OUTPUT_VARIABLE OUTPUT_VALUE @@ -55,9 +55,9 @@ foreach (vfdtest ${VFD_LIST}) ) string(REGEX MATCH "^ *([0-9]+) *" INODE_VALUE "${OUTPUT_VALUE}") string(STRIP ${INODE_VALUE} INODE_STR) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tfile}.subfile_1_of_2" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.subfile_${INODE_STR}_1_of_2" "HDF5_SF2_VFD_H5DUMP_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tfile}.subfile_2_of_2" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.subfile_${INODE_STR}_2_of_2" "HDF5_SF2_VFD_H5DUMP_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tfile}.subfile.config" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.subfile_${INODE_STR}.config" "HDF5_SF2_VFD_H5DUMP_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_tfile}.subfile_1_of_2" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.subfile_${INODE_STR}_1_of_2" "HDF5_SF2_VFD_H5DUMP_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_tfile}.subfile_2_of_2" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.subfile_${INODE_STR}_2_of_2" "HDF5_SF2_VFD_H5DUMP_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_tfile}.subfile.config" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.subfile_${INODE_STR}.config" "HDF5_SF2_VFD_H5DUMP_files") endforeach () endif () foreach (h5_tfile ${HDF5_VFD_H5DUMP_FILES}) diff --git a/tools/test/h5dump/testfiles/test_subfiling_precreate_rank_0.h5.subfile.config b/tools/test/testfiles/test_subfiling_precreate_rank_0.h5.subfile.config similarity index 100% rename from tools/test/h5dump/testfiles/test_subfiling_precreate_rank_0.h5.subfile.config rename to tools/test/testfiles/test_subfiling_precreate_rank_0.h5.subfile.config diff --git a/tools/test/h5dump/testfiles/test_subfiling_precreate_rank_0.h5.subfile_1_of_2 b/tools/test/testfiles/test_subfiling_precreate_rank_0.h5.subfile_1_of_2 similarity index 100% rename from tools/test/h5dump/testfiles/test_subfiling_precreate_rank_0.h5.subfile_1_of_2 rename to tools/test/testfiles/test_subfiling_precreate_rank_0.h5.subfile_1_of_2 diff --git a/tools/test/h5dump/testfiles/test_subfiling_precreate_rank_0.h5.subfile_2_of_2 b/tools/test/testfiles/test_subfiling_precreate_rank_0.h5.subfile_2_of_2 similarity index 100% rename from tools/test/h5dump/testfiles/test_subfiling_precreate_rank_0.h5.subfile_2_of_2 rename to tools/test/testfiles/test_subfiling_precreate_rank_0.h5.subfile_2_of_2 diff --git a/tools/test/h5dump/testfiles/test_subfiling_stripe_sizes.h5.subfile.config b/tools/test/testfiles/test_subfiling_stripe_sizes.h5.subfile.config similarity index 100% rename from tools/test/h5dump/testfiles/test_subfiling_stripe_sizes.h5.subfile.config rename to tools/test/testfiles/test_subfiling_stripe_sizes.h5.subfile.config diff --git a/tools/test/h5dump/testfiles/test_subfiling_stripe_sizes.h5.subfile_1_of_1 b/tools/test/testfiles/test_subfiling_stripe_sizes.h5.subfile_1_of_1 similarity index 100% rename from tools/test/h5dump/testfiles/test_subfiling_stripe_sizes.h5.subfile_1_of_1 rename to tools/test/testfiles/test_subfiling_stripe_sizes.h5.subfile_1_of_1