diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-09-26 20:46:55 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-26 20:46:55 (GMT) |
| commit | 1529ec0ab3a348e17aab0e0ec97bb80adc4decc2 (patch) | |
| tree | 5ec9e4feb2bf7888b9db7b8b28c6bc135dab3b16 /tools/test/h5import | |
| parent | a87ca572fed15303ad36adcb6f2203f8297e8277 (diff) | |
| download | hdf5-1529ec0ab3a348e17aab0e0ec97bb80adc4decc2.zip hdf5-1529ec0ab3a348e17aab0e0ec97bb80adc4decc2.tar.gz hdf5-1529ec0ab3a348e17aab0e0ec97bb80adc4decc2.tar.bz2 | |
Develop tools move (#3580)
Reorganizes the tools files to support the VOL tests
Diffstat (limited to 'tools/test/h5import')
| -rw-r--r-- | tools/test/h5import/CMakeTests.cmake | 14 | ||||
| -rw-r--r-- | tools/test/h5import/h5importtestutil.sh.in | 9 |
2 files changed, 14 insertions, 9 deletions
diff --git a/tools/test/h5import/CMakeTests.cmake b/tools/test/h5import/CMakeTests.cmake index 7506116..c3bbd79 100644 --- a/tools/test/h5import/CMakeTests.cmake +++ b/tools/test/h5import/CMakeTests.cmake @@ -45,6 +45,8 @@ dbinuin16.h5.txt dbinuin32.h5.txt dtxtstr.h5.txt + ) + set (HDF5_REFERENCE_DDL_FILES tall_fp32.ddl tall_i32.ddl tintsattrs_u32.ddl @@ -74,19 +76,23 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") foreach (conf_file ${HDF5_REFERENCE_CONF_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${conf_file}" "${PROJECT_BINARY_DIR}/testfiles/${conf_file}" "h5import_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${conf_file}" "${PROJECT_BINARY_DIR}/testfiles/${conf_file}" "h5import_files") endforeach () foreach (txt_file ${HDF5_REFERENCE_TXT_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files") + endforeach () + + foreach (txt_file ${HDF5_REFERENCE_DDL_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files") endforeach () foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files") endforeach () foreach (h5_file ${HDF5_TOOLS_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files") endforeach () add_custom_target(h5import_files ALL COMMENT "Copying files needed by h5import tests" DEPENDS ${h5import_files_list}) diff --git a/tools/test/h5import/h5importtestutil.sh.in b/tools/test/h5import/h5importtestutil.sh.in index ba91ee5..65b899f 100644 --- a/tools/test/h5import/h5importtestutil.sh.in +++ b/tools/test/h5import/h5importtestutil.sh.in @@ -41,11 +41,10 @@ nerrors=0 # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" @@ -82,8 +81,8 @@ $SRC_H5IMPORT_TESTFILES/txtuin16.h5 $SRC_H5IMPORT_TESTFILES/txtuin32.h5 $SRC_H5IMPORT_TESTFILES/txtstr.h5 $SRC_H5IMPORT_TESTFILES/textpfe.h5 -$SRC_TOOLS_TESTFILES/tall.h5 -$SRC_TOOLS_TESTFILES/tintsattrs.h5 +$SRC_H5DUMP_TESTFILES/tall.h5 +$SRC_H5DUMP_TESTFILES/tintsattrs.h5 " LIST_OTHER_TEST_FILES=" |