diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 070f26f0b92..51c9c83958d 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -394,7 +394,11 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${HDF5_PACKAGE_URL}") set(CPACK_WIX_PROPERTY_ARPHELPLINK "${HDF5_PACKAGE_BUGREPORT}") if (BUILD_SHARED_LIBS) - set (WIX_CMP_NAME "${HDF5_LIB_NAME}${CMAKE_DEBUG_POSTFIX}") + if (${HDF_CFG_NAME} MATCHES "Debug" OR ${HDF_CFG_NAME} MATCHES "Developer") + set (WIX_CMP_NAME "${HDF5_LIB_NAME}${CMAKE_DEBUG_POSTFIX}") + else () + set (WIX_CMP_NAME "${HDF5_LIB_NAME}") + endif () configure_file (${HDF_RESOURCES_DIR}/patch.xml.in ${HDF5_BINARY_DIR}/patch.xml @ONLY) set(CPACK_WIX_PATCH_FILE "${HDF5_BINARY_DIR}/patch.xml") endif () diff --git a/CMakeLists.txt b/CMakeLists.txt index 788ca57916f..da6a4d1fa8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,6 +222,7 @@ set (HDF5_HL_CPP_SRC_DIR ${HDF5_SOURCE_DIR}/hl/c++) set (HDF5_HL_TOOLS_DIR ${HDF5_SOURCE_DIR}/hl/tools) set (HDF5_TOOLS_DIR ${HDF5_SOURCE_DIR}/tools) set (HDF5_TOOLS_SRC_DIR ${HDF5_SOURCE_DIR}/tools/src) +set (HDF5_TOOLS_TST_DIR ${HDF5_SOURCE_DIR}/tools/test) set (HDF5_PERFORM_SRC_DIR ${HDF5_SOURCE_DIR}/tools/src/perform) set (HDF5_UTILS_DIR ${HDF5_SOURCE_DIR}/utils) set (HDF5_F90_SRC_DIR ${HDF5_SOURCE_DIR}/fortran) diff --git a/config/cmake/fileCompareTest.cmake b/config/cmake/fileCompareTest.cmake index 18a29d913fa..5cd56ee06e1 100644 --- a/config/cmake/fileCompareTest.cmake +++ b/config/cmake/fileCompareTest.cmake @@ -66,7 +66,7 @@ else () endif () elseif (TEST_FUNCTION MATCHES "LTEQ") if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE) - message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}") + message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}") else () message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}") endif () diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake index 9d3ff0c2221..781ed143219 100644 --- a/hl/test/CMakeTests.cmake +++ b/hl/test/CMakeTests.cmake @@ -41,7 +41,7 @@ set (HL_REFERENCE_TEST_FILES #-- Copy the necessary files. # -------------------------------------------------------------------- foreach (h5_file ${HL_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_HL_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_HL_TEST_BINARY_DIR}/${h5_file}" "hl_test_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${HDF5_HL_TEST_BINARY_DIR}/testfiles/${h5_file}" "hl_test_files") endforeach () add_custom_target(hl_test_files ALL COMMENT "Copying files needed by hl_test tests" DEPENDS ${hl_test_files_list}) diff --git a/hl/test/dsdata.txt b/hl/test/testfiles/dsdata.txt similarity index 100% rename from hl/test/dsdata.txt rename to hl/test/testfiles/dsdata.txt diff --git a/hl/test/dslat.txt b/hl/test/testfiles/dslat.txt similarity index 100% rename from hl/test/dslat.txt rename to hl/test/testfiles/dslat.txt diff --git a/hl/test/dslon.txt b/hl/test/testfiles/dslon.txt similarity index 100% rename from hl/test/dslon.txt rename to hl/test/testfiles/dslon.txt diff --git a/hl/test/dtype_file.txt b/hl/test/testfiles/dtype_file.txt similarity index 100% rename from hl/test/dtype_file.txt rename to hl/test/testfiles/dtype_file.txt diff --git a/hl/test/dtype_file_readable.txt b/hl/test/testfiles/dtype_file_readable.txt similarity index 100% rename from hl/test/dtype_file_readable.txt rename to hl/test/testfiles/dtype_file_readable.txt diff --git a/hl/test/earth.pal b/hl/test/testfiles/earth.pal similarity index 100% rename from hl/test/earth.pal rename to hl/test/testfiles/earth.pal diff --git a/hl/test/image24pixel.txt b/hl/test/testfiles/image24pixel.txt similarity index 100% rename from hl/test/image24pixel.txt rename to hl/test/testfiles/image24pixel.txt diff --git a/hl/test/image24plane.txt b/hl/test/testfiles/image24plane.txt similarity index 100% rename from hl/test/image24plane.txt rename to hl/test/testfiles/image24plane.txt diff --git a/hl/test/image8.txt b/hl/test/testfiles/image8.txt similarity index 100% rename from hl/test/image8.txt rename to hl/test/testfiles/image8.txt diff --git a/hl/test/sepia.pal b/hl/test/testfiles/sepia.pal similarity index 100% rename from hl/test/sepia.pal rename to hl/test/testfiles/sepia.pal diff --git a/hl/test/test_ds_be.h5 b/hl/test/testfiles/test_ds_be.h5 similarity index 100% rename from hl/test/test_ds_be.h5 rename to hl/test/testfiles/test_ds_be.h5 diff --git a/hl/test/test_ds_be_new_ref-32bit.h5 b/hl/test/testfiles/test_ds_be_new_ref-32bit.h5 similarity index 100% rename from hl/test/test_ds_be_new_ref-32bit.h5 rename to hl/test/testfiles/test_ds_be_new_ref-32bit.h5 diff --git a/hl/test/test_ds_be_new_ref.h5 b/hl/test/testfiles/test_ds_be_new_ref.h5 similarity index 100% rename from hl/test/test_ds_be_new_ref.h5 rename to hl/test/testfiles/test_ds_be_new_ref.h5 diff --git a/hl/test/test_ds_le.h5 b/hl/test/testfiles/test_ds_le.h5 similarity index 100% rename from hl/test/test_ds_le.h5 rename to hl/test/testfiles/test_ds_le.h5 diff --git a/hl/test/test_ds_le_new_ref.h5 b/hl/test/testfiles/test_ds_le_new_ref.h5 similarity index 100% rename from hl/test/test_ds_le_new_ref.h5 rename to hl/test/testfiles/test_ds_le_new_ref.h5 diff --git a/hl/test/test_ld.h5 b/hl/test/testfiles/test_ld.h5 similarity index 100% rename from hl/test/test_ld.h5 rename to hl/test/testfiles/test_ld.h5 diff --git a/hl/test/test_table_be.h5 b/hl/test/testfiles/test_table_be.h5 similarity index 100% rename from hl/test/test_table_be.h5 rename to hl/test/testfiles/test_table_be.h5 diff --git a/hl/test/test_table_cray.h5 b/hl/test/testfiles/test_table_cray.h5 similarity index 100% rename from hl/test/test_table_cray.h5 rename to hl/test/testfiles/test_table_cray.h5 diff --git a/hl/test/test_table_le.h5 b/hl/test/testfiles/test_table_le.h5 similarity index 100% rename from hl/test/test_table_le.h5 rename to hl/test/testfiles/test_table_le.h5 diff --git a/hl/test/usa.wri b/hl/test/testfiles/usa.wri similarity index 100% rename from hl/test/usa.wri rename to hl/test/testfiles/usa.wri diff --git a/hl/tools/gif2h5/CMakeTests.cmake b/hl/tools/gif2h5/CMakeTests.cmake index b2a8e27f26f..dd0ccc456a2 100644 --- a/hl/tools/gif2h5/CMakeTests.cmake +++ b/hl/tools/gif2h5/CMakeTests.cmake @@ -22,9 +22,9 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") # # copy test files from source to build dir # -HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/image1.gif" "${PROJECT_BINARY_DIR}/testfiles/image1.gif" "gif2h5_files") -HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/h52giftst.h5" "${PROJECT_BINARY_DIR}/testfiles/h52giftst.h5" "gif2h5_files") -HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/ex_image2.h5" "${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5" "gif2h5_files") +HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/image1.gif" "${PROJECT_BINARY_DIR}/testfiles/image1.gif" "gif2h5_files") +HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/h52giftst.h5" "${PROJECT_BINARY_DIR}/testfiles/h52giftst.h5" "gif2h5_files") +HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/ex_image2.h5" "${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5" "gif2h5_files") add_custom_target(gif2h5_files ALL COMMENT "Copying files needed by gif2h5 tests" DEPENDS ${gif2h5_files_list}) # Remove any output file left over from previous test run diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake index a7828b30fa6..7c1a7f56374 100644 --- a/hl/tools/h5watch/CMakeTests.cmake +++ b/hl/tools/h5watch/CMakeTests.cmake @@ -58,7 +58,7 @@ set (H5WATCH_TEST_FILES file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") foreach (h5watch_file ${H5WATCH_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files") endforeach () add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tests" DEPENDS ${H5WATCH_files_list}) diff --git a/hl/tools/testfiles/w-err-cmpd1.err b/hl/tools/h5watch/testfiles/w-err-cmpd1.err similarity index 100% rename from hl/tools/testfiles/w-err-cmpd1.err rename to hl/tools/h5watch/testfiles/w-err-cmpd1.err diff --git a/hl/tools/testfiles/w-err-cmpd2.err b/hl/tools/h5watch/testfiles/w-err-cmpd2.err similarity index 100% rename from hl/tools/testfiles/w-err-cmpd2.err rename to hl/tools/h5watch/testfiles/w-err-cmpd2.err diff --git a/hl/tools/testfiles/w-err-cmpd3.err b/hl/tools/h5watch/testfiles/w-err-cmpd3.err similarity index 100% rename from hl/tools/testfiles/w-err-cmpd3.err rename to hl/tools/h5watch/testfiles/w-err-cmpd3.err diff --git a/hl/tools/testfiles/w-err-cmpd4.err b/hl/tools/h5watch/testfiles/w-err-cmpd4.err similarity index 100% rename from hl/tools/testfiles/w-err-cmpd4.err rename to hl/tools/h5watch/testfiles/w-err-cmpd4.err diff --git a/hl/tools/testfiles/w-err-cmpd5.err b/hl/tools/h5watch/testfiles/w-err-cmpd5.err similarity index 100% rename from hl/tools/testfiles/w-err-cmpd5.err rename to hl/tools/h5watch/testfiles/w-err-cmpd5.err diff --git a/hl/tools/testfiles/w-err-dset-nomax.err b/hl/tools/h5watch/testfiles/w-err-dset-nomax.err similarity index 100% rename from hl/tools/testfiles/w-err-dset-nomax.err rename to hl/tools/h5watch/testfiles/w-err-dset-nomax.err diff --git a/hl/tools/testfiles/w-err-dset-none.err b/hl/tools/h5watch/testfiles/w-err-dset-none.err similarity index 100% rename from hl/tools/testfiles/w-err-dset-none.err rename to hl/tools/h5watch/testfiles/w-err-dset-none.err diff --git a/hl/tools/testfiles/w-err-dset1.err b/hl/tools/h5watch/testfiles/w-err-dset1.err similarity index 100% rename from hl/tools/testfiles/w-err-dset1.err rename to hl/tools/h5watch/testfiles/w-err-dset1.err diff --git a/hl/tools/testfiles/w-err-dset2.err b/hl/tools/h5watch/testfiles/w-err-dset2.err similarity index 100% rename from hl/tools/testfiles/w-err-dset2.err rename to hl/tools/h5watch/testfiles/w-err-dset2.err diff --git a/hl/tools/testfiles/w-err-file.err b/hl/tools/h5watch/testfiles/w-err-file.err similarity index 100% rename from hl/tools/testfiles/w-err-file.err rename to hl/tools/h5watch/testfiles/w-err-file.err diff --git a/hl/tools/testfiles/w-err-poll.ddl b/hl/tools/h5watch/testfiles/w-err-poll.ddl similarity index 100% rename from hl/tools/testfiles/w-err-poll.ddl rename to hl/tools/h5watch/testfiles/w-err-poll.ddl diff --git a/hl/tools/testfiles/w-err-poll0.ddl b/hl/tools/h5watch/testfiles/w-err-poll0.ddl similarity index 100% rename from hl/tools/testfiles/w-err-poll0.ddl rename to hl/tools/h5watch/testfiles/w-err-poll0.ddl diff --git a/hl/tools/testfiles/w-err-std.ddl b/hl/tools/h5watch/testfiles/w-err-std.ddl similarity index 100% rename from hl/tools/testfiles/w-err-std.ddl rename to hl/tools/h5watch/testfiles/w-err-std.ddl diff --git a/hl/tools/testfiles/w-err-width.ddl b/hl/tools/h5watch/testfiles/w-err-width.ddl similarity index 100% rename from hl/tools/testfiles/w-err-width.ddl rename to hl/tools/h5watch/testfiles/w-err-width.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-esc.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-esc.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-esc.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-f1.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-f2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-f2.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-ff3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-ff3.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-ff3.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-ff3.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-label.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-label.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-label.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-label.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f1.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-two-f1.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-two-f1.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f3.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-two-f3.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-two-f3.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-ff2.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-two-ff2.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd-two.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd-two.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd-two.ddl diff --git a/hl/tools/testfiles/w-ext-cmpd.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-cmpd.ddl rename to hl/tools/h5watch/testfiles/w-ext-cmpd.ddl diff --git a/hl/tools/testfiles/w-ext-early.ddl b/hl/tools/h5watch/testfiles/w-ext-early.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-early.ddl rename to hl/tools/h5watch/testfiles/w-ext-early.ddl diff --git a/hl/tools/testfiles/w-ext-late.ddl b/hl/tools/h5watch/testfiles/w-ext-late.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-late.ddl rename to hl/tools/h5watch/testfiles/w-ext-late.ddl diff --git a/hl/tools/testfiles/w-ext-one-d.ddl b/hl/tools/h5watch/testfiles/w-ext-one-d.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-one-d.ddl rename to hl/tools/h5watch/testfiles/w-ext-one-d.ddl diff --git a/hl/tools/testfiles/w-ext-one-simple.ddl b/hl/tools/h5watch/testfiles/w-ext-one-simple.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-one-simple.ddl rename to hl/tools/h5watch/testfiles/w-ext-one-simple.ddl diff --git a/hl/tools/testfiles/w-ext-one.ddl b/hl/tools/h5watch/testfiles/w-ext-one.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-one.ddl rename to hl/tools/h5watch/testfiles/w-ext-one.ddl diff --git a/hl/tools/testfiles/w-ext-two-d.ddl b/hl/tools/h5watch/testfiles/w-ext-two-d.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-two-d.ddl rename to hl/tools/h5watch/testfiles/w-ext-two-d.ddl diff --git a/hl/tools/testfiles/w-ext-two-width.ddl b/hl/tools/h5watch/testfiles/w-ext-two-width.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-two-width.ddl rename to hl/tools/h5watch/testfiles/w-ext-two-width.ddl diff --git a/hl/tools/testfiles/w-ext-two.ddl b/hl/tools/h5watch/testfiles/w-ext-two.ddl similarity index 100% rename from hl/tools/testfiles/w-ext-two.ddl rename to hl/tools/h5watch/testfiles/w-ext-two.ddl diff --git a/hl/tools/testfiles/w-help1.ddl b/hl/tools/h5watch/testfiles/w-help1.ddl similarity index 100% rename from hl/tools/testfiles/w-help1.ddl rename to hl/tools/h5watch/testfiles/w-help1.ddl diff --git a/hl/tools/h5watch/testh5watch.sh.in b/hl/tools/h5watch/testh5watch.sh.in index fb047cd3042..a1daeec9bf1 100644 --- a/hl/tools/h5watch/testh5watch.sh.in +++ b/hl/tools/h5watch/testh5watch.sh.in @@ -66,7 +66,7 @@ fi nerrors=0 verbose=yes -test -d ../testfiles || mkdir ../testfiles +test -d ./testfiles || mkdir ./testfiles # Print a line-line message left justified in a field of 70 characters # beginning with the word "Testing". @@ -97,9 +97,9 @@ TESTING() { # $2 -- expected return code # $3 and on -- arguments for h5watch TOOLTEST() { - expect="$srcdir/../testfiles/$1" - actual="../testfiles/`basename $1 .ddl`.out" - actual_err="../testfiles/`basename $1 .ddl`.err" + expect="$srcdir/testfiles/$1" + actual="testfiles/`basename $1 .ddl`.out" + actual_err="testfiles/`basename $1 .ddl`.err" shift retvalexpect=$1 shift @@ -146,10 +146,10 @@ TOOLTEST() { # $2 -- expected return code # $3 and on -- arguments for h5watch TOOLTEST_ERR() { - expect="$srcdir/../testfiles/$1" - expect_err="$srcdir/../testfiles/`basename $1 .ddl`.err" - actual="../testfiles/`basename $1 .ddl`.out" - actual_err="../testfiles/`basename $1 .ddl`.out.err" + expect="$srcdir/testfiles/$1" + expect_err="$srcdir/testfiles/`basename $1 .ddl`.err" + actual="testfiles/`basename $1 .ddl`.out" + actual_err="testfiles/`basename $1 .ddl`.out.err" shift retvalexpect=$1 shift @@ -201,8 +201,8 @@ try=0 while [ $try -lt $TRY_MAX ] ; do cp $WATCHFILE $TESTFILE # Copy the file being watched/extended to a temporary file - actual="../testfiles/`basename $3 .ddl`.out" # The actual output - expect="$srcdir/../testfiles/$3" # The expected output + actual="testfiles/`basename $3 .ddl`.out" # The actual output + expect="$srcdir/testfiles/$3" # The expected output # # Set up options and object to h5watch if test -z "$2"; then diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt index 9f148e21baa..967795bdd83 100644 --- a/java/test/CMakeLists.txt +++ b/java/test/CMakeLists.txt @@ -104,12 +104,12 @@ HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_ HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateL2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files") HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateO1.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files") HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateO2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files") add_custom_target(${HDF5_JAVA_TEST_LIB_TARGET}_files ALL COMMENT "Copying files needed by ${HDF5_JAVA_TEST_LIB_TARGET} tests" DEPENDS ${${HDF5_JAVA_TEST_LIB_TARGET}_files_list}) @@ -248,12 +248,12 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL) HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateL2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateO1.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateO2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files") add_custom_target(${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files ALL COMMENT "Copying files needed by ${HDF5_JAVA_TEST_LIB_TARGET} tests" DEPENDS ${${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files_list}) diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index 0690081386a..981d945965b 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -46,7 +46,7 @@ HDFLIB_HOME="$top_srcdir/java/lib" BLDDIR="." BLDLIBDIR="$BLDDIR/testlibs" HDFTEST_HOME="$top_srcdir/java/test" -TOOLS_TESTFILES="$top_srcdir/tools/testfiles" +DUMP_TESTFILES="$top_srcdir/tools/test/h5dump/testfiles" JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar TESTJARFILE=jar@PACKAGE_TARNAME@test.jar @@ -258,12 +258,12 @@ COPY_DATAFILES_TO_BLDDIR() $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateL2.hdf $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateO1.hdf $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateO2.hdf - $CP -f $TOOLS_TESTFILES/trefer_reg.h5 $BLDDIR/trefer_reg.h5 - $CP -f $TOOLS_TESTFILES/trefer_attr.h5 $BLDDIR/trefer_attr.h5 - $CP -f $TOOLS_TESTFILES/tdatareg.h5 $BLDDIR/tdatareg.h5 - $CP -f $TOOLS_TESTFILES/tattrreg.h5 $BLDDIR/tattrreg.h5 - $CP -f $TOOLS_TESTFILES/tintsattrs.h5 $BLDDIR/tintsattrs.h5 - $CP -f $TOOLS_TESTFILES/tfloatsattrs.h5 $BLDDIR/tfloatsattrs.h5 + $CP -f $DUMP_TESTFILES/trefer_reg.h5 $BLDDIR/trefer_reg.h5 + $CP -f $DUMP_TESTFILES/trefer_attr.h5 $BLDDIR/trefer_attr.h5 + $CP -f $DUMP_TESTFILES/tdatareg.h5 $BLDDIR/tdatareg.h5 + $CP -f $DUMP_TESTFILES/tattrreg.h5 $BLDDIR/tattrreg.h5 + $CP -f $DUMP_TESTFILES/tintsattrs.h5 $BLDDIR/tintsattrs.h5 + $CP -f $DUMP_TESTFILES/tfloatsattrs.h5 $BLDDIR/tfloatsattrs.h5 } CLEAN_DATAFILES_AND_BLDDIR() diff --git a/test/CMakePassthroughVOLTests.cmake b/test/CMakePassthroughVOLTests.cmake index 94433de43c9..a5d9b598fb8 100644 --- a/test/CMakePassthroughVOLTests.cmake +++ b/test/CMakePassthroughVOLTests.cmake @@ -37,26 +37,26 @@ endforeach () foreach (voltest ${VOL_LIST}) foreach (h5_tfile ${HDF5_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${voltest}/${h5_tfile}" "HDF5_VOLTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${voltest}/${h5_tfile}" "HDF5_VOLTEST_LIB_files") endforeach () endforeach () foreach (voltest ${VOL_LIST}) foreach (ref_file ${HDF5_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${voltest}/${ref_file}" "HDF5_VOLTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${voltest}/${ref_file}" "HDF5_VOLTEST_LIB_files") endforeach () endforeach () foreach (voltest ${VOL_LIST}) foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_TEST_BINARY_DIR}/${voltest}/${h5_file}" "HDF5_VOLTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${voltest}/${h5_file}" "HDF5_VOLTEST_LIB_files") endforeach () endforeach () foreach (voltest ${VOL_LIST}) foreach (plistfile ${HDF5_REFERENCE_PLIST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/${plistfile}" "HDF5_VOLTEST_LIB_files") - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/def_${plistfile}" "HDF5_VOLTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/${plistfile}" "HDF5_VOLTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/def_${plistfile}" "HDF5_VOLTEST_LIB_files") endforeach () endforeach () diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index fa38a76de5d..cab01f6f637 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -36,12 +36,9 @@ add_custom_command ( ) foreach (h5_tfile ${HDF5_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/H5TEST/${h5_tfile}" "HDF5_TEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/${h5_tfile}" "HDF5_TEST_LIB_files") endforeach () -# -------------------------------------------------------------------- -# Copy all the HDF5 files from the test directory into the source directory -# -------------------------------------------------------------------- set (HDF5_REFERENCE_FILES err_compat_1 err_compat_2 @@ -51,7 +48,7 @@ set (HDF5_REFERENCE_FILES ) foreach (ref_file ${HDF5_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/H5TEST/${ref_file}" "HDF5_TEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/${ref_file}" "HDF5_TEST_LIB_files") endforeach () # -------------------------------------------------------------------- @@ -109,8 +106,8 @@ set (HDF5_REFERENCE_PLIST_FILES ) foreach (plistfile ${HDF5_REFERENCE_PLIST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/${plistfile}" "HDF5_TEST_LIB_files") - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/def_${plistfile}" "HDF5_TEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/${plistfile}" "HDF5_TEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/def_${plistfile}" "HDF5_TEST_LIB_files") endforeach () # -------------------------------------------------------------------- @@ -172,7 +169,7 @@ set (HDF5_REFERENCE_TEST_FILES ) foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_TEST_BINARY_DIR}/H5TEST/${h5_file}" "HDF5_TEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${HDF5_TEST_BINARY_DIR}/H5TEST/testfiles/${h5_file}" "HDF5_TEST_LIB_files") endforeach () add_custom_target(HDF5_TEST_LIB_files ALL COMMENT "Copying files needed by HDF5_TEST_LIB tests" DEPENDS ${HDF5_TEST_LIB_files_list}) diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake index 7648166b7bc..ed7bd8639e3 100644 --- a/test/CMakeVFDTests.cmake +++ b/test/CMakeVFDTests.cmake @@ -26,26 +26,26 @@ endforeach () foreach (vfdtest ${VFD_LIST}) foreach (h5_tfile ${HDF5_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}" "HDF5_VFDTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/${h5_tfile}" "HDF5_VFDTEST_LIB_files") endforeach () endforeach () foreach (vfdtest ${VFD_LIST}) foreach (ref_file ${HDF5_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${vfdtest}/${ref_file}" "HDF5_VFDTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/${ref_file}" "HDF5_VFDTEST_LIB_files") endforeach () endforeach () foreach (vfdtest ${VFD_LIST}) foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_TEST_BINARY_DIR}/${vfdtest}/${h5_file}" "HDF5_VFDTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${HDF5_TEST_BINARY_DIR}/${vfdtest}/testfiles/${h5_file}" "HDF5_VFDTEST_LIB_files") endforeach () endforeach () foreach (vfdtest ${VFD_LIST}) foreach (plistfile ${HDF5_REFERENCE_PLIST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/${plistfile}" "HDF5_VFDTEST_LIB_files") - HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/def_${plistfile}" "HDF5_VFDTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/${plistfile}" "HDF5_VFDTEST_LIB_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/def_${plistfile}" "HDF5_VFDTEST_LIB_files") endforeach () endforeach () diff --git a/test/enc_dec_plist_cross_platform.c b/test/enc_dec_plist_cross_platform.c index b9dc16a0747..a3682147843 100644 --- a/test/enc_dec_plist_cross_platform.c +++ b/test/enc_dec_plist_cross_platform.c @@ -31,121 +31,121 @@ main(void) /******* ENCODE/DECODE DCPLS *****/ TESTING("Default DCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_dcpl_") < 0) + if (test_plists("plist_files/def_dcpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("DCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/dcpl_") < 0) + if (test_plists("plist_files/dcpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE DAPLS *****/ TESTING("Default DAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_dapl_") < 0) + if (test_plists("plist_files/def_dapl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("DAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/dapl_") < 0) + if (test_plists("plist_files/dapl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE DXPLS *****/ TESTING("Default DXPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_dxpl_") < 0) + if (test_plists("plist_files/def_dxpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("DXPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/dxpl_") < 0) + if (test_plists("plist_files/dxpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE GCPLS *****/ TESTING("Default GCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_gcpl_") < 0) + if (test_plists("plist_files/def_gcpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("GCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/gcpl_") < 0) + if (test_plists("plist_files/gcpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE LCPLS *****/ TESTING("Default LCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_lcpl_") < 0) + if (test_plists("plist_files/def_lcpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("LCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/lcpl_") < 0) + if (test_plists("plist_files/lcpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE LAPLS *****/ TESTING("Default LAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_lapl_") < 0) + if (test_plists("plist_files/def_lapl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("LAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/lapl_") < 0) + if (test_plists("plist_files/lapl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE OCPLS *****/ TESTING("Default OCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_ocpl_") < 0) + if (test_plists("plist_files/def_ocpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("OCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/ocpl_") < 0) + if (test_plists("plist_files/ocpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE OCPYPLS *****/ TESTING("Default OCPYPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_ocpypl_") < 0) + if (test_plists("plist_files/def_ocpypl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("OCPYPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/ocpypl_") < 0) + if (test_plists("plist_files/ocpypl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE FCPLS *****/ TESTING("Default FCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_fcpl_") < 0) + if (test_plists("plist_files/def_fcpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("FCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/fcpl_") < 0) + if (test_plists("plist_files/fcpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE FAPLS *****/ TESTING("Default FAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_fapl_") < 0) + if (test_plists("plist_files/def_fapl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("FAPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/fapl_") < 0) + if (test_plists("plist_files/fapl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE STRCPLS *****/ TESTING("Default STRCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_strcpl_") < 0) + if (test_plists("plist_files/def_strcpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("STRCPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/strcpl_") < 0) + if (test_plists("plist_files/strcpl_") < 0) FAIL_STACK_ERROR; PASSED(); /******* ENCODE/DECODE ACPLS *****/ TESTING("Default ACPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/def_acpl_") < 0) + if (test_plists("plist_files/def_acpl_") < 0) FAIL_STACK_ERROR; PASSED(); TESTING("ACPL Encoding/Decoding"); - if (test_plists("testfiles/plist_files/acpl_") < 0) + if (test_plists("plist_files/acpl_") < 0) FAIL_STACK_ERROR; PASSED(); diff --git a/test/gen_plist.c b/test/gen_plist.c index ba16a4f5056..6d40ae707f5 100644 --- a/test/gen_plist.c +++ b/test/gen_plist.c @@ -105,7 +105,7 @@ main(void) if ((dcpl1 = H5Pcreate(H5P_DATASET_CREATE)) < 0) assert(dcpl1 > 0); - if ((ret = encode_plist(dcpl1, little_endian, word_length, "testfiles/plist_files/def_dcpl_")) < 0) + if ((ret = encode_plist(dcpl1, little_endian, word_length, "plist_files/def_dcpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_chunk(dcpl1, 1, &chunk_size)) < 0) @@ -132,7 +132,7 @@ main(void) if ((ret = H5Pset_external(dcpl1, "ext4.data", (off_t)0, (hsize_t)(max_size[0] * sizeof(int) / 4))) < 0) assert(ret > 0); - if ((ret = encode_plist(dcpl1, little_endian, word_length, "testfiles/plist_files/dcpl_")) < 0) + if ((ret = encode_plist(dcpl1, little_endian, word_length, "plist_files/dcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -143,13 +143,13 @@ main(void) if ((dapl1 = H5Pcreate(H5P_DATASET_ACCESS)) < 0) assert(dapl1 > 0); - if ((ret = encode_plist(dapl1, little_endian, word_length, "testfiles/plist_files/def_dapl_")) < 0) + if ((ret = encode_plist(dapl1, little_endian, word_length, "plist_files/def_dapl_")) < 0) assert(ret > 0); if ((ret = H5Pset_chunk_cache(dapl1, nslots, nbytes, w0)) < 0) assert(ret > 0); - if ((ret = encode_plist(dapl1, little_endian, word_length, "testfiles/plist_files/dapl_")) < 0) + if ((ret = encode_plist(dapl1, little_endian, word_length, "plist_files/dapl_")) < 0) assert(ret > 0); /* release resource */ @@ -160,7 +160,7 @@ main(void) if ((dxpl1 = H5Pcreate(H5P_DATASET_XFER)) < 0) assert(dxpl1 > 0); - if ((ret = encode_plist(dxpl1, little_endian, word_length, "testfiles/plist_files/def_dxpl_")) < 0) + if ((ret = encode_plist(dxpl1, little_endian, word_length, "plist_files/def_dxpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_btree_ratios(dxpl1, 0.2, 0.6, 0.2)) < 0) @@ -189,7 +189,7 @@ main(void) if ((ret = H5Pset_modify_write_buf(dxpl1, true)) < 0) assert(ret > 0); - if ((ret = encode_plist(dxpl1, little_endian, word_length, "testfiles/plist_files/dxpl_")) < 0) + if ((ret = encode_plist(dxpl1, little_endian, word_length, "plist_files/dxpl_")) < 0) assert(ret > 0); /* release resource */ @@ -200,7 +200,7 @@ main(void) if ((gcpl1 = H5Pcreate(H5P_GROUP_CREATE)) < 0) assert(gcpl1 > 0); - if ((ret = encode_plist(gcpl1, little_endian, word_length, "testfiles/plist_files/def_gcpl_")) < 0) + if ((ret = encode_plist(gcpl1, little_endian, word_length, "plist_files/def_gcpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_local_heap_size_hint(gcpl1, 256)) < 0) @@ -219,7 +219,7 @@ main(void) if ((ret = H5Pset_link_creation_order(gcpl1, (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED))) < 0) assert(ret > 0); - if ((ret = encode_plist(gcpl1, little_endian, word_length, "testfiles/plist_files/gcpl_")) < 0) + if ((ret = encode_plist(gcpl1, little_endian, word_length, "plist_files/gcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -230,13 +230,13 @@ main(void) if ((lcpl1 = H5Pcreate(H5P_LINK_CREATE)) < 0) assert(lcpl1 > 0); - if ((ret = encode_plist(lcpl1, little_endian, word_length, "testfiles/plist_files/def_lcpl_")) < 0) + if ((ret = encode_plist(lcpl1, little_endian, word_length, "plist_files/def_lcpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_create_intermediate_group(lcpl1, 1 /*true*/)) < 0) assert(ret > 0); - if ((ret = encode_plist(lcpl1, little_endian, word_length, "testfiles/plist_files/lcpl_")) < 0) + if ((ret = encode_plist(lcpl1, little_endian, word_length, "plist_files/lcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -247,7 +247,7 @@ main(void) if ((ocpypl1 = H5Pcreate(H5P_OBJECT_COPY)) < 0) assert(ocpypl1 > 0); - if ((ret = encode_plist(ocpypl1, little_endian, word_length, "testfiles/plist_files/def_ocpypl_")) < 0) + if ((ret = encode_plist(ocpypl1, little_endian, word_length, "plist_files/def_ocpypl_")) < 0) assert(ret > 0); ret = H5Pset_copy_object(ocpypl1, H5O_COPY_EXPAND_EXT_LINK_FLAG); @@ -259,7 +259,7 @@ main(void) ret = H5Padd_merge_committed_dtype_path(ocpypl1, "bar"); assert(ret >= 0); - if ((ret = encode_plist(ocpypl1, little_endian, word_length, "testfiles/plist_files/ocpypl_")) < 0) + if ((ret = encode_plist(ocpypl1, little_endian, word_length, "plist_files/ocpypl_")) < 0) assert(ret > 0); /* release resource */ @@ -270,7 +270,7 @@ main(void) if ((ocpl1 = H5Pcreate(H5P_OBJECT_CREATE)) < 0) assert(ocpl1 > 0); - if ((ret = encode_plist(ocpl1, little_endian, word_length, "testfiles/plist_files/def_ocpl_")) < 0) + if ((ret = encode_plist(ocpl1, little_endian, word_length, "plist_files/def_ocpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_attr_creation_order(ocpl1, (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED))) < 0) @@ -282,7 +282,7 @@ main(void) if ((ret = H5Pset_filter(ocpl1, H5Z_FILTER_FLETCHER32, 0, (size_t)0, NULL)) < 0) assert(ret > 0); - if ((ret = encode_plist(ocpl1, little_endian, word_length, "testfiles/plist_files/ocpl_")) < 0) + if ((ret = encode_plist(ocpl1, little_endian, word_length, "plist_files/ocpl_")) < 0) assert(ret > 0); /* release resource */ @@ -293,7 +293,7 @@ main(void) if ((lapl1 = H5Pcreate(H5P_LINK_ACCESS)) < 0) assert(lapl1 > 0); - if ((ret = encode_plist(lapl1, little_endian, word_length, "testfiles/plist_files/def_lapl_")) < 0) + if ((ret = encode_plist(lapl1, little_endian, word_length, "plist_files/def_lapl_")) < 0) assert(ret > 0); if ((ret = H5Pset_nlinks(lapl1, (size_t)134)) < 0) @@ -318,7 +318,7 @@ main(void) if ((ret = H5Pclose(fapl1)) < 0) assert(ret > 0); - if ((ret = encode_plist(lapl1, little_endian, word_length, "testfiles/plist_files/lapl_")) < 0) + if ((ret = encode_plist(lapl1, little_endian, word_length, "plist_files/lapl_")) < 0) assert(ret > 0); /* release resource */ @@ -329,7 +329,7 @@ main(void) if ((fapl1 = H5Pcreate(H5P_FILE_ACCESS)) < 0) assert(fapl1 > 0); - if ((ret = encode_plist(fapl1, little_endian, word_length, "testfiles/plist_files/def_fapl_")) < 0) + if ((ret = encode_plist(fapl1, little_endian, word_length, "plist_files/def_fapl_")) < 0) assert(ret > 0); if ((ret = H5Pset_family_offset(fapl1, 1024)) < 0) @@ -359,7 +359,7 @@ main(void) if ((ret = H5Pset_mdc_image_config(fapl1, &my_cache_image_config)) < 0) assert(ret > 0); - if ((ret = encode_plist(fapl1, little_endian, word_length, "testfiles/plist_files/fapl_")) < 0) + if ((ret = encode_plist(fapl1, little_endian, word_length, "plist_files/fapl_")) < 0) assert(ret > 0); /* release resource */ @@ -370,7 +370,7 @@ main(void) if ((fcpl1 = H5Pcreate(H5P_FILE_CREATE)) < 0) assert(fcpl1 > 0); - if ((ret = encode_plist(fcpl1, little_endian, word_length, "testfiles/plist_files/def_fcpl_")) < 0) + if ((ret = encode_plist(fcpl1, little_endian, word_length, "plist_files/def_fcpl_")) < 0) assert(ret > 0); if ((ret = H5Pset_userblock(fcpl1, 1024) < 0)) @@ -400,7 +400,7 @@ main(void) if ((ret = H5Pset_file_space_page_size(fcpl1, (hsize_t)4096)) < 0) assert(ret > 0); - if ((ret = encode_plist(fcpl1, little_endian, word_length, "testfiles/plist_files/fcpl_")) < 0) + if ((ret = encode_plist(fcpl1, little_endian, word_length, "plist_files/fcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -411,13 +411,13 @@ main(void) strcpl1 = H5Pcreate(H5P_STRING_CREATE); assert(strcpl1 > 0); - ret = encode_plist(strcpl1, little_endian, word_length, "testfiles/plist_files/def_strcpl_"); + ret = encode_plist(strcpl1, little_endian, word_length, "plist_files/def_strcpl_"); assert(ret > 0); ret = H5Pset_char_encoding(strcpl1, H5T_CSET_UTF8); assert(ret >= 0); - ret = encode_plist(strcpl1, little_endian, word_length, "testfiles/plist_files/strcpl_"); + ret = encode_plist(strcpl1, little_endian, word_length, "plist_files/strcpl_"); assert(ret > 0); /* release resource */ @@ -428,13 +428,13 @@ main(void) acpl1 = H5Pcreate(H5P_ATTRIBUTE_CREATE); assert(acpl1 > 0); - ret = encode_plist(acpl1, little_endian, word_length, "testfiles/plist_files/def_acpl_"); + ret = encode_plist(acpl1, little_endian, word_length, "plist_files/def_acpl_"); assert(ret > 0); ret = H5Pset_char_encoding(acpl1, H5T_CSET_UTF8); assert(ret >= 0); - ret = encode_plist(acpl1, little_endian, word_length, "testfiles/plist_files/acpl_"); + ret = encode_plist(acpl1, little_endian, word_length, "plist_files/acpl_"); assert(ret > 0); /* release resource */ diff --git a/test/h5test.c b/test/h5test.c index e7e9ec96429..862b9a327cd 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -1894,9 +1894,9 @@ H5_get_srcdir_filename(const char *filename) /* Build path to test file. We're checking the length so suppress * the gcc format-truncation warning. */ - if ((strlen(srcdir) + strlen(filename) + 1) < sizeof(srcdir_testpath)) { + if ((strlen(srcdir) + strlen("testfiles/") + strlen(filename) + 1) < sizeof(srcdir_testpath)) { H5_GCC_DIAG_OFF("format-truncation") - snprintf(srcdir_testpath, sizeof(srcdir_testpath), "%s%s", srcdir, filename); + snprintf(srcdir_testpath, sizeof(srcdir_testpath), "%stestfiles/%s", srcdir, filename); H5_GCC_DIAG_ON("format-truncation") return srcdir_testpath; } diff --git a/test/aggr.h5 b/test/testfiles/aggr.h5 similarity index 100% rename from test/aggr.h5 rename to test/testfiles/aggr.h5 diff --git a/test/bad_compound.h5 b/test/testfiles/bad_compound.h5 similarity index 100% rename from test/bad_compound.h5 rename to test/testfiles/bad_compound.h5 diff --git a/test/bad_offset.h5 b/test/testfiles/bad_offset.h5 similarity index 100% rename from test/bad_offset.h5 rename to test/testfiles/bad_offset.h5 diff --git a/test/be_data.h5 b/test/testfiles/be_data.h5 similarity index 100% rename from test/be_data.h5 rename to test/testfiles/be_data.h5 diff --git a/test/be_extlink1.h5 b/test/testfiles/be_extlink1.h5 similarity index 100% rename from test/be_extlink1.h5 rename to test/testfiles/be_extlink1.h5 diff --git a/test/be_extlink2.h5 b/test/testfiles/be_extlink2.h5 similarity index 100% rename from test/be_extlink2.h5 rename to test/testfiles/be_extlink2.h5 diff --git a/test/btree_idx_1_6.h5 b/test/testfiles/btree_idx_1_6.h5 similarity index 100% rename from test/btree_idx_1_6.h5 rename to test/testfiles/btree_idx_1_6.h5 diff --git a/test/btree_idx_1_8.h5 b/test/testfiles/btree_idx_1_8.h5 similarity index 100% rename from test/btree_idx_1_8.h5 rename to test/testfiles/btree_idx_1_8.h5 diff --git a/test/corrupt_stab_msg.h5 b/test/testfiles/corrupt_stab_msg.h5 similarity index 100% rename from test/corrupt_stab_msg.h5 rename to test/testfiles/corrupt_stab_msg.h5 diff --git a/test/cve_2020_10810.h5 b/test/testfiles/cve_2020_10810.h5 similarity index 100% rename from test/cve_2020_10810.h5 rename to test/testfiles/cve_2020_10810.h5 diff --git a/test/cve_2020_10812.h5 b/test/testfiles/cve_2020_10812.h5 similarity index 100% rename from test/cve_2020_10812.h5 rename to test/testfiles/cve_2020_10812.h5 diff --git a/test/deflate.h5 b/test/testfiles/deflate.h5 similarity index 100% rename from test/deflate.h5 rename to test/testfiles/deflate.h5 diff --git a/test/family_v16-000000.h5 b/test/testfiles/family_v16-000000.h5 similarity index 100% rename from test/family_v16-000000.h5 rename to test/testfiles/family_v16-000000.h5 diff --git a/test/family_v16-000001.h5 b/test/testfiles/family_v16-000001.h5 similarity index 100% rename from test/family_v16-000001.h5 rename to test/testfiles/family_v16-000001.h5 diff --git a/test/family_v16-000002.h5 b/test/testfiles/family_v16-000002.h5 similarity index 100% rename from test/family_v16-000002.h5 rename to test/testfiles/family_v16-000002.h5 diff --git a/test/family_v16-000003.h5 b/test/testfiles/family_v16-000003.h5 similarity index 100% rename from test/family_v16-000003.h5 rename to test/testfiles/family_v16-000003.h5 diff --git a/test/file_image_core_test.h5 b/test/testfiles/file_image_core_test.h5 similarity index 100% rename from test/file_image_core_test.h5 rename to test/testfiles/file_image_core_test.h5 diff --git a/test/filespace_1_6.h5 b/test/testfiles/filespace_1_6.h5 similarity index 100% rename from test/filespace_1_6.h5 rename to test/testfiles/filespace_1_6.h5 diff --git a/test/filespace_1_8.h5 b/test/testfiles/filespace_1_8.h5 similarity index 100% rename from test/filespace_1_8.h5 rename to test/testfiles/filespace_1_8.h5 diff --git a/test/fill18.h5 b/test/testfiles/fill18.h5 similarity index 100% rename from test/fill18.h5 rename to test/testfiles/fill18.h5 diff --git a/test/fill_old.h5 b/test/testfiles/fill_old.h5 similarity index 100% rename from test/fill_old.h5 rename to test/testfiles/fill_old.h5 diff --git a/test/filter_error.h5 b/test/testfiles/filter_error.h5 similarity index 100% rename from test/filter_error.h5 rename to test/testfiles/filter_error.h5 diff --git a/test/fsm_aggr_nopersist.h5 b/test/testfiles/fsm_aggr_nopersist.h5 similarity index 100% rename from test/fsm_aggr_nopersist.h5 rename to test/testfiles/fsm_aggr_nopersist.h5 diff --git a/test/fsm_aggr_persist.h5 b/test/testfiles/fsm_aggr_persist.h5 similarity index 100% rename from test/fsm_aggr_persist.h5 rename to test/testfiles/fsm_aggr_persist.h5 diff --git a/test/group_old.h5 b/test/testfiles/group_old.h5 similarity index 100% rename from test/group_old.h5 rename to test/testfiles/group_old.h5 diff --git a/test/h5fc_ext1_f.h5 b/test/testfiles/h5fc_ext1_f.h5 similarity index 100% rename from test/h5fc_ext1_f.h5 rename to test/testfiles/h5fc_ext1_f.h5 diff --git a/test/h5fc_ext1_i.h5 b/test/testfiles/h5fc_ext1_i.h5 similarity index 100% rename from test/h5fc_ext1_i.h5 rename to test/testfiles/h5fc_ext1_i.h5 diff --git a/test/h5fc_ext2_if.h5 b/test/testfiles/h5fc_ext2_if.h5 similarity index 100% rename from test/h5fc_ext2_if.h5 rename to test/testfiles/h5fc_ext2_if.h5 diff --git a/test/h5fc_ext2_sf.h5 b/test/testfiles/h5fc_ext2_sf.h5 similarity index 100% rename from test/h5fc_ext2_sf.h5 rename to test/testfiles/h5fc_ext2_sf.h5 diff --git a/test/h5fc_ext3_isf.h5 b/test/testfiles/h5fc_ext3_isf.h5 similarity index 100% rename from test/h5fc_ext3_isf.h5 rename to test/testfiles/h5fc_ext3_isf.h5 diff --git a/test/h5fc_ext_none.h5 b/test/testfiles/h5fc_ext_none.h5 similarity index 100% rename from test/h5fc_ext_none.h5 rename to test/testfiles/h5fc_ext_none.h5 diff --git a/test/le_data.h5 b/test/testfiles/le_data.h5 similarity index 100% rename from test/le_data.h5 rename to test/testfiles/le_data.h5 diff --git a/test/le_extlink1.h5 b/test/testfiles/le_extlink1.h5 similarity index 100% rename from test/le_extlink1.h5 rename to test/testfiles/le_extlink1.h5 diff --git a/test/le_extlink2.h5 b/test/testfiles/le_extlink2.h5 similarity index 100% rename from test/le_extlink2.h5 rename to test/testfiles/le_extlink2.h5 diff --git a/test/memleak_H5O_dtype_decode_helper_H5Odtype.h5 b/test/testfiles/memleak_H5O_dtype_decode_helper_H5Odtype.h5 similarity index 100% rename from test/memleak_H5O_dtype_decode_helper_H5Odtype.h5 rename to test/testfiles/memleak_H5O_dtype_decode_helper_H5Odtype.h5 diff --git a/test/mergemsg.h5 b/test/testfiles/mergemsg.h5 similarity index 100% rename from test/mergemsg.h5 rename to test/testfiles/mergemsg.h5 diff --git a/test/multi_file_v16-r.h5 b/test/testfiles/multi_file_v16-r.h5 similarity index 100% rename from test/multi_file_v16-r.h5 rename to test/testfiles/multi_file_v16-r.h5 diff --git a/test/multi_file_v16-s.h5 b/test/testfiles/multi_file_v16-s.h5 similarity index 100% rename from test/multi_file_v16-s.h5 rename to test/testfiles/multi_file_v16-s.h5 diff --git a/test/noencoder.h5 b/test/testfiles/noencoder.h5 similarity index 100% rename from test/noencoder.h5 rename to test/testfiles/noencoder.h5 diff --git a/test/none.h5 b/test/testfiles/none.h5 similarity index 100% rename from test/none.h5 rename to test/testfiles/none.h5 diff --git a/test/paged_nopersist.h5 b/test/testfiles/paged_nopersist.h5 similarity index 100% rename from test/paged_nopersist.h5 rename to test/testfiles/paged_nopersist.h5 diff --git a/test/paged_persist.h5 b/test/testfiles/paged_persist.h5 similarity index 100% rename from test/paged_persist.h5 rename to test/testfiles/paged_persist.h5 diff --git a/test/specmetaread.h5 b/test/testfiles/specmetaread.h5 similarity index 100% rename from test/specmetaread.h5 rename to test/testfiles/specmetaread.h5 diff --git a/test/tarrold.h5 b/test/testfiles/tarrold.h5 similarity index 100% rename from test/tarrold.h5 rename to test/testfiles/tarrold.h5 diff --git a/test/tbad_msg_count.h5 b/test/testfiles/tbad_msg_count.h5 similarity index 100% rename from test/tbad_msg_count.h5 rename to test/testfiles/tbad_msg_count.h5 diff --git a/test/tbogus.h5 b/test/testfiles/tbogus.h5 similarity index 100% rename from test/tbogus.h5 rename to test/testfiles/tbogus.h5 diff --git a/test/test_filters_be.h5 b/test/testfiles/test_filters_be.h5 similarity index 100% rename from test/test_filters_be.h5 rename to test/testfiles/test_filters_be.h5 diff --git a/test/test_filters_le.h5 b/test/testfiles/test_filters_le.h5 similarity index 100% rename from test/test_filters_le.h5 rename to test/testfiles/test_filters_le.h5 diff --git a/test/th5s.h5 b/test/testfiles/th5s.h5 similarity index 100% rename from test/th5s.h5 rename to test/testfiles/th5s.h5 diff --git a/test/tlayouto.h5 b/test/testfiles/tlayouto.h5 similarity index 100% rename from test/tlayouto.h5 rename to test/testfiles/tlayouto.h5 diff --git a/test/tmtimen.h5 b/test/testfiles/tmtimen.h5 similarity index 100% rename from test/tmtimen.h5 rename to test/testfiles/tmtimen.h5 diff --git a/test/tmtimeo.h5 b/test/testfiles/tmtimeo.h5 similarity index 100% rename from test/tmtimeo.h5 rename to test/testfiles/tmtimeo.h5 diff --git a/tools/testfiles/tnullspace.h5 b/test/testfiles/tnullspace.h5 similarity index 100% rename from tools/testfiles/tnullspace.h5 rename to test/testfiles/tnullspace.h5 diff --git a/test/tsizeslheap.h5 b/test/testfiles/tsizeslheap.h5 similarity index 100% rename from test/tsizeslheap.h5 rename to test/testfiles/tsizeslheap.h5 diff --git a/tools/test/h5copy/CMakeTests.cmake b/tools/test/h5copy/CMakeTests.cmake index b47000a3193..e443827cd4d 100644 --- a/tools/test/h5copy/CMakeTests.cmake +++ b/tools/test/h5copy/CMakeTests.cmake @@ -20,32 +20,35 @@ # Copy all the HDF5 files from the source directory into the test directory # -------------------------------------------------------------------- set (LIST_HDF5_TEST_FILES - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_extlinks_src.h5 - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_extlinks_trg.h5 - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_ref.h5 - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copytst.h5 - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5 - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter2.h5 + h5copy_extlinks_src.h5 + h5copy_extlinks_trg.h5 + h5copy_ref.h5 + h5copytst.h5 + tudfilter.h5 + tudfilter2.h5 ) set (LIST_OTHER_TEST_FILES - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_misc1.out - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_misc1.err - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5.txt - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5_ERR.txt - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_plugin_fail_ERR.out.h5.txt - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_plugin_test.out.h5.txt - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_help1.ddl - ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_help2.ddl + h5copy_misc1.out + h5copy_misc1.err + tudfilter.h5.txt + tudfilter.h5_ERR.txt + h5copy_plugin_fail_ERR.out.h5.txt + h5copy_plugin_test.out.h5.txt + h5copy_help1.ddl + h5copy_help2.ddl ) file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") - foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5copy_files") + foreach (listfiles ${LIST_HDF5_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5copy_files") endforeach () - add_custom_target(h5copy_files ALL COMMENT "Copying files needed by h5copy tests" DEPENDS ${h5copy_files_list}) + + foreach (listothers ${LIST_OTHER_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/${listothers}" "h5copy_files") + endforeach () + add_custom_target(h5copy_files ALL COMMENT "Copying files needed by h5copy tests" DEPENDS ${h5copy_files_list}) ############################################################################## ############################################################################## diff --git a/tools/test/h5copy/testfiles/h5copy_extlinks_src.out.ls b/tools/test/h5copy/expected/h5copy_extlinks_src.out.ls similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_extlinks_src.out.ls rename to tools/test/h5copy/expected/h5copy_extlinks_src.out.ls diff --git a/tools/test/h5copy/testfiles/h5copy_help1.ddl b/tools/test/h5copy/expected/h5copy_help1.ddl similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_help1.ddl rename to tools/test/h5copy/expected/h5copy_help1.ddl diff --git a/tools/test/h5copy/testfiles/h5copy_help2.ddl b/tools/test/h5copy/expected/h5copy_help2.ddl similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_help2.ddl rename to tools/test/h5copy/expected/h5copy_help2.ddl diff --git a/tools/test/h5copy/testfiles/h5copy_misc1.err b/tools/test/h5copy/expected/h5copy_misc1.err similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_misc1.err rename to tools/test/h5copy/expected/h5copy_misc1.err diff --git a/tools/test/h5copy/testfiles/h5copy_misc1.out b/tools/test/h5copy/expected/h5copy_misc1.out similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_misc1.out rename to tools/test/h5copy/expected/h5copy_misc1.out diff --git a/tools/test/h5copy/testfiles/h5copy_plugin_fail_ERR.out.h5.txt b/tools/test/h5copy/expected/h5copy_plugin_fail_ERR.out.h5.txt similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_plugin_fail_ERR.out.h5.txt rename to tools/test/h5copy/expected/h5copy_plugin_fail_ERR.out.h5.txt diff --git a/tools/test/h5copy/testfiles/h5copy_plugin_test.out.h5.txt b/tools/test/h5copy/expected/h5copy_plugin_test.out.h5.txt similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_plugin_test.out.h5.txt rename to tools/test/h5copy/expected/h5copy_plugin_test.out.h5.txt diff --git a/tools/test/h5copy/testfiles/h5copy_ref.out.ls b/tools/test/h5copy/expected/h5copy_ref.out.ls similarity index 100% rename from tools/test/h5copy/testfiles/h5copy_ref.out.ls rename to tools/test/h5copy/expected/h5copy_ref.out.ls diff --git a/tools/test/h5copy/testfiles/h5copytst.out.ls b/tools/test/h5copy/expected/h5copytst.out.ls similarity index 100% rename from tools/test/h5copy/testfiles/h5copytst.out.ls rename to tools/test/h5copy/expected/h5copytst.out.ls diff --git a/tools/test/h5copy/testfiles/h5copytst_new.out.ls b/tools/test/h5copy/expected/h5copytst_new.out.ls similarity index 100% rename from tools/test/h5copy/testfiles/h5copytst_new.out.ls rename to tools/test/h5copy/expected/h5copytst_new.out.ls diff --git a/tools/test/h5copy/testfiles/tudfilter.h5.txt b/tools/test/h5copy/expected/tudfilter.h5.txt similarity index 100% rename from tools/test/h5copy/testfiles/tudfilter.h5.txt rename to tools/test/h5copy/expected/tudfilter.h5.txt diff --git a/tools/test/h5copy/testfiles/tudfilter.h5_ERR.txt b/tools/test/h5copy/expected/tudfilter.h5_ERR.txt similarity index 100% rename from tools/test/h5copy/testfiles/tudfilter.h5_ERR.txt rename to tools/test/h5copy/expected/tudfilter.h5_ERR.txt diff --git a/tools/test/h5copy/testh5copy.sh.in b/tools/test/h5copy/testh5copy.sh.in index 1f64d15f037..f2c4a8e1237 100644 --- a/tools/test/h5copy/testh5copy.sh.in +++ b/tools/test/h5copy/testh5copy.sh.in @@ -24,16 +24,16 @@ USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@" # 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" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5COPY_OUTFILES="$SRC_TOOLS/test/h5copy/expected" TESTNAME=h5copy EXIT_SUCCESS=0 @@ -58,10 +58,10 @@ $SRC_H5COPY_TESTFILES/h5copy_extlinks_trg.h5 # List of expect files that will be copied over to local test dir LIST_OTHER_TEST_FILES=" -$SRC_H5COPY_TESTFILES/h5copy_misc1.out -$SRC_H5COPY_TESTFILES/h5copy_misc1.err -$SRC_H5COPY_TESTFILES/h5copy_help1.ddl -$SRC_H5COPY_TESTFILES/h5copy_help2.ddl +$SRC_H5COPY_OUTFILES/h5copy_misc1.out +$SRC_H5COPY_OUTFILES/h5copy_misc1.err +$SRC_H5COPY_OUTFILES/h5copy_help1.ddl +$SRC_H5COPY_OUTFILES/h5copy_help2.ddl " H5COPY=../../src/h5copy/h5copy # The tool name diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake index b23f885d4fd..d89df46583d 100644 --- a/tools/test/h5diff/CMakeTests.cmake +++ b/tools/test/h5diff/CMakeTests.cmake @@ -19,303 +19,307 @@ # -------------------------------------------------------------------- # Copy all the HDF5 files from the test directory into the source directory # -------------------------------------------------------------------- - set (LIST_HDF5_TEST_FILES - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_basic1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_basic2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_types.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dtypes.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr3.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset3.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_hyper1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_hyper2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_empty.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_links.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_softlinks.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_linked_softlink.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_extlink_src.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_extlink_trg.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ext2softlink_src.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ext2softlink_trg.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset_zero_dim_size1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset_zero_dim_size2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_danglelinks1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_danglelinks2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-3.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude1-1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude1-2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude2-1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude2-2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude3-1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude3-2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_comp_vl_strs.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr_v_level1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr_v_level2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_enum_invalid_values.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/compounds_array_vlen1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/compounds_array_vlen2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/non_comparables1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/non_comparables2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tudfilter.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tudfilter2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_strings1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_strings2.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps1.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps2.h5 + # tools/testfiles/vds + set (LIST_VDS_TEST_FILES + 1_a.h5 + 1_b.h5 + 1_c.h5 + 1_d.h5 + 1_e.h5 + 1_f.h5 + 1_vds.h5 + 2_a.h5 + 2_b.h5 + 2_c.h5 + 2_d.h5 + 2_e.h5 + 2_vds.h5 + 3_1_vds.h5 + 3_2_vds.h5 + 4_0.h5 + 4_1.h5 + 4_2.h5 + 4_vds.h5 + 5_a.h5 + 5_b.h5 + 5_c.h5 + 5_vds.h5 + ) + set (LIST_DIFF_TEST_FILES + h5diff_basic1.h5 + h5diff_basic2.h5 + h5diff_types.h5 + h5diff_dtypes.h5 + h5diff_attr1.h5 + h5diff_attr2.h5 + h5diff_attr3.h5 + h5diff_dset1.h5 + h5diff_dset2.h5 + h5diff_dset3.h5 + h5diff_hyper1.h5 + h5diff_hyper2.h5 + h5diff_empty.h5 + h5diff_links.h5 + h5diff_softlinks.h5 + h5diff_linked_softlink.h5 + h5diff_extlink_src.h5 + h5diff_extlink_trg.h5 + h5diff_ext2softlink_src.h5 + h5diff_ext2softlink_trg.h5 + h5diff_dset_zero_dim_size1.h5 + h5diff_dset_zero_dim_size2.h5 + h5diff_danglelinks1.h5 + h5diff_danglelinks2.h5 + h5diff_grp_recurse1.h5 + h5diff_grp_recurse2.h5 + h5diff_grp_recurse_ext1.h5 + h5diff_grp_recurse_ext2-1.h5 + h5diff_grp_recurse_ext2-2.h5 + h5diff_grp_recurse_ext2-3.h5 + h5diff_exclude1-1.h5 + h5diff_exclude1-2.h5 + h5diff_exclude2-1.h5 + h5diff_exclude2-2.h5 + h5diff_exclude3-1.h5 + h5diff_exclude3-2.h5 + h5diff_comp_vl_strs.h5 + h5diff_attr_v_level1.h5 + h5diff_attr_v_level2.h5 + h5diff_enum_invalid_values.h5 + compounds_array_vlen1.h5 + compounds_array_vlen2.h5 + non_comparables1.h5 + non_comparables2.h5 + tudfilter.h5 + tudfilter2.h5 + h5diff_strings1.h5 + h5diff_strings2.h5 + h5diff_eps1.h5 + h5diff_eps2.h5 # onion VFD files - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_objs.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_objs.h5.onion - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_ext.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_ext.h5.onion - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_1d.h5 - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_1d.h5.onion - # tools/testfiles/vds - ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5 + h5diff_onion_objs.h5 + h5diff_onion_objs.h5.onion + h5diff_onion_dset_ext.h5 + h5diff_onion_dset_ext.h5.onion + h5diff_onion_dset_1d.h5 + h5diff_onion_dset_1d.h5.onion + ) + set (LIST_HDF5_TEST_FILES # tools/testfiles - ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5 + tvlstr.h5 #STD_REF_OBJ files - ${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_compat.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_ext1.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_ext2.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_grp.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_del.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_obj.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_param.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1d.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5 + trefer_attr.h5 + trefer_compat.h5 + trefer_ext1.h5 + trefer_ext2.h5 + trefer_grp.h5 + trefer_obj_del.h5 + trefer_obj.h5 + trefer_param.h5 + trefer_reg_1d.h5 + trefer_reg.h5 ) set (LIST_OTHER_TEST_FILES - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_10.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_100.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_11.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_12.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_13.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_14.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_15.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_1.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_2.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_3.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_17.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_171.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_172.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_18_1.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_18.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_20.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_200.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_201.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_202.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_203.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_204.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_205.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_206.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_207.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_208.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_220.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_221.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_222.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_223.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_224.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_21.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_22.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_23.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_24.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_25.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_26.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_27.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_28.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_30.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_300.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_400.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_401.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_402.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_403.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_404.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_405.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_406.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_407.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_408.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_409.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_410.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_411.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_412.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_413.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_414.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_415.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_416.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_417.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_418.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_419.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_420.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_421.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_422.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_423.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_424.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_425.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_450.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_451.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_452.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_453.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_454.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/dangling_link.err - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_455.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_456.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_457.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_458.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_459.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_465.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_466.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_467.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_468.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_469.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_471.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_472.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_473.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_474.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_475.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_480.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_481.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_482.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_483.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_484.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_485.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_486.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_487.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_50.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_51.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_52.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_53.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_54.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_55.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_56.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_57.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_58.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_58_ref.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_59.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_500.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_501.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_502.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_503.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_504.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_505.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_506.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_507.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_508.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_509.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_510.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_511.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_512.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_513.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_514.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_515.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_516.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_517.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_518.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_530.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_540.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_60.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_61.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_62.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_63.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_600.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601_ERR.err - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_603.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_604.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_605.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_606.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_607.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_608.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_609.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_610.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_612.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_613.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_614.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_615.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_616.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_617.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_618.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_619.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_621.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_622.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_623.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_624.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_625.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_626.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_627.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_628.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_629.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_630.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_631.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_640.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_641.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_642.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_643.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_644.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_645.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_646.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_70.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_700.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_701.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_702.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_703.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_704.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_705.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_706.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_707.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_708.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_709.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_710.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_80.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_800.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_801.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_830.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_90.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_900.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_901.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_902.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8625.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8639.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_reg.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ud.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.err - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v1.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v2.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v3.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_vlstr.txt - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps.txt + h5diff_10.txt + h5diff_100.txt + h5diff_11.txt + h5diff_12.txt + h5diff_13.txt + h5diff_14.txt + h5diff_15.txt + h5diff_16_1.txt + h5diff_16_2.txt + h5diff_16_3.txt + h5diff_17.txt + h5diff_171.txt + h5diff_172.txt + h5diff_18_1.txt + h5diff_18.txt + h5diff_20.txt + h5diff_200.txt + h5diff_201.txt + h5diff_202.txt + h5diff_203.txt + h5diff_204.txt + h5diff_205.txt + h5diff_206.txt + h5diff_207.txt + h5diff_208.txt + h5diff_220.txt + h5diff_221.txt + h5diff_222.txt + h5diff_223.txt + h5diff_224.txt + h5diff_21.txt + h5diff_22.txt + h5diff_23.txt + h5diff_24.txt + h5diff_25.txt + h5diff_26.txt + h5diff_27.txt + h5diff_28.txt + h5diff_30.txt + h5diff_300.txt + h5diff_400.txt + h5diff_401.txt + h5diff_402.txt + h5diff_403.txt + h5diff_404.txt + h5diff_405.txt + h5diff_406.txt + h5diff_407.txt + h5diff_408.txt + h5diff_409.txt + h5diff_410.txt + h5diff_411.txt + h5diff_412.txt + h5diff_413.txt + h5diff_414.txt + h5diff_415.txt + h5diff_416.txt + h5diff_417.txt + h5diff_418.txt + h5diff_419.txt + h5diff_420.txt + h5diff_421.txt + h5diff_422.txt + h5diff_423.txt + h5diff_424.txt + h5diff_425.txt + h5diff_450.txt + h5diff_451.txt + h5diff_452.txt + h5diff_453.txt + h5diff_454.txt + dangling_link.err + h5diff_455.txt + h5diff_456.txt + h5diff_457.txt + h5diff_458.txt + h5diff_459.txt + h5diff_465.txt + h5diff_466.txt + h5diff_467.txt + h5diff_468.txt + h5diff_469.txt + h5diff_471.txt + h5diff_472.txt + h5diff_473.txt + h5diff_474.txt + h5diff_475.txt + h5diff_480.txt + h5diff_481.txt + h5diff_482.txt + h5diff_483.txt + h5diff_484.txt + h5diff_485.txt + h5diff_486.txt + h5diff_487.txt + h5diff_50.txt + h5diff_51.txt + h5diff_52.txt + h5diff_53.txt + h5diff_54.txt + h5diff_55.txt + h5diff_56.txt + h5diff_57.txt + h5diff_58.txt + h5diff_58_ref.txt + h5diff_59.txt + h5diff_500.txt + h5diff_501.txt + h5diff_502.txt + h5diff_503.txt + h5diff_504.txt + h5diff_505.txt + h5diff_506.txt + h5diff_507.txt + h5diff_508.txt + h5diff_509.txt + h5diff_510.txt + h5diff_511.txt + h5diff_512.txt + h5diff_513.txt + h5diff_514.txt + h5diff_515.txt + h5diff_516.txt + h5diff_517.txt + h5diff_518.txt + h5diff_530.txt + h5diff_540.txt + h5diff_60.txt + h5diff_61.txt + h5diff_62.txt + h5diff_63.txt + h5diff_600.txt + h5diff_601.txt + h5diff_601_ERR.err + h5diff_603.txt + h5diff_604.txt + h5diff_605.txt + h5diff_606.txt + h5diff_607.txt + h5diff_608.txt + h5diff_609.txt + h5diff_610.txt + h5diff_612.txt + h5diff_613.txt + h5diff_614.txt + h5diff_615.txt + h5diff_616.txt + h5diff_617.txt + h5diff_618.txt + h5diff_619.txt + h5diff_621.txt + h5diff_622.txt + h5diff_623.txt + h5diff_624.txt + h5diff_625.txt + h5diff_626.txt + h5diff_627.txt + h5diff_628.txt + h5diff_629.txt + h5diff_630.txt + h5diff_631.txt + h5diff_640.txt + h5diff_641.txt + h5diff_642.txt + h5diff_643.txt + h5diff_644.txt + h5diff_645.txt + h5diff_646.txt + h5diff_70.txt + h5diff_700.txt + h5diff_701.txt + h5diff_702.txt + h5diff_703.txt + h5diff_704.txt + h5diff_705.txt + h5diff_706.txt + h5diff_707.txt + h5diff_708.txt + h5diff_709.txt + h5diff_710.txt + h5diff_80.txt + h5diff_800.txt + h5diff_801.txt + h5diff_830.txt + h5diff_90.txt + h5diff_900.txt + h5diff_901.txt + h5diff_902.txt + h5diff_8625.txt + h5diff_8639.txt + h5diff_reg.txt + h5diff_ud.txt + h5diff_udfail.err + h5diff_udfail.txt + h5diff_v1.txt + h5diff_v2.txt + h5diff_v3.txt + h5diff_vlstr.txt + h5diff_eps.txt ) set (LIST_WIN_TEST_FILES @@ -334,17 +338,34 @@ # # copy test files from source to build dir # - foreach (h5_tstfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES}) - get_filename_component(fname "${h5_tstfiles}" NAME) - HDFTEST_COPY_FILE("${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5diff_files") + foreach (h5_tstfiles ${LIST_DIFF_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files") + if (H5_HAVE_PARALLEL) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files") + endif () + endforeach () + foreach (h5_tstfiles ${LIST_VDS_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files") + if (H5_HAVE_PARALLEL) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files") + endif () + endforeach () + foreach (h5_tstfiles ${LIST_HDF5_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files") + if (H5_HAVE_PARALLEL) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files") + endif () + endforeach () + foreach (h5_tstfiles ${LIST_OTHER_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files") if (H5_HAVE_PARALLEL) - HDFTEST_COPY_FILE("${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}" "h5diff_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files") endif () endforeach () # copy second version of tvlstr.h5 - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files") if (H5_HAVE_PARALLEL) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files") endif () @@ -361,18 +382,16 @@ endif () if (COPY_WINDOWS_FILES) foreach (h5_tstfiles ${LIST_WIN_TEST_FILES}) - get_filename_component(fname "${h5_tstfiles}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/testfiles/${fname}.txt" "h5diff_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}.txt" "h5diff_files") if (H5_HAVE_PARALLEL) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}.txt" "h5diff_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}.txt" "h5diff_files") endif () endforeach () else () foreach (h5_tstfiles ${LIST_WIN_TEST_FILES}) - get_filename_component(fname "${h5_tstfiles}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/testfiles/${fname}.txt" "h5diff_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}.txt" "h5diff_files") if (H5_HAVE_PARALLEL) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}.txt" "h5diff_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}.txt" "h5diff_files") endif () endforeach () endif () diff --git a/tools/test/h5diff/testfiles/dangling_link.err b/tools/test/h5diff/expected/dangling_link.err similarity index 100% rename from tools/test/h5diff/testfiles/dangling_link.err rename to tools/test/h5diff/expected/dangling_link.err diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/expected/h5diff_10.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_10.txt rename to tools/test/h5diff/expected/h5diff_10.txt diff --git a/tools/test/h5diff/testfiles/h5diff_100.txt b/tools/test/h5diff/expected/h5diff_100.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_100.txt rename to tools/test/h5diff/expected/h5diff_100.txt diff --git a/tools/test/h5diff/testfiles/h5diff_101.txt b/tools/test/h5diff/expected/h5diff_101.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_101.txt rename to tools/test/h5diff/expected/h5diff_101.txt diff --git a/tools/test/h5diff/testfiles/h5diff_101w.txt b/tools/test/h5diff/expected/h5diff_101w.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_101w.txt rename to tools/test/h5diff/expected/h5diff_101w.txt diff --git a/tools/test/h5diff/testfiles/h5diff_102.txt b/tools/test/h5diff/expected/h5diff_102.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_102.txt rename to tools/test/h5diff/expected/h5diff_102.txt diff --git a/tools/test/h5diff/testfiles/h5diff_102w.txt b/tools/test/h5diff/expected/h5diff_102w.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_102w.txt rename to tools/test/h5diff/expected/h5diff_102w.txt diff --git a/tools/test/h5diff/testfiles/h5diff_103.txt b/tools/test/h5diff/expected/h5diff_103.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_103.txt rename to tools/test/h5diff/expected/h5diff_103.txt diff --git a/tools/test/h5diff/testfiles/h5diff_103w.txt b/tools/test/h5diff/expected/h5diff_103w.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_103w.txt rename to tools/test/h5diff/expected/h5diff_103w.txt diff --git a/tools/test/h5diff/testfiles/h5diff_104.txt b/tools/test/h5diff/expected/h5diff_104.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_104.txt rename to tools/test/h5diff/expected/h5diff_104.txt diff --git a/tools/test/h5diff/testfiles/h5diff_104w.txt b/tools/test/h5diff/expected/h5diff_104w.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_104w.txt rename to tools/test/h5diff/expected/h5diff_104w.txt diff --git a/tools/test/h5diff/testfiles/h5diff_11.txt b/tools/test/h5diff/expected/h5diff_11.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_11.txt rename to tools/test/h5diff/expected/h5diff_11.txt diff --git a/tools/test/h5diff/testfiles/h5diff_12.txt b/tools/test/h5diff/expected/h5diff_12.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_12.txt rename to tools/test/h5diff/expected/h5diff_12.txt diff --git a/tools/test/h5diff/testfiles/h5diff_13.txt b/tools/test/h5diff/expected/h5diff_13.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_13.txt rename to tools/test/h5diff/expected/h5diff_13.txt diff --git a/tools/test/h5diff/testfiles/h5diff_14.txt b/tools/test/h5diff/expected/h5diff_14.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_14.txt rename to tools/test/h5diff/expected/h5diff_14.txt diff --git a/tools/test/h5diff/testfiles/h5diff_15.txt b/tools/test/h5diff/expected/h5diff_15.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_15.txt rename to tools/test/h5diff/expected/h5diff_15.txt diff --git a/tools/test/h5diff/testfiles/h5diff_16_1.txt b/tools/test/h5diff/expected/h5diff_16_1.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_16_1.txt rename to tools/test/h5diff/expected/h5diff_16_1.txt diff --git a/tools/test/h5diff/testfiles/h5diff_16_2.txt b/tools/test/h5diff/expected/h5diff_16_2.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_16_2.txt rename to tools/test/h5diff/expected/h5diff_16_2.txt diff --git a/tools/test/h5diff/testfiles/h5diff_16_3.txt b/tools/test/h5diff/expected/h5diff_16_3.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_16_3.txt rename to tools/test/h5diff/expected/h5diff_16_3.txt diff --git a/tools/test/h5diff/testfiles/h5diff_17.txt b/tools/test/h5diff/expected/h5diff_17.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_17.txt rename to tools/test/h5diff/expected/h5diff_17.txt diff --git a/tools/test/h5diff/testfiles/h5diff_171.txt b/tools/test/h5diff/expected/h5diff_171.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_171.txt rename to tools/test/h5diff/expected/h5diff_171.txt diff --git a/tools/test/h5diff/testfiles/h5diff_172.txt b/tools/test/h5diff/expected/h5diff_172.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_172.txt rename to tools/test/h5diff/expected/h5diff_172.txt diff --git a/tools/test/h5diff/testfiles/h5diff_18.txt b/tools/test/h5diff/expected/h5diff_18.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_18.txt rename to tools/test/h5diff/expected/h5diff_18.txt diff --git a/tools/test/h5diff/testfiles/h5diff_18_1.txt b/tools/test/h5diff/expected/h5diff_18_1.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_18_1.txt rename to tools/test/h5diff/expected/h5diff_18_1.txt diff --git a/tools/test/h5diff/testfiles/h5diff_19.txt b/tools/test/h5diff/expected/h5diff_19.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_19.txt rename to tools/test/h5diff/expected/h5diff_19.txt diff --git a/tools/test/h5diff/testfiles/h5diff_20.txt b/tools/test/h5diff/expected/h5diff_20.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_20.txt rename to tools/test/h5diff/expected/h5diff_20.txt diff --git a/tools/test/h5diff/testfiles/h5diff_200.txt b/tools/test/h5diff/expected/h5diff_200.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_200.txt rename to tools/test/h5diff/expected/h5diff_200.txt diff --git a/tools/test/h5diff/testfiles/h5diff_201.txt b/tools/test/h5diff/expected/h5diff_201.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_201.txt rename to tools/test/h5diff/expected/h5diff_201.txt diff --git a/tools/test/h5diff/testfiles/h5diff_202.txt b/tools/test/h5diff/expected/h5diff_202.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_202.txt rename to tools/test/h5diff/expected/h5diff_202.txt diff --git a/tools/test/h5diff/testfiles/h5diff_203.txt b/tools/test/h5diff/expected/h5diff_203.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_203.txt rename to tools/test/h5diff/expected/h5diff_203.txt diff --git a/tools/test/h5diff/testfiles/h5diff_204.txt b/tools/test/h5diff/expected/h5diff_204.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_204.txt rename to tools/test/h5diff/expected/h5diff_204.txt diff --git a/tools/test/h5diff/testfiles/h5diff_205.txt b/tools/test/h5diff/expected/h5diff_205.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_205.txt rename to tools/test/h5diff/expected/h5diff_205.txt diff --git a/tools/test/h5diff/testfiles/h5diff_206.txt b/tools/test/h5diff/expected/h5diff_206.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_206.txt rename to tools/test/h5diff/expected/h5diff_206.txt diff --git a/tools/test/h5diff/testfiles/h5diff_207.txt b/tools/test/h5diff/expected/h5diff_207.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_207.txt rename to tools/test/h5diff/expected/h5diff_207.txt diff --git a/tools/test/h5diff/testfiles/h5diff_208.txt b/tools/test/h5diff/expected/h5diff_208.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_208.txt rename to tools/test/h5diff/expected/h5diff_208.txt diff --git a/tools/test/h5diff/testfiles/h5diff_21.txt b/tools/test/h5diff/expected/h5diff_21.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_21.txt rename to tools/test/h5diff/expected/h5diff_21.txt diff --git a/tools/test/h5diff/testfiles/h5diff_22.txt b/tools/test/h5diff/expected/h5diff_22.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_22.txt rename to tools/test/h5diff/expected/h5diff_22.txt diff --git a/tools/test/h5diff/testfiles/h5diff_220.txt b/tools/test/h5diff/expected/h5diff_220.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_220.txt rename to tools/test/h5diff/expected/h5diff_220.txt diff --git a/tools/test/h5diff/testfiles/h5diff_221.txt b/tools/test/h5diff/expected/h5diff_221.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_221.txt rename to tools/test/h5diff/expected/h5diff_221.txt diff --git a/tools/test/h5diff/testfiles/h5diff_222.txt b/tools/test/h5diff/expected/h5diff_222.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_222.txt rename to tools/test/h5diff/expected/h5diff_222.txt diff --git a/tools/test/h5diff/testfiles/h5diff_223.txt b/tools/test/h5diff/expected/h5diff_223.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_223.txt rename to tools/test/h5diff/expected/h5diff_223.txt diff --git a/tools/test/h5diff/testfiles/h5diff_224.txt b/tools/test/h5diff/expected/h5diff_224.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_224.txt rename to tools/test/h5diff/expected/h5diff_224.txt diff --git a/tools/test/h5diff/testfiles/h5diff_23.txt b/tools/test/h5diff/expected/h5diff_23.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_23.txt rename to tools/test/h5diff/expected/h5diff_23.txt diff --git a/tools/test/h5diff/testfiles/h5diff_24.txt b/tools/test/h5diff/expected/h5diff_24.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_24.txt rename to tools/test/h5diff/expected/h5diff_24.txt diff --git a/tools/test/h5diff/testfiles/h5diff_25.txt b/tools/test/h5diff/expected/h5diff_25.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_25.txt rename to tools/test/h5diff/expected/h5diff_25.txt diff --git a/tools/test/h5diff/testfiles/h5diff_26.txt b/tools/test/h5diff/expected/h5diff_26.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_26.txt rename to tools/test/h5diff/expected/h5diff_26.txt diff --git a/tools/test/h5diff/testfiles/h5diff_27.txt b/tools/test/h5diff/expected/h5diff_27.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_27.txt rename to tools/test/h5diff/expected/h5diff_27.txt diff --git a/tools/test/h5diff/testfiles/h5diff_28.txt b/tools/test/h5diff/expected/h5diff_28.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_28.txt rename to tools/test/h5diff/expected/h5diff_28.txt diff --git a/tools/test/h5diff/testfiles/h5diff_30.txt b/tools/test/h5diff/expected/h5diff_30.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_30.txt rename to tools/test/h5diff/expected/h5diff_30.txt diff --git a/tools/test/h5diff/testfiles/h5diff_300.txt b/tools/test/h5diff/expected/h5diff_300.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_300.txt rename to tools/test/h5diff/expected/h5diff_300.txt diff --git a/tools/test/h5diff/testfiles/h5diff_400.txt b/tools/test/h5diff/expected/h5diff_400.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_400.txt rename to tools/test/h5diff/expected/h5diff_400.txt diff --git a/tools/test/h5diff/testfiles/h5diff_401.txt b/tools/test/h5diff/expected/h5diff_401.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_401.txt rename to tools/test/h5diff/expected/h5diff_401.txt diff --git a/tools/test/h5diff/testfiles/h5diff_402.txt b/tools/test/h5diff/expected/h5diff_402.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_402.txt rename to tools/test/h5diff/expected/h5diff_402.txt diff --git a/tools/test/h5diff/testfiles/h5diff_403.txt b/tools/test/h5diff/expected/h5diff_403.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_403.txt rename to tools/test/h5diff/expected/h5diff_403.txt diff --git a/tools/test/h5diff/testfiles/h5diff_404.txt b/tools/test/h5diff/expected/h5diff_404.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_404.txt rename to tools/test/h5diff/expected/h5diff_404.txt diff --git a/tools/test/h5diff/testfiles/h5diff_405.txt b/tools/test/h5diff/expected/h5diff_405.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_405.txt rename to tools/test/h5diff/expected/h5diff_405.txt diff --git a/tools/test/h5diff/testfiles/h5diff_406.txt b/tools/test/h5diff/expected/h5diff_406.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_406.txt rename to tools/test/h5diff/expected/h5diff_406.txt diff --git a/tools/test/h5diff/testfiles/h5diff_407.txt b/tools/test/h5diff/expected/h5diff_407.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_407.txt rename to tools/test/h5diff/expected/h5diff_407.txt diff --git a/tools/test/h5diff/testfiles/h5diff_408.txt b/tools/test/h5diff/expected/h5diff_408.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_408.txt rename to tools/test/h5diff/expected/h5diff_408.txt diff --git a/tools/test/h5diff/testfiles/h5diff_409.txt b/tools/test/h5diff/expected/h5diff_409.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_409.txt rename to tools/test/h5diff/expected/h5diff_409.txt diff --git a/tools/test/h5diff/testfiles/h5diff_410.txt b/tools/test/h5diff/expected/h5diff_410.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_410.txt rename to tools/test/h5diff/expected/h5diff_410.txt diff --git a/tools/test/h5diff/testfiles/h5diff_411.txt b/tools/test/h5diff/expected/h5diff_411.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_411.txt rename to tools/test/h5diff/expected/h5diff_411.txt diff --git a/tools/test/h5diff/testfiles/h5diff_412.txt b/tools/test/h5diff/expected/h5diff_412.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_412.txt rename to tools/test/h5diff/expected/h5diff_412.txt diff --git a/tools/test/h5diff/testfiles/h5diff_413.txt b/tools/test/h5diff/expected/h5diff_413.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_413.txt rename to tools/test/h5diff/expected/h5diff_413.txt diff --git a/tools/test/h5diff/testfiles/h5diff_414.txt b/tools/test/h5diff/expected/h5diff_414.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_414.txt rename to tools/test/h5diff/expected/h5diff_414.txt diff --git a/tools/test/h5diff/testfiles/h5diff_415.txt b/tools/test/h5diff/expected/h5diff_415.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_415.txt rename to tools/test/h5diff/expected/h5diff_415.txt diff --git a/tools/test/h5diff/testfiles/h5diff_416.txt b/tools/test/h5diff/expected/h5diff_416.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_416.txt rename to tools/test/h5diff/expected/h5diff_416.txt diff --git a/tools/test/h5diff/testfiles/h5diff_417.txt b/tools/test/h5diff/expected/h5diff_417.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_417.txt rename to tools/test/h5diff/expected/h5diff_417.txt diff --git a/tools/test/h5diff/testfiles/h5diff_418.txt b/tools/test/h5diff/expected/h5diff_418.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_418.txt rename to tools/test/h5diff/expected/h5diff_418.txt diff --git a/tools/test/h5diff/testfiles/h5diff_419.txt b/tools/test/h5diff/expected/h5diff_419.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_419.txt rename to tools/test/h5diff/expected/h5diff_419.txt diff --git a/tools/test/h5diff/testfiles/h5diff_420.txt b/tools/test/h5diff/expected/h5diff_420.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_420.txt rename to tools/test/h5diff/expected/h5diff_420.txt diff --git a/tools/test/h5diff/testfiles/h5diff_421.txt b/tools/test/h5diff/expected/h5diff_421.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_421.txt rename to tools/test/h5diff/expected/h5diff_421.txt diff --git a/tools/test/h5diff/testfiles/h5diff_422.txt b/tools/test/h5diff/expected/h5diff_422.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_422.txt rename to tools/test/h5diff/expected/h5diff_422.txt diff --git a/tools/test/h5diff/testfiles/h5diff_423.txt b/tools/test/h5diff/expected/h5diff_423.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_423.txt rename to tools/test/h5diff/expected/h5diff_423.txt diff --git a/tools/test/h5diff/testfiles/h5diff_424.txt b/tools/test/h5diff/expected/h5diff_424.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_424.txt rename to tools/test/h5diff/expected/h5diff_424.txt diff --git a/tools/test/h5diff/testfiles/h5diff_425.txt b/tools/test/h5diff/expected/h5diff_425.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_425.txt rename to tools/test/h5diff/expected/h5diff_425.txt diff --git a/tools/test/h5diff/testfiles/h5diff_450.txt b/tools/test/h5diff/expected/h5diff_450.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_450.txt rename to tools/test/h5diff/expected/h5diff_450.txt diff --git a/tools/test/h5diff/testfiles/h5diff_451.txt b/tools/test/h5diff/expected/h5diff_451.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_451.txt rename to tools/test/h5diff/expected/h5diff_451.txt diff --git a/tools/test/h5diff/testfiles/h5diff_452.txt b/tools/test/h5diff/expected/h5diff_452.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_452.txt rename to tools/test/h5diff/expected/h5diff_452.txt diff --git a/tools/test/h5diff/testfiles/h5diff_453.txt b/tools/test/h5diff/expected/h5diff_453.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_453.txt rename to tools/test/h5diff/expected/h5diff_453.txt diff --git a/tools/test/h5diff/testfiles/h5diff_454.txt b/tools/test/h5diff/expected/h5diff_454.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_454.txt rename to tools/test/h5diff/expected/h5diff_454.txt diff --git a/tools/test/h5diff/testfiles/h5diff_455.txt b/tools/test/h5diff/expected/h5diff_455.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_455.txt rename to tools/test/h5diff/expected/h5diff_455.txt diff --git a/tools/test/h5diff/testfiles/h5diff_456.txt b/tools/test/h5diff/expected/h5diff_456.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_456.txt rename to tools/test/h5diff/expected/h5diff_456.txt diff --git a/tools/test/h5diff/testfiles/h5diff_457.txt b/tools/test/h5diff/expected/h5diff_457.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_457.txt rename to tools/test/h5diff/expected/h5diff_457.txt diff --git a/tools/test/h5diff/testfiles/h5diff_458.txt b/tools/test/h5diff/expected/h5diff_458.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_458.txt rename to tools/test/h5diff/expected/h5diff_458.txt diff --git a/tools/test/h5diff/testfiles/h5diff_459.txt b/tools/test/h5diff/expected/h5diff_459.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_459.txt rename to tools/test/h5diff/expected/h5diff_459.txt diff --git a/tools/test/h5diff/testfiles/h5diff_465.txt b/tools/test/h5diff/expected/h5diff_465.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_465.txt rename to tools/test/h5diff/expected/h5diff_465.txt diff --git a/tools/test/h5diff/testfiles/h5diff_466.txt b/tools/test/h5diff/expected/h5diff_466.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_466.txt rename to tools/test/h5diff/expected/h5diff_466.txt diff --git a/tools/test/h5diff/testfiles/h5diff_467.txt b/tools/test/h5diff/expected/h5diff_467.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_467.txt rename to tools/test/h5diff/expected/h5diff_467.txt diff --git a/tools/test/h5diff/testfiles/h5diff_468.txt b/tools/test/h5diff/expected/h5diff_468.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_468.txt rename to tools/test/h5diff/expected/h5diff_468.txt diff --git a/tools/test/h5diff/testfiles/h5diff_469.txt b/tools/test/h5diff/expected/h5diff_469.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_469.txt rename to tools/test/h5diff/expected/h5diff_469.txt diff --git a/tools/test/h5diff/testfiles/h5diff_471.txt b/tools/test/h5diff/expected/h5diff_471.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_471.txt rename to tools/test/h5diff/expected/h5diff_471.txt diff --git a/tools/test/h5diff/testfiles/h5diff_472.txt b/tools/test/h5diff/expected/h5diff_472.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_472.txt rename to tools/test/h5diff/expected/h5diff_472.txt diff --git a/tools/test/h5diff/testfiles/h5diff_473.txt b/tools/test/h5diff/expected/h5diff_473.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_473.txt rename to tools/test/h5diff/expected/h5diff_473.txt diff --git a/tools/test/h5diff/testfiles/h5diff_474.txt b/tools/test/h5diff/expected/h5diff_474.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_474.txt rename to tools/test/h5diff/expected/h5diff_474.txt diff --git a/tools/test/h5diff/testfiles/h5diff_475.txt b/tools/test/h5diff/expected/h5diff_475.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_475.txt rename to tools/test/h5diff/expected/h5diff_475.txt diff --git a/tools/test/h5diff/testfiles/h5diff_480.txt b/tools/test/h5diff/expected/h5diff_480.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_480.txt rename to tools/test/h5diff/expected/h5diff_480.txt diff --git a/tools/test/h5diff/testfiles/h5diff_481.txt b/tools/test/h5diff/expected/h5diff_481.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_481.txt rename to tools/test/h5diff/expected/h5diff_481.txt diff --git a/tools/test/h5diff/testfiles/h5diff_482.txt b/tools/test/h5diff/expected/h5diff_482.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_482.txt rename to tools/test/h5diff/expected/h5diff_482.txt diff --git a/tools/test/h5diff/testfiles/h5diff_483.txt b/tools/test/h5diff/expected/h5diff_483.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_483.txt rename to tools/test/h5diff/expected/h5diff_483.txt diff --git a/tools/test/h5diff/testfiles/h5diff_484.txt b/tools/test/h5diff/expected/h5diff_484.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_484.txt rename to tools/test/h5diff/expected/h5diff_484.txt diff --git a/tools/test/h5diff/testfiles/h5diff_485.txt b/tools/test/h5diff/expected/h5diff_485.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_485.txt rename to tools/test/h5diff/expected/h5diff_485.txt diff --git a/tools/test/h5diff/testfiles/h5diff_486.txt b/tools/test/h5diff/expected/h5diff_486.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_486.txt rename to tools/test/h5diff/expected/h5diff_486.txt diff --git a/tools/test/h5diff/testfiles/h5diff_487.txt b/tools/test/h5diff/expected/h5diff_487.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_487.txt rename to tools/test/h5diff/expected/h5diff_487.txt diff --git a/tools/test/h5diff/testfiles/h5diff_50.txt b/tools/test/h5diff/expected/h5diff_50.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_50.txt rename to tools/test/h5diff/expected/h5diff_50.txt diff --git a/tools/test/h5diff/testfiles/h5diff_500.txt b/tools/test/h5diff/expected/h5diff_500.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_500.txt rename to tools/test/h5diff/expected/h5diff_500.txt diff --git a/tools/test/h5diff/testfiles/h5diff_501.txt b/tools/test/h5diff/expected/h5diff_501.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_501.txt rename to tools/test/h5diff/expected/h5diff_501.txt diff --git a/tools/test/h5diff/testfiles/h5diff_502.txt b/tools/test/h5diff/expected/h5diff_502.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_502.txt rename to tools/test/h5diff/expected/h5diff_502.txt diff --git a/tools/test/h5diff/testfiles/h5diff_503.txt b/tools/test/h5diff/expected/h5diff_503.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_503.txt rename to tools/test/h5diff/expected/h5diff_503.txt diff --git a/tools/test/h5diff/testfiles/h5diff_504.txt b/tools/test/h5diff/expected/h5diff_504.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_504.txt rename to tools/test/h5diff/expected/h5diff_504.txt diff --git a/tools/test/h5diff/testfiles/h5diff_505.txt b/tools/test/h5diff/expected/h5diff_505.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_505.txt rename to tools/test/h5diff/expected/h5diff_505.txt diff --git a/tools/test/h5diff/testfiles/h5diff_506.txt b/tools/test/h5diff/expected/h5diff_506.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_506.txt rename to tools/test/h5diff/expected/h5diff_506.txt diff --git a/tools/test/h5diff/testfiles/h5diff_507.txt b/tools/test/h5diff/expected/h5diff_507.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_507.txt rename to tools/test/h5diff/expected/h5diff_507.txt diff --git a/tools/test/h5diff/testfiles/h5diff_508.txt b/tools/test/h5diff/expected/h5diff_508.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_508.txt rename to tools/test/h5diff/expected/h5diff_508.txt diff --git a/tools/test/h5diff/testfiles/h5diff_509.txt b/tools/test/h5diff/expected/h5diff_509.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_509.txt rename to tools/test/h5diff/expected/h5diff_509.txt diff --git a/tools/test/h5diff/testfiles/h5diff_51.txt b/tools/test/h5diff/expected/h5diff_51.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_51.txt rename to tools/test/h5diff/expected/h5diff_51.txt diff --git a/tools/test/h5diff/testfiles/h5diff_510.txt b/tools/test/h5diff/expected/h5diff_510.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_510.txt rename to tools/test/h5diff/expected/h5diff_510.txt diff --git a/tools/test/h5diff/testfiles/h5diff_511.txt b/tools/test/h5diff/expected/h5diff_511.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_511.txt rename to tools/test/h5diff/expected/h5diff_511.txt diff --git a/tools/test/h5diff/testfiles/h5diff_512.txt b/tools/test/h5diff/expected/h5diff_512.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_512.txt rename to tools/test/h5diff/expected/h5diff_512.txt diff --git a/tools/test/h5diff/testfiles/h5diff_513.txt b/tools/test/h5diff/expected/h5diff_513.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_513.txt rename to tools/test/h5diff/expected/h5diff_513.txt diff --git a/tools/test/h5diff/testfiles/h5diff_514.txt b/tools/test/h5diff/expected/h5diff_514.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_514.txt rename to tools/test/h5diff/expected/h5diff_514.txt diff --git a/tools/test/h5diff/testfiles/h5diff_515.txt b/tools/test/h5diff/expected/h5diff_515.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_515.txt rename to tools/test/h5diff/expected/h5diff_515.txt diff --git a/tools/test/h5diff/testfiles/h5diff_516.txt b/tools/test/h5diff/expected/h5diff_516.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_516.txt rename to tools/test/h5diff/expected/h5diff_516.txt diff --git a/tools/test/h5diff/testfiles/h5diff_517.txt b/tools/test/h5diff/expected/h5diff_517.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_517.txt rename to tools/test/h5diff/expected/h5diff_517.txt diff --git a/tools/test/h5diff/testfiles/h5diff_518.txt b/tools/test/h5diff/expected/h5diff_518.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_518.txt rename to tools/test/h5diff/expected/h5diff_518.txt diff --git a/tools/test/h5diff/testfiles/h5diff_52.txt b/tools/test/h5diff/expected/h5diff_52.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_52.txt rename to tools/test/h5diff/expected/h5diff_52.txt diff --git a/tools/test/h5diff/testfiles/h5diff_53.txt b/tools/test/h5diff/expected/h5diff_53.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_53.txt rename to tools/test/h5diff/expected/h5diff_53.txt diff --git a/tools/test/h5diff/testfiles/h5diff_530.txt b/tools/test/h5diff/expected/h5diff_530.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_530.txt rename to tools/test/h5diff/expected/h5diff_530.txt diff --git a/tools/test/h5diff/testfiles/h5diff_54.txt b/tools/test/h5diff/expected/h5diff_54.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_54.txt rename to tools/test/h5diff/expected/h5diff_54.txt diff --git a/tools/test/h5diff/testfiles/h5diff_540.txt b/tools/test/h5diff/expected/h5diff_540.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_540.txt rename to tools/test/h5diff/expected/h5diff_540.txt diff --git a/tools/test/h5diff/testfiles/h5diff_55.txt b/tools/test/h5diff/expected/h5diff_55.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_55.txt rename to tools/test/h5diff/expected/h5diff_55.txt diff --git a/tools/test/h5diff/testfiles/h5diff_56.txt b/tools/test/h5diff/expected/h5diff_56.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_56.txt rename to tools/test/h5diff/expected/h5diff_56.txt diff --git a/tools/test/h5diff/testfiles/h5diff_57.txt b/tools/test/h5diff/expected/h5diff_57.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_57.txt rename to tools/test/h5diff/expected/h5diff_57.txt diff --git a/tools/test/h5diff/testfiles/h5diff_58.txt b/tools/test/h5diff/expected/h5diff_58.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_58.txt rename to tools/test/h5diff/expected/h5diff_58.txt diff --git a/tools/test/h5diff/testfiles/h5diff_58_ref.txt b/tools/test/h5diff/expected/h5diff_58_ref.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_58_ref.txt rename to tools/test/h5diff/expected/h5diff_58_ref.txt diff --git a/tools/test/h5diff/testfiles/h5diff_59.txt b/tools/test/h5diff/expected/h5diff_59.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_59.txt rename to tools/test/h5diff/expected/h5diff_59.txt diff --git a/tools/test/h5diff/testfiles/h5diff_60.txt b/tools/test/h5diff/expected/h5diff_60.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_60.txt rename to tools/test/h5diff/expected/h5diff_60.txt diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/expected/h5diff_600.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_600.txt rename to tools/test/h5diff/expected/h5diff_600.txt diff --git a/tools/test/h5diff/testfiles/h5diff_601.txt b/tools/test/h5diff/expected/h5diff_601.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_601.txt rename to tools/test/h5diff/expected/h5diff_601.txt diff --git a/tools/test/h5diff/testfiles/h5diff_601_ERR.err b/tools/test/h5diff/expected/h5diff_601_ERR.err similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_601_ERR.err rename to tools/test/h5diff/expected/h5diff_601_ERR.err diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/expected/h5diff_603.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_603.txt rename to tools/test/h5diff/expected/h5diff_603.txt diff --git a/tools/test/h5diff/testfiles/h5diff_604.txt b/tools/test/h5diff/expected/h5diff_604.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_604.txt rename to tools/test/h5diff/expected/h5diff_604.txt diff --git a/tools/test/h5diff/testfiles/h5diff_605.txt b/tools/test/h5diff/expected/h5diff_605.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_605.txt rename to tools/test/h5diff/expected/h5diff_605.txt diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/expected/h5diff_606.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_606.txt rename to tools/test/h5diff/expected/h5diff_606.txt diff --git a/tools/test/h5diff/testfiles/h5diff_607.txt b/tools/test/h5diff/expected/h5diff_607.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_607.txt rename to tools/test/h5diff/expected/h5diff_607.txt diff --git a/tools/test/h5diff/testfiles/h5diff_608.txt b/tools/test/h5diff/expected/h5diff_608.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_608.txt rename to tools/test/h5diff/expected/h5diff_608.txt diff --git a/tools/test/h5diff/testfiles/h5diff_609.txt b/tools/test/h5diff/expected/h5diff_609.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_609.txt rename to tools/test/h5diff/expected/h5diff_609.txt diff --git a/tools/test/h5diff/testfiles/h5diff_61.txt b/tools/test/h5diff/expected/h5diff_61.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_61.txt rename to tools/test/h5diff/expected/h5diff_61.txt diff --git a/tools/test/h5diff/testfiles/h5diff_610.txt b/tools/test/h5diff/expected/h5diff_610.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_610.txt rename to tools/test/h5diff/expected/h5diff_610.txt diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/expected/h5diff_612.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_612.txt rename to tools/test/h5diff/expected/h5diff_612.txt diff --git a/tools/test/h5diff/testfiles/h5diff_613.txt b/tools/test/h5diff/expected/h5diff_613.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_613.txt rename to tools/test/h5diff/expected/h5diff_613.txt diff --git a/tools/test/h5diff/testfiles/h5diff_614.txt b/tools/test/h5diff/expected/h5diff_614.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_614.txt rename to tools/test/h5diff/expected/h5diff_614.txt diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/expected/h5diff_615.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_615.txt rename to tools/test/h5diff/expected/h5diff_615.txt diff --git a/tools/test/h5diff/testfiles/h5diff_616.txt b/tools/test/h5diff/expected/h5diff_616.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_616.txt rename to tools/test/h5diff/expected/h5diff_616.txt diff --git a/tools/test/h5diff/testfiles/h5diff_617.txt b/tools/test/h5diff/expected/h5diff_617.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_617.txt rename to tools/test/h5diff/expected/h5diff_617.txt diff --git a/tools/test/h5diff/testfiles/h5diff_618.txt b/tools/test/h5diff/expected/h5diff_618.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_618.txt rename to tools/test/h5diff/expected/h5diff_618.txt diff --git a/tools/test/h5diff/testfiles/h5diff_619.txt b/tools/test/h5diff/expected/h5diff_619.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_619.txt rename to tools/test/h5diff/expected/h5diff_619.txt diff --git a/tools/test/h5diff/testfiles/h5diff_62.txt b/tools/test/h5diff/expected/h5diff_62.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_62.txt rename to tools/test/h5diff/expected/h5diff_62.txt diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/expected/h5diff_621.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_621.txt rename to tools/test/h5diff/expected/h5diff_621.txt diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/expected/h5diff_622.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_622.txt rename to tools/test/h5diff/expected/h5diff_622.txt diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/expected/h5diff_623.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_623.txt rename to tools/test/h5diff/expected/h5diff_623.txt diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/expected/h5diff_624.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_624.txt rename to tools/test/h5diff/expected/h5diff_624.txt diff --git a/tools/test/h5diff/testfiles/h5diff_625.txt b/tools/test/h5diff/expected/h5diff_625.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_625.txt rename to tools/test/h5diff/expected/h5diff_625.txt diff --git a/tools/test/h5diff/testfiles/h5diff_626.txt b/tools/test/h5diff/expected/h5diff_626.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_626.txt rename to tools/test/h5diff/expected/h5diff_626.txt diff --git a/tools/test/h5diff/testfiles/h5diff_627.txt b/tools/test/h5diff/expected/h5diff_627.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_627.txt rename to tools/test/h5diff/expected/h5diff_627.txt diff --git a/tools/test/h5diff/testfiles/h5diff_628.txt b/tools/test/h5diff/expected/h5diff_628.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_628.txt rename to tools/test/h5diff/expected/h5diff_628.txt diff --git a/tools/test/h5diff/testfiles/h5diff_629.txt b/tools/test/h5diff/expected/h5diff_629.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_629.txt rename to tools/test/h5diff/expected/h5diff_629.txt diff --git a/tools/test/h5diff/testfiles/h5diff_63.txt b/tools/test/h5diff/expected/h5diff_63.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_63.txt rename to tools/test/h5diff/expected/h5diff_63.txt diff --git a/tools/test/h5diff/testfiles/h5diff_630.txt b/tools/test/h5diff/expected/h5diff_630.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_630.txt rename to tools/test/h5diff/expected/h5diff_630.txt diff --git a/tools/test/h5diff/testfiles/h5diff_631.txt b/tools/test/h5diff/expected/h5diff_631.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_631.txt rename to tools/test/h5diff/expected/h5diff_631.txt diff --git a/tools/test/h5diff/testfiles/h5diff_640.txt b/tools/test/h5diff/expected/h5diff_640.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_640.txt rename to tools/test/h5diff/expected/h5diff_640.txt diff --git a/tools/test/h5diff/testfiles/h5diff_641.txt b/tools/test/h5diff/expected/h5diff_641.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_641.txt rename to tools/test/h5diff/expected/h5diff_641.txt diff --git a/tools/test/h5diff/testfiles/h5diff_642.txt b/tools/test/h5diff/expected/h5diff_642.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_642.txt rename to tools/test/h5diff/expected/h5diff_642.txt diff --git a/tools/test/h5diff/testfiles/h5diff_643.txt b/tools/test/h5diff/expected/h5diff_643.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_643.txt rename to tools/test/h5diff/expected/h5diff_643.txt diff --git a/tools/test/h5diff/testfiles/h5diff_644.txt b/tools/test/h5diff/expected/h5diff_644.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_644.txt rename to tools/test/h5diff/expected/h5diff_644.txt diff --git a/tools/test/h5diff/testfiles/h5diff_645.txt b/tools/test/h5diff/expected/h5diff_645.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_645.txt rename to tools/test/h5diff/expected/h5diff_645.txt diff --git a/tools/test/h5diff/testfiles/h5diff_646.txt b/tools/test/h5diff/expected/h5diff_646.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_646.txt rename to tools/test/h5diff/expected/h5diff_646.txt diff --git a/tools/test/h5diff/testfiles/h5diff_70.txt b/tools/test/h5diff/expected/h5diff_70.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_70.txt rename to tools/test/h5diff/expected/h5diff_70.txt diff --git a/tools/test/h5diff/testfiles/h5diff_700.txt b/tools/test/h5diff/expected/h5diff_700.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_700.txt rename to tools/test/h5diff/expected/h5diff_700.txt diff --git a/tools/test/h5diff/testfiles/h5diff_701.txt b/tools/test/h5diff/expected/h5diff_701.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_701.txt rename to tools/test/h5diff/expected/h5diff_701.txt diff --git a/tools/test/h5diff/testfiles/h5diff_702.txt b/tools/test/h5diff/expected/h5diff_702.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_702.txt rename to tools/test/h5diff/expected/h5diff_702.txt diff --git a/tools/test/h5diff/testfiles/h5diff_703.txt b/tools/test/h5diff/expected/h5diff_703.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_703.txt rename to tools/test/h5diff/expected/h5diff_703.txt diff --git a/tools/test/h5diff/testfiles/h5diff_704.txt b/tools/test/h5diff/expected/h5diff_704.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_704.txt rename to tools/test/h5diff/expected/h5diff_704.txt diff --git a/tools/test/h5diff/testfiles/h5diff_705.txt b/tools/test/h5diff/expected/h5diff_705.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_705.txt rename to tools/test/h5diff/expected/h5diff_705.txt diff --git a/tools/test/h5diff/testfiles/h5diff_706.txt b/tools/test/h5diff/expected/h5diff_706.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_706.txt rename to tools/test/h5diff/expected/h5diff_706.txt diff --git a/tools/test/h5diff/testfiles/h5diff_707.txt b/tools/test/h5diff/expected/h5diff_707.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_707.txt rename to tools/test/h5diff/expected/h5diff_707.txt diff --git a/tools/test/h5diff/testfiles/h5diff_708.txt b/tools/test/h5diff/expected/h5diff_708.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_708.txt rename to tools/test/h5diff/expected/h5diff_708.txt diff --git a/tools/test/h5diff/testfiles/h5diff_709.txt b/tools/test/h5diff/expected/h5diff_709.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_709.txt rename to tools/test/h5diff/expected/h5diff_709.txt diff --git a/tools/test/h5diff/testfiles/h5diff_710.txt b/tools/test/h5diff/expected/h5diff_710.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_710.txt rename to tools/test/h5diff/expected/h5diff_710.txt diff --git a/tools/test/h5diff/testfiles/h5diff_80.txt b/tools/test/h5diff/expected/h5diff_80.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_80.txt rename to tools/test/h5diff/expected/h5diff_80.txt diff --git a/tools/test/h5diff/testfiles/h5diff_800.txt b/tools/test/h5diff/expected/h5diff_800.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_800.txt rename to tools/test/h5diff/expected/h5diff_800.txt diff --git a/tools/test/h5diff/testfiles/h5diff_801.txt b/tools/test/h5diff/expected/h5diff_801.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_801.txt rename to tools/test/h5diff/expected/h5diff_801.txt diff --git a/tools/test/h5diff/testfiles/h5diff_830.txt b/tools/test/h5diff/expected/h5diff_830.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_830.txt rename to tools/test/h5diff/expected/h5diff_830.txt diff --git a/tools/test/h5diff/testfiles/h5diff_8625.txt b/tools/test/h5diff/expected/h5diff_8625.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_8625.txt rename to tools/test/h5diff/expected/h5diff_8625.txt diff --git a/tools/test/h5diff/testfiles/h5diff_8639.txt b/tools/test/h5diff/expected/h5diff_8639.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_8639.txt rename to tools/test/h5diff/expected/h5diff_8639.txt diff --git a/tools/test/h5diff/testfiles/h5diff_90.txt b/tools/test/h5diff/expected/h5diff_90.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_90.txt rename to tools/test/h5diff/expected/h5diff_90.txt diff --git a/tools/test/h5diff/testfiles/h5diff_900.txt b/tools/test/h5diff/expected/h5diff_900.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_900.txt rename to tools/test/h5diff/expected/h5diff_900.txt diff --git a/tools/test/h5diff/testfiles/h5diff_901.txt b/tools/test/h5diff/expected/h5diff_901.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_901.txt rename to tools/test/h5diff/expected/h5diff_901.txt diff --git a/tools/test/h5diff/testfiles/h5diff_902.txt b/tools/test/h5diff/expected/h5diff_902.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_902.txt rename to tools/test/h5diff/expected/h5diff_902.txt diff --git a/tools/test/h5diff/testfiles/h5diff_eps.txt b/tools/test/h5diff/expected/h5diff_eps.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_eps.txt rename to tools/test/h5diff/expected/h5diff_eps.txt diff --git a/tools/test/h5diff/testfiles/h5diff_reg.txt b/tools/test/h5diff/expected/h5diff_reg.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_reg.txt rename to tools/test/h5diff/expected/h5diff_reg.txt diff --git a/tools/test/h5diff/testfiles/h5diff_ud.txt b/tools/test/h5diff/expected/h5diff_ud.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_ud.txt rename to tools/test/h5diff/expected/h5diff_ud.txt diff --git a/tools/test/h5diff/testfiles/h5diff_udfail.err b/tools/test/h5diff/expected/h5diff_udfail.err similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_udfail.err rename to tools/test/h5diff/expected/h5diff_udfail.err diff --git a/tools/test/h5diff/testfiles/h5diff_udfail.txt b/tools/test/h5diff/expected/h5diff_udfail.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_udfail.txt rename to tools/test/h5diff/expected/h5diff_udfail.txt diff --git a/tools/test/h5diff/testfiles/h5diff_v1.txt b/tools/test/h5diff/expected/h5diff_v1.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_v1.txt rename to tools/test/h5diff/expected/h5diff_v1.txt diff --git a/tools/test/h5diff/testfiles/h5diff_v2.txt b/tools/test/h5diff/expected/h5diff_v2.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_v2.txt rename to tools/test/h5diff/expected/h5diff_v2.txt diff --git a/tools/test/h5diff/testfiles/h5diff_v3.txt b/tools/test/h5diff/expected/h5diff_v3.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_v3.txt rename to tools/test/h5diff/expected/h5diff_v3.txt diff --git a/tools/test/h5diff/testfiles/h5diff_vlstr.txt b/tools/test/h5diff/expected/h5diff_vlstr.txt similarity index 100% rename from tools/test/h5diff/testfiles/h5diff_vlstr.txt rename to tools/test/h5diff/expected/h5diff_vlstr.txt diff --git a/tools/test/h5diff/h5diff_plugin.sh.in b/tools/test/h5diff/h5diff_plugin.sh.in index e3f0f01314b..525503d68eb 100644 --- a/tools/test/h5diff/h5diff_plugin.sh.in +++ b/tools/test/h5diff/h5diff_plugin.sh.in @@ -45,6 +45,7 @@ SRC_TOOLS="$srcdir/../.." # testfiles source dirs for tools SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" +SRC_H5DIFF_OUTFILES="$SRC_TOOLS/test/h5diff/expected" TESTDIR=./testplug test -d $TESTDIR || mkdir $TESTDIR @@ -61,9 +62,9 @@ test -d $TESTDIR || mkdir $TESTDIR LIST_HDF5_TEST_FILES=" $SRC_H5DIFF_TESTFILES/tudfilter.h5 $SRC_H5DIFF_TESTFILES/tudfilter2.h5 -$SRC_H5DIFF_TESTFILES/h5diff_ud.txt -$SRC_H5DIFF_TESTFILES/h5diff_udfail.err -$SRC_H5DIFF_TESTFILES/h5diff_udfail.txt +$SRC_H5DIFF_OUTFILES/h5diff_ud.txt +$SRC_H5DIFF_OUTFILES/h5diff_udfail.err +$SRC_H5DIFF_OUTFILES/h5diff_udfail.txt " # Main Body diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in index 7cc82a1a08c..efaac2e4082 100644 --- a/tools/test/h5diff/testh5diff.sh.in +++ b/tools/test/h5diff/testh5diff.sh.in @@ -38,16 +38,16 @@ mydomainname=`domainname 2>/dev/null` # 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" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5DIFF_OUTFILES="$SRC_TOOLS/test/h5diff/expected" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -116,249 +116,249 @@ $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_ext.h5 $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_ext.h5.onion $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_1d.h5 $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_1d.h5.onion -$SRC_TOOLS_TESTFILES/tvlstr.h5 " LIST_HDF5_VDS_TEST_FILES=" -$SRC_TOOLS_TESTFILES/vds/1_a.h5 -$SRC_TOOLS_TESTFILES/vds/1_b.h5 -$SRC_TOOLS_TESTFILES/vds/1_c.h5 -$SRC_TOOLS_TESTFILES/vds/1_d.h5 -$SRC_TOOLS_TESTFILES/vds/1_e.h5 -$SRC_TOOLS_TESTFILES/vds/1_f.h5 -$SRC_TOOLS_TESTFILES/vds/1_vds.h5 -$SRC_TOOLS_TESTFILES/vds/2_a.h5 -$SRC_TOOLS_TESTFILES/vds/2_b.h5 -$SRC_TOOLS_TESTFILES/vds/2_c.h5 -$SRC_TOOLS_TESTFILES/vds/2_d.h5 -$SRC_TOOLS_TESTFILES/vds/2_e.h5 -$SRC_TOOLS_TESTFILES/vds/2_vds.h5 -$SRC_TOOLS_TESTFILES/vds/3_1_vds.h5 -$SRC_TOOLS_TESTFILES/vds/3_2_vds.h5 -$SRC_TOOLS_TESTFILES/vds/4_0.h5 -$SRC_TOOLS_TESTFILES/vds/4_1.h5 -$SRC_TOOLS_TESTFILES/vds/4_2.h5 -$SRC_TOOLS_TESTFILES/vds/4_vds.h5 -$SRC_TOOLS_TESTFILES/vds/5_a.h5 -$SRC_TOOLS_TESTFILES/vds/5_b.h5 -$SRC_TOOLS_TESTFILES/vds/5_c.h5 -$SRC_TOOLS_TESTFILES/vds/5_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/1_a.h5 +$SRC_H5DUMP_TESTFILES/vds/1_b.h5 +$SRC_H5DUMP_TESTFILES/vds/1_c.h5 +$SRC_H5DUMP_TESTFILES/vds/1_d.h5 +$SRC_H5DUMP_TESTFILES/vds/1_e.h5 +$SRC_H5DUMP_TESTFILES/vds/1_f.h5 +$SRC_H5DUMP_TESTFILES/vds/1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/2_a.h5 +$SRC_H5DUMP_TESTFILES/vds/2_b.h5 +$SRC_H5DUMP_TESTFILES/vds/2_c.h5 +$SRC_H5DUMP_TESTFILES/vds/2_d.h5 +$SRC_H5DUMP_TESTFILES/vds/2_e.h5 +$SRC_H5DUMP_TESTFILES/vds/2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/4_0.h5 +$SRC_H5DUMP_TESTFILES/vds/4_1.h5 +$SRC_H5DUMP_TESTFILES/vds/4_2.h5 +$SRC_H5DUMP_TESTFILES/vds/4_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/5_a.h5 +$SRC_H5DUMP_TESTFILES/vds/5_b.h5 +$SRC_H5DUMP_TESTFILES/vds/5_c.h5 +$SRC_H5DUMP_TESTFILES/vds/5_vds.h5 " LIST_HDF5_STD_REF_OBJ_TEST_FILES=" -$SRC_TOOLS_TESTFILES/trefer_attr.h5 -$SRC_TOOLS_TESTFILES/trefer_compat.h5 -$SRC_TOOLS_TESTFILES/trefer_ext1.h5 -$SRC_TOOLS_TESTFILES/trefer_ext2.h5 -$SRC_TOOLS_TESTFILES/trefer_grp.h5 -$SRC_TOOLS_TESTFILES/trefer_obj_del.h5 -$SRC_TOOLS_TESTFILES/trefer_obj.h5 -$SRC_TOOLS_TESTFILES/trefer_param.h5 -$SRC_TOOLS_TESTFILES/trefer_reg_1d.h5 -$SRC_TOOLS_TESTFILES/trefer_reg.h5 +$SRC_H5DUMP_TESTFILES/tvlstr.h5 +$SRC_H5DUMP_TESTFILES/trefer_attr.h5 +$SRC_H5DUMP_TESTFILES/trefer_compat.h5 +$SRC_H5DUMP_TESTFILES/trefer_ext1.h5 +$SRC_H5DUMP_TESTFILES/trefer_ext2.h5 +$SRC_H5DUMP_TESTFILES/trefer_grp.h5 +$SRC_H5DUMP_TESTFILES/trefer_obj_del.h5 +$SRC_H5DUMP_TESTFILES/trefer_obj.h5 +$SRC_H5DUMP_TESTFILES/trefer_param.h5 +$SRC_H5DUMP_TESTFILES/trefer_reg_1d.h5 +$SRC_H5DUMP_TESTFILES/trefer_reg.h5 " LIST_OTHER_TEST_FILES=" -$SRC_H5DIFF_TESTFILES/h5diff_10.txt -$SRC_H5DIFF_TESTFILES/h5diff_100.txt -$SRC_H5DIFF_TESTFILES/h5diff_101.txt -$SRC_H5DIFF_TESTFILES/h5diff_102.txt -$SRC_H5DIFF_TESTFILES/h5diff_103.txt -$SRC_H5DIFF_TESTFILES/h5diff_104.txt -$SRC_H5DIFF_TESTFILES/h5diff_11.txt -$SRC_H5DIFF_TESTFILES/h5diff_12.txt -$SRC_H5DIFF_TESTFILES/h5diff_13.txt -$SRC_H5DIFF_TESTFILES/h5diff_14.txt -$SRC_H5DIFF_TESTFILES/h5diff_15.txt -$SRC_H5DIFF_TESTFILES/h5diff_16_1.txt -$SRC_H5DIFF_TESTFILES/h5diff_16_2.txt -$SRC_H5DIFF_TESTFILES/h5diff_16_3.txt -$SRC_H5DIFF_TESTFILES/h5diff_17.txt -$SRC_H5DIFF_TESTFILES/h5diff_171.txt -$SRC_H5DIFF_TESTFILES/h5diff_172.txt -$SRC_H5DIFF_TESTFILES/h5diff_18_1.txt -$SRC_H5DIFF_TESTFILES/h5diff_18.txt -$SRC_H5DIFF_TESTFILES/h5diff_20.txt -$SRC_H5DIFF_TESTFILES/h5diff_200.txt -$SRC_H5DIFF_TESTFILES/h5diff_201.txt -$SRC_H5DIFF_TESTFILES/h5diff_202.txt -$SRC_H5DIFF_TESTFILES/h5diff_203.txt -$SRC_H5DIFF_TESTFILES/h5diff_204.txt -$SRC_H5DIFF_TESTFILES/h5diff_205.txt -$SRC_H5DIFF_TESTFILES/h5diff_206.txt -$SRC_H5DIFF_TESTFILES/h5diff_207.txt -$SRC_H5DIFF_TESTFILES/h5diff_208.txt -$SRC_H5DIFF_TESTFILES/h5diff_220.txt -$SRC_H5DIFF_TESTFILES/h5diff_221.txt -$SRC_H5DIFF_TESTFILES/h5diff_222.txt -$SRC_H5DIFF_TESTFILES/h5diff_223.txt -$SRC_H5DIFF_TESTFILES/h5diff_224.txt -$SRC_H5DIFF_TESTFILES/h5diff_21.txt -$SRC_H5DIFF_TESTFILES/h5diff_22.txt -$SRC_H5DIFF_TESTFILES/h5diff_23.txt -$SRC_H5DIFF_TESTFILES/h5diff_24.txt -$SRC_H5DIFF_TESTFILES/h5diff_25.txt -$SRC_H5DIFF_TESTFILES/h5diff_26.txt -$SRC_H5DIFF_TESTFILES/h5diff_27.txt -$SRC_H5DIFF_TESTFILES/h5diff_28.txt -$SRC_H5DIFF_TESTFILES/h5diff_30.txt -$SRC_H5DIFF_TESTFILES/h5diff_300.txt -$SRC_H5DIFF_TESTFILES/h5diff_400.txt -$SRC_H5DIFF_TESTFILES/h5diff_401.txt -$SRC_H5DIFF_TESTFILES/h5diff_402.txt -$SRC_H5DIFF_TESTFILES/h5diff_403.txt -$SRC_H5DIFF_TESTFILES/h5diff_404.txt -$SRC_H5DIFF_TESTFILES/h5diff_405.txt -$SRC_H5DIFF_TESTFILES/h5diff_406.txt -$SRC_H5DIFF_TESTFILES/h5diff_407.txt -$SRC_H5DIFF_TESTFILES/h5diff_408.txt -$SRC_H5DIFF_TESTFILES/h5diff_409.txt -$SRC_H5DIFF_TESTFILES/h5diff_410.txt -$SRC_H5DIFF_TESTFILES/h5diff_411.txt -$SRC_H5DIFF_TESTFILES/h5diff_412.txt -$SRC_H5DIFF_TESTFILES/h5diff_413.txt -$SRC_H5DIFF_TESTFILES/h5diff_414.txt -$SRC_H5DIFF_TESTFILES/h5diff_415.txt -$SRC_H5DIFF_TESTFILES/h5diff_416.txt -$SRC_H5DIFF_TESTFILES/h5diff_417.txt -$SRC_H5DIFF_TESTFILES/h5diff_418.txt -$SRC_H5DIFF_TESTFILES/h5diff_419.txt -$SRC_H5DIFF_TESTFILES/h5diff_420.txt -$SRC_H5DIFF_TESTFILES/h5diff_421.txt -$SRC_H5DIFF_TESTFILES/h5diff_422.txt -$SRC_H5DIFF_TESTFILES/h5diff_423.txt -$SRC_H5DIFF_TESTFILES/h5diff_424.txt -$SRC_H5DIFF_TESTFILES/h5diff_425.txt -$SRC_H5DIFF_TESTFILES/h5diff_450.txt -$SRC_H5DIFF_TESTFILES/h5diff_451.txt -$SRC_H5DIFF_TESTFILES/h5diff_452.txt -$SRC_H5DIFF_TESTFILES/h5diff_453.txt -$SRC_H5DIFF_TESTFILES/h5diff_454.txt -$SRC_H5DIFF_TESTFILES/dangling_link.err -$SRC_H5DIFF_TESTFILES/h5diff_455.txt -$SRC_H5DIFF_TESTFILES/h5diff_456.txt -$SRC_H5DIFF_TESTFILES/h5diff_457.txt -$SRC_H5DIFF_TESTFILES/h5diff_458.txt -$SRC_H5DIFF_TESTFILES/h5diff_459.txt -$SRC_H5DIFF_TESTFILES/h5diff_465.txt -$SRC_H5DIFF_TESTFILES/h5diff_466.txt -$SRC_H5DIFF_TESTFILES/h5diff_467.txt -$SRC_H5DIFF_TESTFILES/h5diff_468.txt -$SRC_H5DIFF_TESTFILES/h5diff_469.txt -$SRC_H5DIFF_TESTFILES/h5diff_471.txt -$SRC_H5DIFF_TESTFILES/h5diff_472.txt -$SRC_H5DIFF_TESTFILES/h5diff_473.txt -$SRC_H5DIFF_TESTFILES/h5diff_474.txt -$SRC_H5DIFF_TESTFILES/h5diff_475.txt -$SRC_H5DIFF_TESTFILES/h5diff_480.txt -$SRC_H5DIFF_TESTFILES/h5diff_481.txt -$SRC_H5DIFF_TESTFILES/h5diff_482.txt -$SRC_H5DIFF_TESTFILES/h5diff_483.txt -$SRC_H5DIFF_TESTFILES/h5diff_484.txt -$SRC_H5DIFF_TESTFILES/h5diff_485.txt -$SRC_H5DIFF_TESTFILES/h5diff_486.txt -$SRC_H5DIFF_TESTFILES/h5diff_487.txt -$SRC_H5DIFF_TESTFILES/h5diff_50.txt -$SRC_H5DIFF_TESTFILES/h5diff_51.txt -$SRC_H5DIFF_TESTFILES/h5diff_52.txt -$SRC_H5DIFF_TESTFILES/h5diff_53.txt -$SRC_H5DIFF_TESTFILES/h5diff_54.txt -$SRC_H5DIFF_TESTFILES/h5diff_55.txt -$SRC_H5DIFF_TESTFILES/h5diff_56.txt -$SRC_H5DIFF_TESTFILES/h5diff_57.txt -$SRC_H5DIFF_TESTFILES/h5diff_58.txt -$SRC_H5DIFF_TESTFILES/h5diff_58_ref.txt -$SRC_H5DIFF_TESTFILES/h5diff_59.txt -$SRC_H5DIFF_TESTFILES/h5diff_500.txt -$SRC_H5DIFF_TESTFILES/h5diff_501.txt -$SRC_H5DIFF_TESTFILES/h5diff_502.txt -$SRC_H5DIFF_TESTFILES/h5diff_503.txt -$SRC_H5DIFF_TESTFILES/h5diff_504.txt -$SRC_H5DIFF_TESTFILES/h5diff_505.txt -$SRC_H5DIFF_TESTFILES/h5diff_506.txt -$SRC_H5DIFF_TESTFILES/h5diff_507.txt -$SRC_H5DIFF_TESTFILES/h5diff_508.txt -$SRC_H5DIFF_TESTFILES/h5diff_509.txt -$SRC_H5DIFF_TESTFILES/h5diff_510.txt -$SRC_H5DIFF_TESTFILES/h5diff_511.txt -$SRC_H5DIFF_TESTFILES/h5diff_512.txt -$SRC_H5DIFF_TESTFILES/h5diff_513.txt -$SRC_H5DIFF_TESTFILES/h5diff_514.txt -$SRC_H5DIFF_TESTFILES/h5diff_515.txt -$SRC_H5DIFF_TESTFILES/h5diff_516.txt -$SRC_H5DIFF_TESTFILES/h5diff_517.txt -$SRC_H5DIFF_TESTFILES/h5diff_518.txt -$SRC_H5DIFF_TESTFILES/h5diff_530.txt -$SRC_H5DIFF_TESTFILES/h5diff_540.txt -$SRC_H5DIFF_TESTFILES/h5diff_60.txt -$SRC_H5DIFF_TESTFILES/h5diff_61.txt -$SRC_H5DIFF_TESTFILES/h5diff_62.txt -$SRC_H5DIFF_TESTFILES/h5diff_63.txt -$SRC_H5DIFF_TESTFILES/h5diff_600.txt -$SRC_H5DIFF_TESTFILES/h5diff_601.txt -$SRC_H5DIFF_TESTFILES/h5diff_601_ERR.err -$SRC_H5DIFF_TESTFILES/h5diff_603.txt -$SRC_H5DIFF_TESTFILES/h5diff_604.txt -$SRC_H5DIFF_TESTFILES/h5diff_605.txt -$SRC_H5DIFF_TESTFILES/h5diff_606.txt -$SRC_H5DIFF_TESTFILES/h5diff_607.txt -$SRC_H5DIFF_TESTFILES/h5diff_608.txt -$SRC_H5DIFF_TESTFILES/h5diff_609.txt -$SRC_H5DIFF_TESTFILES/h5diff_610.txt -$SRC_H5DIFF_TESTFILES/h5diff_612.txt -$SRC_H5DIFF_TESTFILES/h5diff_613.txt -$SRC_H5DIFF_TESTFILES/h5diff_614.txt -$SRC_H5DIFF_TESTFILES/h5diff_615.txt -$SRC_H5DIFF_TESTFILES/h5diff_616.txt -$SRC_H5DIFF_TESTFILES/h5diff_617.txt -$SRC_H5DIFF_TESTFILES/h5diff_618.txt -$SRC_H5DIFF_TESTFILES/h5diff_619.txt -$SRC_H5DIFF_TESTFILES/h5diff_621.txt -$SRC_H5DIFF_TESTFILES/h5diff_622.txt -$SRC_H5DIFF_TESTFILES/h5diff_623.txt -$SRC_H5DIFF_TESTFILES/h5diff_624.txt -$SRC_H5DIFF_TESTFILES/h5diff_625.txt -$SRC_H5DIFF_TESTFILES/h5diff_626.txt -$SRC_H5DIFF_TESTFILES/h5diff_627.txt -$SRC_H5DIFF_TESTFILES/h5diff_628.txt -$SRC_H5DIFF_TESTFILES/h5diff_629.txt -$SRC_H5DIFF_TESTFILES/h5diff_630.txt -$SRC_H5DIFF_TESTFILES/h5diff_631.txt -$SRC_H5DIFF_TESTFILES/h5diff_640.txt -$SRC_H5DIFF_TESTFILES/h5diff_641.txt -$SRC_H5DIFF_TESTFILES/h5diff_642.txt -$SRC_H5DIFF_TESTFILES/h5diff_643.txt -$SRC_H5DIFF_TESTFILES/h5diff_644.txt -$SRC_H5DIFF_TESTFILES/h5diff_645.txt -$SRC_H5DIFF_TESTFILES/h5diff_646.txt -$SRC_H5DIFF_TESTFILES/h5diff_70.txt -$SRC_H5DIFF_TESTFILES/h5diff_700.txt -$SRC_H5DIFF_TESTFILES/h5diff_701.txt -$SRC_H5DIFF_TESTFILES/h5diff_702.txt -$SRC_H5DIFF_TESTFILES/h5diff_703.txt -$SRC_H5DIFF_TESTFILES/h5diff_704.txt -$SRC_H5DIFF_TESTFILES/h5diff_705.txt -$SRC_H5DIFF_TESTFILES/h5diff_706.txt -$SRC_H5DIFF_TESTFILES/h5diff_707.txt -$SRC_H5DIFF_TESTFILES/h5diff_708.txt -$SRC_H5DIFF_TESTFILES/h5diff_709.txt -$SRC_H5DIFF_TESTFILES/h5diff_710.txt -$SRC_H5DIFF_TESTFILES/h5diff_80.txt -$SRC_H5DIFF_TESTFILES/h5diff_800.txt -$SRC_H5DIFF_TESTFILES/h5diff_801.txt -$SRC_H5DIFF_TESTFILES/h5diff_830.txt -$SRC_H5DIFF_TESTFILES/h5diff_90.txt -$SRC_H5DIFF_TESTFILES/h5diff_900.txt -$SRC_H5DIFF_TESTFILES/h5diff_901.txt -$SRC_H5DIFF_TESTFILES/h5diff_902.txt -$SRC_H5DIFF_TESTFILES/h5diff_8625.txt -$SRC_H5DIFF_TESTFILES/h5diff_8639.txt -$SRC_H5DIFF_TESTFILES/h5diff_reg.txt -$SRC_H5DIFF_TESTFILES/h5diff_v1.txt -$SRC_H5DIFF_TESTFILES/h5diff_v2.txt -$SRC_H5DIFF_TESTFILES/h5diff_v3.txt -$SRC_H5DIFF_TESTFILES/h5diff_vlstr.txt -$SRC_H5DIFF_TESTFILES/h5diff_eps.txt +$SRC_H5DIFF_OUTFILES/h5diff_10.txt +$SRC_H5DIFF_OUTFILES/h5diff_100.txt +$SRC_H5DIFF_OUTFILES/h5diff_101.txt +$SRC_H5DIFF_OUTFILES/h5diff_102.txt +$SRC_H5DIFF_OUTFILES/h5diff_103.txt +$SRC_H5DIFF_OUTFILES/h5diff_104.txt +$SRC_H5DIFF_OUTFILES/h5diff_11.txt +$SRC_H5DIFF_OUTFILES/h5diff_12.txt +$SRC_H5DIFF_OUTFILES/h5diff_13.txt +$SRC_H5DIFF_OUTFILES/h5diff_14.txt +$SRC_H5DIFF_OUTFILES/h5diff_15.txt +$SRC_H5DIFF_OUTFILES/h5diff_16_1.txt +$SRC_H5DIFF_OUTFILES/h5diff_16_2.txt +$SRC_H5DIFF_OUTFILES/h5diff_16_3.txt +$SRC_H5DIFF_OUTFILES/h5diff_17.txt +$SRC_H5DIFF_OUTFILES/h5diff_171.txt +$SRC_H5DIFF_OUTFILES/h5diff_172.txt +$SRC_H5DIFF_OUTFILES/h5diff_18_1.txt +$SRC_H5DIFF_OUTFILES/h5diff_18.txt +$SRC_H5DIFF_OUTFILES/h5diff_20.txt +$SRC_H5DIFF_OUTFILES/h5diff_200.txt +$SRC_H5DIFF_OUTFILES/h5diff_201.txt +$SRC_H5DIFF_OUTFILES/h5diff_202.txt +$SRC_H5DIFF_OUTFILES/h5diff_203.txt +$SRC_H5DIFF_OUTFILES/h5diff_204.txt +$SRC_H5DIFF_OUTFILES/h5diff_205.txt +$SRC_H5DIFF_OUTFILES/h5diff_206.txt +$SRC_H5DIFF_OUTFILES/h5diff_207.txt +$SRC_H5DIFF_OUTFILES/h5diff_208.txt +$SRC_H5DIFF_OUTFILES/h5diff_220.txt +$SRC_H5DIFF_OUTFILES/h5diff_221.txt +$SRC_H5DIFF_OUTFILES/h5diff_222.txt +$SRC_H5DIFF_OUTFILES/h5diff_223.txt +$SRC_H5DIFF_OUTFILES/h5diff_224.txt +$SRC_H5DIFF_OUTFILES/h5diff_21.txt +$SRC_H5DIFF_OUTFILES/h5diff_22.txt +$SRC_H5DIFF_OUTFILES/h5diff_23.txt +$SRC_H5DIFF_OUTFILES/h5diff_24.txt +$SRC_H5DIFF_OUTFILES/h5diff_25.txt +$SRC_H5DIFF_OUTFILES/h5diff_26.txt +$SRC_H5DIFF_OUTFILES/h5diff_27.txt +$SRC_H5DIFF_OUTFILES/h5diff_28.txt +$SRC_H5DIFF_OUTFILES/h5diff_30.txt +$SRC_H5DIFF_OUTFILES/h5diff_300.txt +$SRC_H5DIFF_OUTFILES/h5diff_400.txt +$SRC_H5DIFF_OUTFILES/h5diff_401.txt +$SRC_H5DIFF_OUTFILES/h5diff_402.txt +$SRC_H5DIFF_OUTFILES/h5diff_403.txt +$SRC_H5DIFF_OUTFILES/h5diff_404.txt +$SRC_H5DIFF_OUTFILES/h5diff_405.txt +$SRC_H5DIFF_OUTFILES/h5diff_406.txt +$SRC_H5DIFF_OUTFILES/h5diff_407.txt +$SRC_H5DIFF_OUTFILES/h5diff_408.txt +$SRC_H5DIFF_OUTFILES/h5diff_409.txt +$SRC_H5DIFF_OUTFILES/h5diff_410.txt +$SRC_H5DIFF_OUTFILES/h5diff_411.txt +$SRC_H5DIFF_OUTFILES/h5diff_412.txt +$SRC_H5DIFF_OUTFILES/h5diff_413.txt +$SRC_H5DIFF_OUTFILES/h5diff_414.txt +$SRC_H5DIFF_OUTFILES/h5diff_415.txt +$SRC_H5DIFF_OUTFILES/h5diff_416.txt +$SRC_H5DIFF_OUTFILES/h5diff_417.txt +$SRC_H5DIFF_OUTFILES/h5diff_418.txt +$SRC_H5DIFF_OUTFILES/h5diff_419.txt +$SRC_H5DIFF_OUTFILES/h5diff_420.txt +$SRC_H5DIFF_OUTFILES/h5diff_421.txt +$SRC_H5DIFF_OUTFILES/h5diff_422.txt +$SRC_H5DIFF_OUTFILES/h5diff_423.txt +$SRC_H5DIFF_OUTFILES/h5diff_424.txt +$SRC_H5DIFF_OUTFILES/h5diff_425.txt +$SRC_H5DIFF_OUTFILES/h5diff_450.txt +$SRC_H5DIFF_OUTFILES/h5diff_451.txt +$SRC_H5DIFF_OUTFILES/h5diff_452.txt +$SRC_H5DIFF_OUTFILES/h5diff_453.txt +$SRC_H5DIFF_OUTFILES/h5diff_454.txt +$SRC_H5DIFF_OUTFILES/dangling_link.err +$SRC_H5DIFF_OUTFILES/h5diff_455.txt +$SRC_H5DIFF_OUTFILES/h5diff_456.txt +$SRC_H5DIFF_OUTFILES/h5diff_457.txt +$SRC_H5DIFF_OUTFILES/h5diff_458.txt +$SRC_H5DIFF_OUTFILES/h5diff_459.txt +$SRC_H5DIFF_OUTFILES/h5diff_465.txt +$SRC_H5DIFF_OUTFILES/h5diff_466.txt +$SRC_H5DIFF_OUTFILES/h5diff_467.txt +$SRC_H5DIFF_OUTFILES/h5diff_468.txt +$SRC_H5DIFF_OUTFILES/h5diff_469.txt +$SRC_H5DIFF_OUTFILES/h5diff_471.txt +$SRC_H5DIFF_OUTFILES/h5diff_472.txt +$SRC_H5DIFF_OUTFILES/h5diff_473.txt +$SRC_H5DIFF_OUTFILES/h5diff_474.txt +$SRC_H5DIFF_OUTFILES/h5diff_475.txt +$SRC_H5DIFF_OUTFILES/h5diff_480.txt +$SRC_H5DIFF_OUTFILES/h5diff_481.txt +$SRC_H5DIFF_OUTFILES/h5diff_482.txt +$SRC_H5DIFF_OUTFILES/h5diff_483.txt +$SRC_H5DIFF_OUTFILES/h5diff_484.txt +$SRC_H5DIFF_OUTFILES/h5diff_485.txt +$SRC_H5DIFF_OUTFILES/h5diff_486.txt +$SRC_H5DIFF_OUTFILES/h5diff_487.txt +$SRC_H5DIFF_OUTFILES/h5diff_50.txt +$SRC_H5DIFF_OUTFILES/h5diff_51.txt +$SRC_H5DIFF_OUTFILES/h5diff_52.txt +$SRC_H5DIFF_OUTFILES/h5diff_53.txt +$SRC_H5DIFF_OUTFILES/h5diff_54.txt +$SRC_H5DIFF_OUTFILES/h5diff_55.txt +$SRC_H5DIFF_OUTFILES/h5diff_56.txt +$SRC_H5DIFF_OUTFILES/h5diff_57.txt +$SRC_H5DIFF_OUTFILES/h5diff_58.txt +$SRC_H5DIFF_OUTFILES/h5diff_58_ref.txt +$SRC_H5DIFF_OUTFILES/h5diff_59.txt +$SRC_H5DIFF_OUTFILES/h5diff_500.txt +$SRC_H5DIFF_OUTFILES/h5diff_501.txt +$SRC_H5DIFF_OUTFILES/h5diff_502.txt +$SRC_H5DIFF_OUTFILES/h5diff_503.txt +$SRC_H5DIFF_OUTFILES/h5diff_504.txt +$SRC_H5DIFF_OUTFILES/h5diff_505.txt +$SRC_H5DIFF_OUTFILES/h5diff_506.txt +$SRC_H5DIFF_OUTFILES/h5diff_507.txt +$SRC_H5DIFF_OUTFILES/h5diff_508.txt +$SRC_H5DIFF_OUTFILES/h5diff_509.txt +$SRC_H5DIFF_OUTFILES/h5diff_510.txt +$SRC_H5DIFF_OUTFILES/h5diff_511.txt +$SRC_H5DIFF_OUTFILES/h5diff_512.txt +$SRC_H5DIFF_OUTFILES/h5diff_513.txt +$SRC_H5DIFF_OUTFILES/h5diff_514.txt +$SRC_H5DIFF_OUTFILES/h5diff_515.txt +$SRC_H5DIFF_OUTFILES/h5diff_516.txt +$SRC_H5DIFF_OUTFILES/h5diff_517.txt +$SRC_H5DIFF_OUTFILES/h5diff_518.txt +$SRC_H5DIFF_OUTFILES/h5diff_530.txt +$SRC_H5DIFF_OUTFILES/h5diff_540.txt +$SRC_H5DIFF_OUTFILES/h5diff_60.txt +$SRC_H5DIFF_OUTFILES/h5diff_61.txt +$SRC_H5DIFF_OUTFILES/h5diff_62.txt +$SRC_H5DIFF_OUTFILES/h5diff_63.txt +$SRC_H5DIFF_OUTFILES/h5diff_600.txt +$SRC_H5DIFF_OUTFILES/h5diff_601.txt +$SRC_H5DIFF_OUTFILES/h5diff_601_ERR.err +$SRC_H5DIFF_OUTFILES/h5diff_603.txt +$SRC_H5DIFF_OUTFILES/h5diff_604.txt +$SRC_H5DIFF_OUTFILES/h5diff_605.txt +$SRC_H5DIFF_OUTFILES/h5diff_606.txt +$SRC_H5DIFF_OUTFILES/h5diff_607.txt +$SRC_H5DIFF_OUTFILES/h5diff_608.txt +$SRC_H5DIFF_OUTFILES/h5diff_609.txt +$SRC_H5DIFF_OUTFILES/h5diff_610.txt +$SRC_H5DIFF_OUTFILES/h5diff_612.txt +$SRC_H5DIFF_OUTFILES/h5diff_613.txt +$SRC_H5DIFF_OUTFILES/h5diff_614.txt +$SRC_H5DIFF_OUTFILES/h5diff_615.txt +$SRC_H5DIFF_OUTFILES/h5diff_616.txt +$SRC_H5DIFF_OUTFILES/h5diff_617.txt +$SRC_H5DIFF_OUTFILES/h5diff_618.txt +$SRC_H5DIFF_OUTFILES/h5diff_619.txt +$SRC_H5DIFF_OUTFILES/h5diff_621.txt +$SRC_H5DIFF_OUTFILES/h5diff_622.txt +$SRC_H5DIFF_OUTFILES/h5diff_623.txt +$SRC_H5DIFF_OUTFILES/h5diff_624.txt +$SRC_H5DIFF_OUTFILES/h5diff_625.txt +$SRC_H5DIFF_OUTFILES/h5diff_626.txt +$SRC_H5DIFF_OUTFILES/h5diff_627.txt +$SRC_H5DIFF_OUTFILES/h5diff_628.txt +$SRC_H5DIFF_OUTFILES/h5diff_629.txt +$SRC_H5DIFF_OUTFILES/h5diff_630.txt +$SRC_H5DIFF_OUTFILES/h5diff_631.txt +$SRC_H5DIFF_OUTFILES/h5diff_640.txt +$SRC_H5DIFF_OUTFILES/h5diff_641.txt +$SRC_H5DIFF_OUTFILES/h5diff_642.txt +$SRC_H5DIFF_OUTFILES/h5diff_643.txt +$SRC_H5DIFF_OUTFILES/h5diff_644.txt +$SRC_H5DIFF_OUTFILES/h5diff_645.txt +$SRC_H5DIFF_OUTFILES/h5diff_646.txt +$SRC_H5DIFF_OUTFILES/h5diff_70.txt +$SRC_H5DIFF_OUTFILES/h5diff_700.txt +$SRC_H5DIFF_OUTFILES/h5diff_701.txt +$SRC_H5DIFF_OUTFILES/h5diff_702.txt +$SRC_H5DIFF_OUTFILES/h5diff_703.txt +$SRC_H5DIFF_OUTFILES/h5diff_704.txt +$SRC_H5DIFF_OUTFILES/h5diff_705.txt +$SRC_H5DIFF_OUTFILES/h5diff_706.txt +$SRC_H5DIFF_OUTFILES/h5diff_707.txt +$SRC_H5DIFF_OUTFILES/h5diff_708.txt +$SRC_H5DIFF_OUTFILES/h5diff_709.txt +$SRC_H5DIFF_OUTFILES/h5diff_710.txt +$SRC_H5DIFF_OUTFILES/h5diff_80.txt +$SRC_H5DIFF_OUTFILES/h5diff_800.txt +$SRC_H5DIFF_OUTFILES/h5diff_801.txt +$SRC_H5DIFF_OUTFILES/h5diff_830.txt +$SRC_H5DIFF_OUTFILES/h5diff_90.txt +$SRC_H5DIFF_OUTFILES/h5diff_900.txt +$SRC_H5DIFF_OUTFILES/h5diff_901.txt +$SRC_H5DIFF_OUTFILES/h5diff_902.txt +$SRC_H5DIFF_OUTFILES/h5diff_8625.txt +$SRC_H5DIFF_OUTFILES/h5diff_8639.txt +$SRC_H5DIFF_OUTFILES/h5diff_reg.txt +$SRC_H5DIFF_OUTFILES/h5diff_v1.txt +$SRC_H5DIFF_OUTFILES/h5diff_v2.txt +$SRC_H5DIFF_OUTFILES/h5diff_v3.txt +$SRC_H5DIFF_OUTFILES/h5diff_vlstr.txt +$SRC_H5DIFF_OUTFILES/h5diff_eps.txt " # @@ -588,7 +588,7 @@ SKIP() { # prepare for test COPY_TESTFILES_TO_TESTDIR # second copy of tvlstr.h5 -$CP -f $SRC_TOOLS_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5 +$CP -f $SRC_H5DUMP_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5 # ############################################################################ # # Common usage diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake index c328ef129e2..7ed021fce1c 100644 --- a/tools/test/h5dump/CMakeTests.cmake +++ b/tools/test/h5dump/CMakeTests.cmake @@ -20,210 +20,210 @@ # Copy all the HDF5 files from the test directory into the source directory # -------------------------------------------------------------------- set (HDF5_REFERENCE_FILES - ${HDF5_TOOLS_DIR}/testfiles/charsets.ddl - ${HDF5_TOOLS_DIR}/testfiles/err_attr_dspace.ddl - ${HDF5_TOOLS_DIR}/testfiles/file_space.ddl - ${HDF5_TOOLS_DIR}/testfiles/filter_fail.ddl - ${HDF5_TOOLS_DIR}/testfiles/non_existing.ddl - ${HDF5_TOOLS_DIR}/testfiles/packedbits.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-2A.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-2A0.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-2B.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-4s.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-5s.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-6.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-7.ddl - ${HDF5_TOOLS_DIR}/testfiles/tall-7N.ddl - ${HDF5_TOOLS_DIR}/testfiles/tallfilters.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray5.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray6.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray7.ddl - ${HDF5_TOOLS_DIR}/testfiles/tarray8.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattr-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattr-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattr-3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattr-4_be.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattrcontents1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattrcontents2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattrreg.ddl - ${HDF5_TOOLS_DIR}/testfiles/tattrregR.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbin2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbin3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbin4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbinregR.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbigdims.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque_be.ddl - ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque_le.ddl - ${HDF5_TOOLS_DIR}/testfiles/tboot1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tboot2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tboot2A.ddl - ${HDF5_TOOLS_DIR}/testfiles/tboot2B.ddl - ${HDF5_TOOLS_DIR}/testfiles/tchar1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tchunked.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcomp-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcomp-3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcomp-4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcompact.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcontents.ddl - ${HDF5_TOOLS_DIR}/testfiles/tcontiguos.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdataregR.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdeflate.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdset-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tdset-3s.ddl - ${HDF5_TOOLS_DIR}/testfiles/tempty.ddl - ${HDF5_TOOLS_DIR}/testfiles/texceedsubstart.ddl - ${HDF5_TOOLS_DIR}/testfiles/texceedsubcount.ddl - ${HDF5_TOOLS_DIR}/testfiles/texceedsubstride.ddl - ${HDF5_TOOLS_DIR}/testfiles/texceedsubblock.ddl - ${HDF5_TOOLS_DIR}/testfiles/texternal.ddl - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.ddl - ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.ddl - ${HDF5_TOOLS_DIR}/testfiles/textlink.ddl - ${HDF5_TOOLS_DIR}/testfiles/tfamily.ddl - ${HDF5_TOOLS_DIR}/testfiles/tfill.ddl - ${HDF5_TOOLS_DIR}/testfiles/tfletcher32.ddl - #${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.ddl #native - #${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.wddl #special for windows - ${HDF5_TOOLS_DIR}/testfiles/tfpformat.ddl - ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ddl - ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.ddl - ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/thlink-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/thlink-3.ddl - ${HDF5_TOOLS_DIR}/testfiles/thlink-4.ddl - ${HDF5_TOOLS_DIR}/testfiles/thlink-5.ddl - ${HDF5_TOOLS_DIR}/testfiles/thyperslab.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicesno.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicessub1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicessub2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicessub3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicessub4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tindicesyes.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dims.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlock2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlockEq.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCount2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCountEq.ddl - ${HDF5_TOOLS_DIR}/testfiles/tints4dimsStride2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.ddl - ${HDF5_TOOLS_DIR}/testfiles/tintsnodata.ddl - ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.ddl - ${HDF5_TOOLS_DIR}/testfiles/tldouble.ddl - ${HDF5_TOOLS_DIR}/testfiles/tldouble_scalar.ddl - ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.ddl - ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tmulti.ddl - ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ddl - #${HDF5_TOOLS_DIR}/testfiles/tqmarkfile.ddl - #${HDF5_TOOLS_DIR}/testfiles/tstarfile.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnbit.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnoattrdata.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnoattrddl.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnodata.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnoddl.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnoddlfile.ddl - ${HDF5_TOOLS_DIR}/testfiles/tno-subset.ddl - ${HDF5_TOOLS_DIR}/testfiles/tnullspace.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordergr1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordergr2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordergr3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordergr4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordergr5.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderattr1.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderattr2.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderattr3.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderattr4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordercontents1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tordercontents2.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderlinks1.ddl - ${HDF5_TOOLS_DIR}/testfiles/torderlinks2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tperror.ddl - ${HDF5_TOOLS_DIR}/testfiles/trawdatafile.ddl - ${HDF5_TOOLS_DIR}/testfiles/trawssetfile.ddl - ${HDF5_TOOLS_DIR}/testfiles/treadfilter.ddl - ${HDF5_TOOLS_DIR}/testfiles/treadintfilter.ddl - ${HDF5_TOOLS_DIR}/testfiles/treference.ddl - ${HDF5_TOOLS_DIR}/testfiles/tsaf.ddl - ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.ddl - ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.ddl - ${HDF5_TOOLS_DIR}/testfiles/tscaleoffset.ddl - ${HDF5_TOOLS_DIR}/testfiles/tshuffle.ddl - ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tslink-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tslink-D.ddl - ${HDF5_TOOLS_DIR}/testfiles/tsplit_file.ddl - ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tstr-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tstring.ddl - ${HDF5_TOOLS_DIR}/testfiles/tstring2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tstringe.ddl - ${HDF5_TOOLS_DIR}/testfiles/tszip.ddl - ${HDF5_TOOLS_DIR}/testfiles/tudfilter.ddl - ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tudlink-2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tuserfilter.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvlenstr_array.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvlstr.ddl - ${HDF5_TOOLS_DIR}/testfiles/tvms.ddl - ${HDF5_TOOLS_DIR}/testfiles/twidedisplay.ddl - ${HDF5_TOOLS_DIR}/testfiles/twithddlfile.ddl - ${HDF5_TOOLS_DIR}/testfiles/h5dump-help.txt - ${HDF5_TOOLS_DIR}/testfiles/out3.h5import - ${HDF5_TOOLS_DIR}/testfiles/zerodim.ddl + charsets.ddl + err_attr_dspace.ddl + file_space.ddl + filter_fail.ddl + non_existing.ddl + packedbits.ddl + tall-1.ddl + tall-2.ddl + tall-2A.ddl + tall-2A0.ddl + tall-2B.ddl + tall-3.ddl + tall-4s.ddl + tall-5s.ddl + tall-6.ddl + tall-7.ddl + tall-7N.ddl + tallfilters.ddl + tarray1.ddl + tarray1_big.ddl + tarray2.ddl + tarray3.ddl + tarray4.ddl + tarray5.ddl + tarray6.ddl + tarray7.ddl + tarray8.ddl + tattr-1.ddl + tattr-2.ddl + tattr-3.ddl + tattr-4_be.ddl + tattrcontents1.ddl + tattrcontents2.ddl + tattrintsize.ddl + tattrreg.ddl + tattrregR.ddl + tbin1.ddl + tbin1.ddl + tbin2.ddl + tbin3.ddl + tbin4.ddl + tbinregR.ddl + tbigdims.ddl + tbitnopaque_be.ddl + tbitnopaque_le.ddl + tboot1.ddl + tboot2.ddl + tboot2A.ddl + tboot2B.ddl + tchar1.ddl + tchunked.ddl + tcmpdattrintsize.ddl + tcmpdintarray.ddl + tcmpdints.ddl + tcmpdintsize.ddl + tcompound_complex2.ddl + tcomp-1.ddl + tcomp-2.ddl + tcomp-3.ddl + tcomp-4.ddl + tcompact.ddl + tcontents.ddl + tcontiguos.ddl + tdatareg.ddl + tdataregR.ddl + tdeflate.ddl + tdset-1.ddl + tdset-2.ddl + tdset-3s.ddl + tempty.ddl + texceedsubstart.ddl + texceedsubcount.ddl + texceedsubstride.ddl + texceedsubblock.ddl + texternal.ddl + textlinksrc.ddl + textlinkfar.ddl + textlink.ddl + tfamily.ddl + tfill.ddl + tfletcher32.ddl + #tfloatsattrs.ddl #native + #tfloatsattrs.wddl #special for windows + tfpformat.ddl + tgroup-1.ddl + tgroup-2.ddl + tgrp_comments.ddl + tgrpnullspace.ddl + thlink-1.ddl + thlink-2.ddl + thlink-3.ddl + thlink-4.ddl + thlink-5.ddl + thyperslab.ddl + tindicesno.ddl + tindicessub1.ddl + tindicessub2.ddl + tindicessub3.ddl + tindicessub4.ddl + tindicesyes.ddl + tints4dims.ddl + tints4dimsBlock2.ddl + tints4dimsBlockEq.ddl + tints4dimsCount2.ddl + tints4dimsCountEq.ddl + tints4dimsStride2.ddl + tintsattrs.ddl + tintsnodata.ddl + tlarge_objname.ddl + tldouble.ddl + tldouble_scalar.ddl + tlonglinks.ddl + tloop-1.ddl + tmulti.ddl + tmultifile.ddl + #tqmarkfile.ddl + #tstarfile.ddl + tnamed_dtype_attr.ddl + tnestcomp-1.ddl + tnestedcmpddt.ddl + tnbit.ddl + tnoattrdata.ddl + tnoattrddl.ddl + tnodata.ddl + tnoddl.ddl + tnoddlfile.ddl + tno-subset.ddl + tnullspace.ddl + tordergr1.ddl + tordergr2.ddl + tordergr3.ddl + tordergr4.ddl + tordergr5.ddl + torderattr1.ddl + torderattr2.ddl + torderattr3.ddl + torderattr4.ddl + tordercontents1.ddl + tordercontents2.ddl + torderlinks1.ddl + torderlinks2.ddl + tperror.ddl + trawdatafile.ddl + trawssetfile.ddl + treadfilter.ddl + treadintfilter.ddl + treference.ddl + tsaf.ddl + tscalarattrintsize.ddl + tscalarintattrsize.ddl + tscalarintsize.ddl + tscalarstring.ddl + tscaleoffset.ddl + tshuffle.ddl + tslink-1.ddl + tslink-2.ddl + tslink-D.ddl + tsplit_file.ddl + tstr-1.ddl + tstr-2.ddl + tstring.ddl + tstring2.ddl + tstringe.ddl + tszip.ddl + tudfilter.ddl + tudlink-1.ddl + tudlink-2.ddl + tuserfilter.ddl + tvldtypes1.ddl + tvldtypes2.ddl + tvldtypes3.ddl + tvldtypes4.ddl + tvldtypes5.ddl + tvlenstr_array.ddl + tvlstr.ddl + tvms.ddl + twidedisplay.ddl + twithddlfile.ddl + h5dump-help.txt + out3.h5import + zerodim.ddl #STD_REF_OBJ files - ${HDF5_TOOLS_DIR}/testfiles/trefer_attrR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_compatR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_extR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_grpR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_delR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_objR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_paramR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1dR.ddl - ${HDF5_TOOLS_DIR}/testfiles/trefer_regR.ddl + trefer_attrR.ddl + trefer_compatR.ddl + trefer_extR.ddl + trefer_grpR.ddl + trefer_obj_delR.ddl + trefer_objR.ddl + trefer_paramR.ddl + trefer_reg_1dR.ddl + trefer_regR.ddl # Onion VFD files - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.ddl - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.ddl - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.ddl - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_revision_count.ddl + tst_onion_objs.ddl + tst_onion_dset_ext.ddl + tst_onion_dset_1d.ddl + tst_onion_revision_count.ddl ) set (HDF5_N_REFERENCE_FILES - tall-3 - tattr-2 - tcomp-2 - thlink-4 - thlink-5 - tslink-2 + tall-3.ddl + tattr-2.ddl + tcomp-2.ddl + thlink-4.ddl + thlink-5.ddl + tslink-2.ddl ) set (HDF5_REFERENCE_EXP_FILES tall-6.exp @@ -236,159 +236,159 @@ twithddlfile.exp ) set (HDF5_REFERENCE_TEST_FILES - ${HDF5_TOOLS_DIR}/testfiles/charsets.h5 - ${HDF5_TOOLS_DIR}/testfiles/err_attr_dspace.h5 - ${HDF5_TOOLS_DIR}/testfiles/file_space.h5 - ${HDF5_TOOLS_DIR}/testfiles/filter_fail.h5 - ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5 - ${HDF5_TOOLS_DIR}/testfiles/taindices.h5 - ${HDF5_TOOLS_DIR}/testfiles/tall.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray4.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray5.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray8.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattr4_be.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tbigdims.h5 - ${HDF5_TOOLS_DIR}/testfiles/tbinary.h5 - ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque.h5 - ${HDF5_TOOLS_DIR}/testfiles/tchar.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdset.h5 - ${HDF5_TOOLS_DIR}/testfiles/tempty.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfcontents1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfcontents2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfilters.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfvalues.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.h5 - ${HDF5_TOOLS_DIR}/testfiles/thlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/thyperslab.h5 - ${HDF5_TOOLS_DIR}/testfiles/tints4dims.h5 - ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5 - ${HDF5_TOOLS_DIR}/testfiles/tintsnodata.h5 - ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.h5 - ${HDF5_TOOLS_DIR}/testfiles/tldouble.h5 - ${HDF5_TOOLS_DIR}/testfiles/tldouble_scalar.h5 - ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.h5 - ${HDF5_TOOLS_DIR}/testfiles/tloop.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-b.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-g.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-l.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-o.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-r.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmulti-s.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.h5 - ${HDF5_TOOLS_DIR}/testfiles/tno-subset.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5 - ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tordergr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5 - ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.h5 - ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.h5 - ${HDF5_TOOLS_DIR}/testfiles/tslink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-m.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-r.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr3.h5 - ${HDF5_TOOLS_DIR}/testfiles/tudfilter.h5 - ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvlenstr_array.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvms.h5 - ${HDF5_TOOLS_DIR}/testfiles/t128bit_float.h5 - ${HDF5_TOOLS_DIR}/testfiles/tCVE_2018_11206_fill_old.h5 - ${HDF5_TOOLS_DIR}/testfiles/tCVE_2018_11206_fill_new.h5 - ${HDF5_TOOLS_DIR}/testfiles/zerodim.h5 - ${HDF5_TOOLS_DIR}/testfiles/tCVE-2021-37501_attr_decode.h5 + charsets.h5 + err_attr_dspace.h5 + file_space.h5 + filter_fail.h5 + packedbits.h5 + taindices.h5 + tall.h5 + tarray1.h5 + tarray1_big.h5 + tarray2.h5 + tarray3.h5 + tarray4.h5 + tarray5.h5 + tarray6.h5 + tarray7.h5 + tarray8.h5 + tattr.h5 + tattr2.h5 + tattr4_be.h5 + tattrintsize.h5 + tattrreg.h5 + tbigdims.h5 + tbinary.h5 + tbitnopaque.h5 + tchar.h5 + tcmpdattrintsize.h5 + tcmpdintarray.h5 + tcmpdints.h5 + tcmpdintsize.h5 + tcompound.h5 + tcompound_complex.h5 + tcompound_complex2.h5 + tdatareg.h5 + tdset.h5 + tempty.h5 + tsoftlinks.h5 + textlinkfar.h5 + textlinksrc.h5 + textlinktar.h5 + textlink.h5 + tfamily00000.h5 + tfamily00001.h5 + tfamily00002.h5 + tfamily00003.h5 + tfamily00004.h5 + tfamily00005.h5 + tfamily00006.h5 + tfamily00007.h5 + tfamily00008.h5 + tfamily00009.h5 + tfamily00010.h5 + tfcontents1.h5 + tfcontents2.h5 + tfilters.h5 + tfloatsattrs.h5 + tfpformat.h5 + tfvalues.h5 + tgroup.h5 + tgrp_comments.h5 + tgrpnullspace.h5 + thlink.h5 + thyperslab.h5 + tints4dims.h5 + tintsattrs.h5 + tintsnodata.h5 + tlarge_objname.h5 + tldouble.h5 + tldouble_scalar.h5 + tlonglinks.h5 + tloop.h5 + tmulti-b.h5 + tmulti-g.h5 + tmulti-l.h5 + tmulti-o.h5 + tmulti-r.h5 + tmulti-s.h5 + tnamed_dtype_attr.h5 + tnestedcomp.h5 + tnestedcmpddt.h5 + tno-subset.h5 + tnullspace.h5 + torderattr.h5 + tordergr.h5 + tsaf.h5 + tscalarattrintsize.h5 + tscalarintattrsize.h5 + tscalarintsize.h5 + tscalarstring.h5 + tslink.h5 + tsplit_file-m.h5 + tsplit_file-r.h5 + tstr.h5 + tstr2.h5 + tstr3.h5 + tudfilter.h5 + tudlink.h5 + tvldtypes1.h5 + tvldtypes2.h5 + tvldtypes3.h5 + tvldtypes4.h5 + tvldtypes5.h5 + tvlenstr_array.h5 + tvlstr.h5 + tvms.h5 + t128bit_float.h5 + tCVE_2018_11206_fill_old.h5 + tCVE_2018_11206_fill_new.h5 + zerodim.h5 + tCVE-2021-37501_attr_decode.h5 #STD_REF_OBJ files - ${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_compat.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_ext1.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_ext2.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_grp.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_del.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_obj.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_param.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1d.h5 - ${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5 + trefer_attr.h5 + trefer_compat.h5 + trefer_ext1.h5 + trefer_ext2.h5 + trefer_grp.h5 + trefer_obj_del.h5 + trefer_obj.h5 + trefer_param.h5 + trefer_reg_1d.h5 + trefer_reg.h5 # Onion VFD files - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5.onion - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5.onion - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5.onion + tst_onion_objs.h5 + tst_onion_objs.h5.onion + tst_onion_dset_ext.h5 + tst_onion_dset_ext.h5.onion + tst_onion_dset_1d.h5 + tst_onion_dset_1d.h5.onion ) set (HDF5_ERROR_REFERENCE_TEST_FILES - ${PROJECT_SOURCE_DIR}/errfiles/filter_fail.err - ${PROJECT_SOURCE_DIR}/errfiles/non_existing.err - ${PROJECT_SOURCE_DIR}/errfiles/tall-1.err - ${PROJECT_SOURCE_DIR}/errfiles/tall-2A.err - ${PROJECT_SOURCE_DIR}/errfiles/tall-2A0.err - ${PROJECT_SOURCE_DIR}/errfiles/tall-2B.err - ${PROJECT_SOURCE_DIR}/errfiles/tarray1_big.err - ${PROJECT_SOURCE_DIR}/errfiles/tattrregR.err - ${PROJECT_SOURCE_DIR}/errfiles/tattr-3.err - ${PROJECT_SOURCE_DIR}/errfiles/tcomp-3.err - ${PROJECT_SOURCE_DIR}/errfiles/tdataregR.err - ${PROJECT_SOURCE_DIR}/errfiles/tdset-2.err - ${PROJECT_SOURCE_DIR}/errfiles/texceedsubblock.err - ${PROJECT_SOURCE_DIR}/errfiles/texceedsubcount.err - ${PROJECT_SOURCE_DIR}/errfiles/texceedsubstart.err - ${PROJECT_SOURCE_DIR}/errfiles/texceedsubstride.err - ${PROJECT_SOURCE_DIR}/errfiles/textlink.err - ${PROJECT_SOURCE_DIR}/errfiles/textlinkfar.err - ${PROJECT_SOURCE_DIR}/errfiles/textlinksrc.err - ${PROJECT_SOURCE_DIR}/errfiles/torderlinks1.err - ${PROJECT_SOURCE_DIR}/errfiles/torderlinks2.err - ${PROJECT_SOURCE_DIR}/errfiles/tgroup-2.err - ${PROJECT_SOURCE_DIR}/errfiles/tperror.err - ${PROJECT_SOURCE_DIR}/errfiles/tslink-D.err + filter_fail.err + non_existing.err + tall-1.err + tall-2A.err + tall-2A0.err + tall-2B.err + tarray1_big.err + tattrregR.err + tattr-3.err + tcomp-3.err + tdataregR.err + tdset-2.err + texceedsubblock.err + texceedsubcount.err + texceedsubstart.err + texceedsubstride.err + textlink.err + textlinkfar.err + textlinksrc.err + torderlinks1.err + torderlinks2.err + tgroup-2.err + tperror.err + tslink-D.err ) # make test dir @@ -398,40 +398,38 @@ # copy test files from source dir to test dir # foreach (tst_h5_file ${HDF5_REFERENCE_TEST_FILES}) - get_filename_component (fname "${tst_h5_file}" NAME) - HDFTEST_COPY_FILE("${tst_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${tst_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5_file}" "h5dump_std_files") endforeach () foreach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${tst_exp_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file}" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/exportfiles/${tst_exp_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file}" "h5dump_std_files") endforeach () foreach (tst_other_file ${HDF5_REFERENCE_FILES}) - get_filename_component (fname "${tst_other_file}" NAME) - HDFTEST_COPY_FILE("${tst_other_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${tst_other_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_other_file}" "h5dump_std_files") endforeach () + foreach (tst_h5N_file ${HDF5_N_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${tst_h5N_file}.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5N_file}-N.ddl" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${tst_h5N_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5N_file}-N" "h5dump_std_files") endforeach () foreach (tst_error_file ${HDF5_ERROR_REFERENCE_TEST_FILES}) - get_filename_component (fname "${tst_error_file}" NAME) - HDFTEST_COPY_FILE("${tst_error_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${tst_error_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_error_file}" "h5dump_std_files") endforeach () # -------------------------------------------------------------------- # Special file handling # -------------------------------------------------------------------- - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files") if (WIN32 AND CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION VERSION_LESS 10.0.18362.0) - configure_file(${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp NEWLINE_STYLE CRLF) - #file (READ ${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp TEST_STREAM) + configure_file(${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp NEWLINE_STYLE CRLF) + #file (READ ${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp TEST_STREAM) #file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.wddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tfloatsattrs.wddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files") else () - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp" "${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp" "h5dump_std_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp" "${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp" "h5dump_std_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tfloatsattrs.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files") endif () add_custom_target(h5dump_std_files ALL COMMENT "Copying files needed by h5dump_std tests" DEPENDS ${h5dump_std_files_list}) diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake index caca4b7acbc..118b314f60c 100644 --- a/tools/test/h5dump/CMakeTestsPBITS.cmake +++ b/tools/test/h5dump/CMakeTestsPBITS.cmake @@ -76,9 +76,9 @@ tpbitsUnsignedLongLong16.ddl ) set (HDF5_REFERENCE_TEST_PBITS - ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 + packedbits.h5 + tarray1.h5 + tcompound.h5 ) set (HDF5_ERROR_REFERENCE_PBITS tnofilename-with-packed-bits.err @@ -97,19 +97,15 @@ ) foreach (pbits_h5_file ${HDF5_REFERENCE_TEST_PBITS}) - get_filename_component(fname "${pbits_h5_file}" NAME) - HDFTEST_COPY_FILE("${pbits_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${pbits_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${pbits_h5_file}" "h5dump_pbits_files") endforeach () - foreach (ddl_pbits ${HDF5_REFERENCE_PBITS}) - get_filename_component(fname "${ddl_pbits}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/pbits/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/pbits/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${ddl_pbits}" "h5dump_pbits_files") endforeach () - foreach (ddl_pbits ${HDF5_ERROR_REFERENCE_PBITS}) - get_filename_component(fname "${ddl_pbits}" NAME) - HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files") + foreach (ddl_err_pbits ${HDF5_ERROR_REFERENCE_PBITS}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/pbits/${ddl_err_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${ddl_err_pbits}" "h5dump_pbits_files") endforeach () add_custom_target(h5dump_pbits_files ALL COMMENT "Copying files needed by h5dump_pbits tests" DEPENDS ${h5dump_pbits_files_list}) diff --git a/tools/test/h5dump/CMakeTestsVDS.cmake b/tools/test/h5dump/CMakeTestsVDS.cmake index 42f08c9a67b..c910acd5e67 100644 --- a/tools/test/h5dump/CMakeTestsVDS.cmake +++ b/tools/test/h5dump/CMakeTestsVDS.cmake @@ -84,28 +84,19 @@ ) foreach (vds_h5_file ${HDF5_REFERENCE_TEST_VDS}) - get_filename_component(fname "${vds_h5_file}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/${vds_h5_file}" "h5dump_vds_files") endforeach () foreach (vds_h5_file ${HDF5_REFERENCE_PREFIX_VDS}) - get_filename_component(fname "${vds_h5_file}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5dump_vds_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${vds_h5_file}" "h5dump_vds_files") endforeach () foreach (ddl_vds ${HDF5_REFERENCE_VDS}) - get_filename_component(fname "${ddl_vds}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files") - endforeach () - - foreach (ddl_vds ${HDF5_REFERENCE_VDS}) - get_filename_component(fname "${ddl_vds}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5dump_vds_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${ddl_vds}" "h5dump_vds_files") endforeach () foreach (ddl_vds ${HDF5_ERROR_REFERENCE_VDS}) - get_filename_component(fname "${ddl_vds}" NAME) - HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${ddl_vds}" "h5dump_vds_files") endforeach () add_custom_target(h5dump_vds_files ALL COMMENT "Copying files needed by h5dump_vds tests" DEPENDS ${h5dump_vds_files_list}) diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake index 833a616443e..d78e73830ba 100644 --- a/tools/test/h5dump/CMakeTestsXML.cmake +++ b/tools/test/h5dump/CMakeTestsXML.cmake @@ -19,138 +19,143 @@ # # copy XML test files from source dir to test dir # + set (HDF5_XML_REFERENCE_ONLY_FILES + tbitfields.h5 + tcompound2.h5 + tdset2.h5 + tenum.h5 + test35.nc + tloop2.h5 + tmany.h5 + tname-amp.h5 + tname-apos.h5 + tname-gt.h5 + tname-lt.h5 + tname-quot.h5 + tname-sp.h5 + tnodata.h5 + tobjref.h5 + topaque.h5 + tref.h5 + tref-escapes.h5 + tref-escapes-at.h5 + tstring.h5 + tstring-at.h5 + ) + set (HDF5_XML_REFERENCE_TEST_FILES - ${HDF5_TOOLS_DIR}/testfiles/tall.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tbitfields.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdset.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tempty.h5 - ${HDF5_TOOLS_DIR}/testfiles/tenum.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5 - ${HDF5_TOOLS_DIR}/testfiles/thlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tloop.h5 - ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tmany.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5 - ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5 - ${HDF5_TOOLS_DIR}/testfiles/test35.nc - ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5 - ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5 - ${HDF5_TOOLS_DIR}/testfiles/topaque.h5 - ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tref.h5 - ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5 - ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5 - ${HDF5_TOOLS_DIR}/testfiles/tslink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstring.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5 + tall.h5 + tarray1.h5 + tarray2.h5 + tarray3.h5 + tarray6.h5 + tarray7.h5 + tattr.h5 + tcompound.h5 + tcompound_complex.h5 + tdatareg.h5 + tdset.h5 + tempty.h5 + textlink.h5 + tfpformat.h5 + tgroup.h5 + thlink.h5 + tloop.h5 + tnamed_dtype_attr.h5 + tnestedcomp.h5 + tnullspace.h5 + torderattr.h5 + tsaf.h5 + tslink.h5 + tstr.h5 + tstr2.h5 + tudlink.h5 + tvldtypes1.h5 + tvldtypes2.h5 + tvldtypes3.h5 + tvldtypes4.h5 + tvldtypes5.h5 + tvlstr.h5 ) set (HDF5_XML_REFERENCE_FILES - ${HDF5_TOOLS_DIR}/testfiles/tall.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tall-2A.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tattr.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tbitfields_be.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tbitfields_le.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tdset.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-uri.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-nons.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-uri.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-ns.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tempty-ns-2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tenum.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/test35.nc.xml - ${HDF5_TOOLS_DIR}/testfiles/textlink.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/thlink.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tloop.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tmany.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/topaque.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/torderattr1.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/torderattr2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/torderattr3.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/torderattr4.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tref.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tslink.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tstr.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tstring.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5.xml - ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5.xml + tall.h5.xml + tall-2A.h5.xml + tarray1.h5.xml + tarray2.h5.xml + tarray3.h5.xml + tarray6.h5.xml + tarray7.h5.xml + tattr.h5.xml + tbitfields_be.h5.xml + tbitfields_le.h5.xml + tcompound_complex.h5.xml + tcompound.h5.xml + tcompound2.h5.xml + tdatareg.h5.xml + tdset.h5.xml + tdset2.h5.xml + tempty.h5.xml + tempty-dtd.h5.xml + tempty-dtd-2.h5.xml + tempty-dtd-uri.h5.xml + tempty-nons.h5.xml + tempty-nons-2.h5.xml + tempty-nons-uri.h5.xml + tempty-ns.h5.xml + tempty-ns-2.h5.xml + tenum.h5.xml + test35.nc.xml + textlink.h5.xml + tfpformat.h5.xml + tgroup.h5.xml + thlink.h5.xml + tloop.h5.xml + tloop2.h5.xml + tmany.h5.xml + tname-amp.h5.xml + tname-apos.h5.xml + tnamed_dtype_attr.h5.xml + tname-gt.h5.xml + tname-lt.h5.xml + tname-quot.h5.xml + tname-sp.h5.xml + tnestedcomp.h5.xml + tnodata.h5.xml + tnullspace.h5.xml + tobjref.h5.xml + topaque.h5.xml + torderattr1.h5.xml + torderattr2.h5.xml + torderattr3.h5.xml + torderattr4.h5.xml + tref.h5.xml + tref-escapes.h5.xml + tref-escapes-at.h5.xml + tsaf.h5.xml + tslink.h5.xml + tstr.h5.xml + tstr2.h5.xml + tstring.h5.xml + tstring-at.h5.xml + tudlink.h5.xml + tvldtypes1.h5.xml + tvldtypes2.h5.xml + tvldtypes3.h5.xml + tvldtypes4.h5.xml + tvldtypes5.h5.xml + tvlstr.h5.xml ) foreach (tst_xml_h5_file ${HDF5_XML_REFERENCE_TEST_FILES}) - get_filename_component(fname "${tst_xml_h5_file}" NAME) - HDFTEST_COPY_FILE("${tst_xml_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${fname}" "h5dump_xml_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${tst_xml_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xml_h5_file}" "h5dump_xml_files") + endforeach () + + foreach (tst_xmlonly_h5_file ${HDF5_XML_REFERENCE_ONLY_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "h5dump_xml_files") endforeach () foreach (tst_xml_other_file ${HDF5_XML_REFERENCE_FILES}) - get_filename_component(fname "${tst_xml_other_file}" NAME) - HDFTEST_COPY_FILE("${tst_xml_other_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${fname}" "h5dump_xml_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/xml/${tst_xml_other_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xml_other_file}" "h5dump_xml_files") endforeach () add_custom_target(h5dump_xml_files ALL COMMENT "Copying files needed by h5dump_xml tests" DEPENDS ${h5dump_xml_files_list}) diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake index 7ab8c1ffa40..b303032c9ee 100644 --- a/tools/test/h5dump/CMakeVFDTests.cmake +++ b/tools/test/h5dump/CMakeVFDTests.cmake @@ -26,8 +26,8 @@ set (HDF5_VFD_H5DUMP_FILES foreach (vfdtest ${VFD_LIST}) foreach (h5_tfile ${HDF5_VFD_H5DUMP_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.h5" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.h5" "HDF5_VFD_H5DUMP_files") - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.ddl" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.ddl" "HDF5_VFD_H5DUMP_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}.h5" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.h5" "HDF5_VFD_H5DUMP_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tfile}.ddl" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.ddl" "HDF5_VFD_H5DUMP_files") endforeach () endforeach () diff --git a/tools/test/h5dump/errfiles/tnofilename-with-packed-bits.err b/tools/test/h5dump/errfiles/pbits/tnofilename-with-packed-bits.err similarity index 100% rename from tools/test/h5dump/errfiles/tnofilename-with-packed-bits.err rename to tools/test/h5dump/errfiles/pbits/tnofilename-with-packed-bits.err diff --git a/tools/test/h5dump/errfiles/tpbitsCharLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsCharLengthExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsCharLengthExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsCharLengthExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsCharOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsCharOffsetExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsCharOffsetExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsCharOffsetExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsIncomplete.err b/tools/test/h5dump/errfiles/pbits/tpbitsIncomplete.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsIncomplete.err rename to tools/test/h5dump/errfiles/pbits/tpbitsIncomplete.err diff --git a/tools/test/h5dump/errfiles/tpbitsIntLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsIntLengthExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsIntLengthExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsIntLengthExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsIntOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsIntOffsetExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsIntOffsetExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsIntOffsetExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLengthExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsLengthExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsLengthExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsLengthPositive.err b/tools/test/h5dump/errfiles/pbits/tpbitsLengthPositive.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsLengthPositive.err rename to tools/test/h5dump/errfiles/pbits/tpbitsLengthPositive.err diff --git a/tools/test/h5dump/errfiles/tpbitsLongLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLongLengthExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsLongLengthExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsLongLengthExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsLongOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLongOffsetExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsLongOffsetExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsLongOffsetExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsMaxExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsMaxExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsMaxExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsMaxExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetExceeded.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsOffsetExceeded.err rename to tools/test/h5dump/errfiles/pbits/tpbitsOffsetExceeded.err diff --git a/tools/test/h5dump/errfiles/tpbitsOffsetNegative.err b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetNegative.err similarity index 100% rename from tools/test/h5dump/errfiles/tpbitsOffsetNegative.err rename to tools/test/h5dump/errfiles/pbits/tpbitsOffsetNegative.err diff --git a/tools/testfiles/charsets.ddl b/tools/test/h5dump/expected/charsets.ddl similarity index 100% rename from tools/testfiles/charsets.ddl rename to tools/test/h5dump/expected/charsets.ddl diff --git a/tools/testfiles/err_attr_dspace.ddl b/tools/test/h5dump/expected/err_attr_dspace.ddl similarity index 100% rename from tools/testfiles/err_attr_dspace.ddl rename to tools/test/h5dump/expected/err_attr_dspace.ddl diff --git a/tools/testfiles/file_space.ddl b/tools/test/h5dump/expected/file_space.ddl similarity index 100% rename from tools/testfiles/file_space.ddl rename to tools/test/h5dump/expected/file_space.ddl diff --git a/tools/testfiles/filter_fail.ddl b/tools/test/h5dump/expected/filter_fail.ddl similarity index 100% rename from tools/testfiles/filter_fail.ddl rename to tools/test/h5dump/expected/filter_fail.ddl diff --git a/tools/testfiles/h5dump-help.txt b/tools/test/h5dump/expected/h5dump-help.txt similarity index 100% rename from tools/testfiles/h5dump-help.txt rename to tools/test/h5dump/expected/h5dump-help.txt diff --git a/tools/testfiles/non_existing.ddl b/tools/test/h5dump/expected/non_existing.ddl similarity index 100% rename from tools/testfiles/non_existing.ddl rename to tools/test/h5dump/expected/non_existing.ddl diff --git a/tools/testfiles/out3.h5import b/tools/test/h5dump/expected/out3.h5import similarity index 100% rename from tools/testfiles/out3.h5import rename to tools/test/h5dump/expected/out3.h5import diff --git a/tools/testfiles/packedbits.ddl b/tools/test/h5dump/expected/packedbits.ddl similarity index 100% rename from tools/testfiles/packedbits.ddl rename to tools/test/h5dump/expected/packedbits.ddl diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/test/h5dump/expected/pbits/tnofilename-with-packed-bits.ddl similarity index 100% rename from tools/testfiles/pbits/tnofilename-with-packed-bits.ddl rename to tools/test/h5dump/expected/pbits/tnofilename-with-packed-bits.ddl diff --git a/tools/testfiles/pbits/tpbitsArray.ddl b/tools/test/h5dump/expected/pbits/tpbitsArray.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsArray.ddl rename to tools/test/h5dump/expected/pbits/tpbitsArray.ddl diff --git a/tools/testfiles/pbits/tpbitsCharLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsCharLengthExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsCharLengthExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsCharLengthExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsCharOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsCharOffsetExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsCharOffsetExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsCharOffsetExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsCompound.ddl b/tools/test/h5dump/expected/pbits/tpbitsCompound.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsCompound.ddl rename to tools/test/h5dump/expected/pbits/tpbitsCompound.ddl diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/test/h5dump/expected/pbits/tpbitsIncomplete.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsIncomplete.ddl rename to tools/test/h5dump/expected/pbits/tpbitsIncomplete.ddl diff --git a/tools/testfiles/pbits/tpbitsIntLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsIntLengthExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsIntLengthExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsIntLengthExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsIntOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsIntOffsetExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsIntOffsetExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsIntOffsetExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLengthExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsLengthExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsLengthExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/test/h5dump/expected/pbits/tpbitsLengthPositive.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsLengthPositive.ddl rename to tools/test/h5dump/expected/pbits/tpbitsLengthPositive.ddl diff --git a/tools/testfiles/pbits/tpbitsLongLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLongLengthExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsLongLengthExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsLongLengthExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsLongOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLongOffsetExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsLongOffsetExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsLongOffsetExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsMax.ddl b/tools/test/h5dump/expected/pbits/tpbitsMax.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsMax.ddl rename to tools/test/h5dump/expected/pbits/tpbitsMax.ddl diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsMaxExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsMaxExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsMaxExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsOffsetExceeded.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsOffsetExceeded.ddl rename to tools/test/h5dump/expected/pbits/tpbitsOffsetExceeded.ddl diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/test/h5dump/expected/pbits/tpbitsOffsetNegative.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsOffsetNegative.ddl rename to tools/test/h5dump/expected/pbits/tpbitsOffsetNegative.ddl diff --git a/tools/testfiles/pbits/tpbitsOverlapped.ddl b/tools/test/h5dump/expected/pbits/tpbitsOverlapped.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsOverlapped.ddl rename to tools/test/h5dump/expected/pbits/tpbitsOverlapped.ddl diff --git a/tools/testfiles/pbits/tpbitsSigned.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSigned.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSigned.ddl diff --git a/tools/testfiles/pbits/tpbitsSigned2.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned2.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSigned2.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSigned2.ddl diff --git a/tools/testfiles/pbits/tpbitsSigned4.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned4.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSigned4.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSigned4.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedInt.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedInt.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedInt.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedInt4.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt4.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedInt4.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedInt4.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedInt8.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt8.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedInt8.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedInt8.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedIntWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedIntWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedIntWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedIntWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLong.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLong.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong16.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLong16.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLong16.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLong8.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong8.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLong8.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLong8.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLong.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLong.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong16.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLong16.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLong16.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong32.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong32.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLong32.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLong32.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLongWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole1.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole1.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLongWhole1.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole1.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole63.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole63.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongLongWhole63.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole63.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedLongWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedLongWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsSignedWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsSignedWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsSignedWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsigned.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsigned.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsigned.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsigned2.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned2.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsigned2.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsigned2.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsigned4.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned4.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsigned4.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsigned4.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedInt.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedInt.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt4.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt4.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedInt4.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedInt4.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt8.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt8.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedInt8.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedInt8.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedIntWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedIntWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedIntWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedIntWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLong.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLong.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong16.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLong16.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLong16.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong8.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong8.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLong8.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLong8.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLong.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong16.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLong16.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong16.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong32.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong32.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLong32.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong32.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLongWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole1.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole1.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLongWhole1.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole1.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole63.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole63.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongLongWhole63.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole63.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedLongWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedLongWhole.ddl diff --git a/tools/testfiles/pbits/tpbitsUnsignedWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedWhole.ddl similarity index 100% rename from tools/testfiles/pbits/tpbitsUnsignedWhole.ddl rename to tools/test/h5dump/expected/pbits/tpbitsUnsignedWhole.ddl diff --git a/tools/testfiles/tall-1.ddl b/tools/test/h5dump/expected/tall-1.ddl similarity index 100% rename from tools/testfiles/tall-1.ddl rename to tools/test/h5dump/expected/tall-1.ddl diff --git a/tools/testfiles/tall-2.ddl b/tools/test/h5dump/expected/tall-2.ddl similarity index 100% rename from tools/testfiles/tall-2.ddl rename to tools/test/h5dump/expected/tall-2.ddl diff --git a/tools/testfiles/tall-2A.ddl b/tools/test/h5dump/expected/tall-2A.ddl similarity index 100% rename from tools/testfiles/tall-2A.ddl rename to tools/test/h5dump/expected/tall-2A.ddl diff --git a/tools/testfiles/tall-2A0.ddl b/tools/test/h5dump/expected/tall-2A0.ddl similarity index 100% rename from tools/testfiles/tall-2A0.ddl rename to tools/test/h5dump/expected/tall-2A0.ddl diff --git a/tools/testfiles/tall-2B.ddl b/tools/test/h5dump/expected/tall-2B.ddl similarity index 100% rename from tools/testfiles/tall-2B.ddl rename to tools/test/h5dump/expected/tall-2B.ddl diff --git a/tools/testfiles/tall-3.ddl b/tools/test/h5dump/expected/tall-3.ddl similarity index 100% rename from tools/testfiles/tall-3.ddl rename to tools/test/h5dump/expected/tall-3.ddl diff --git a/tools/testfiles/tall-4s.ddl b/tools/test/h5dump/expected/tall-4s.ddl similarity index 100% rename from tools/testfiles/tall-4s.ddl rename to tools/test/h5dump/expected/tall-4s.ddl diff --git a/tools/testfiles/tall-5s.ddl b/tools/test/h5dump/expected/tall-5s.ddl similarity index 100% rename from tools/testfiles/tall-5s.ddl rename to tools/test/h5dump/expected/tall-5s.ddl diff --git a/tools/testfiles/tall-6.ddl b/tools/test/h5dump/expected/tall-6.ddl similarity index 100% rename from tools/testfiles/tall-6.ddl rename to tools/test/h5dump/expected/tall-6.ddl diff --git a/tools/testfiles/tall-7.ddl b/tools/test/h5dump/expected/tall-7.ddl similarity index 100% rename from tools/testfiles/tall-7.ddl rename to tools/test/h5dump/expected/tall-7.ddl diff --git a/tools/testfiles/tall-7N.ddl b/tools/test/h5dump/expected/tall-7N.ddl similarity index 100% rename from tools/testfiles/tall-7N.ddl rename to tools/test/h5dump/expected/tall-7N.ddl diff --git a/tools/testfiles/tallfilters.ddl b/tools/test/h5dump/expected/tallfilters.ddl similarity index 100% rename from tools/testfiles/tallfilters.ddl rename to tools/test/h5dump/expected/tallfilters.ddl diff --git a/tools/testfiles/tarray1.ddl b/tools/test/h5dump/expected/tarray1.ddl similarity index 100% rename from tools/testfiles/tarray1.ddl rename to tools/test/h5dump/expected/tarray1.ddl diff --git a/tools/testfiles/tarray1_big.ddl b/tools/test/h5dump/expected/tarray1_big.ddl similarity index 100% rename from tools/testfiles/tarray1_big.ddl rename to tools/test/h5dump/expected/tarray1_big.ddl diff --git a/tools/testfiles/tarray2.ddl b/tools/test/h5dump/expected/tarray2.ddl similarity index 100% rename from tools/testfiles/tarray2.ddl rename to tools/test/h5dump/expected/tarray2.ddl diff --git a/tools/testfiles/tarray3.ddl b/tools/test/h5dump/expected/tarray3.ddl similarity index 100% rename from tools/testfiles/tarray3.ddl rename to tools/test/h5dump/expected/tarray3.ddl diff --git a/tools/testfiles/tarray4.ddl b/tools/test/h5dump/expected/tarray4.ddl similarity index 100% rename from tools/testfiles/tarray4.ddl rename to tools/test/h5dump/expected/tarray4.ddl diff --git a/tools/testfiles/tarray5.ddl b/tools/test/h5dump/expected/tarray5.ddl similarity index 100% rename from tools/testfiles/tarray5.ddl rename to tools/test/h5dump/expected/tarray5.ddl diff --git a/tools/testfiles/tarray6.ddl b/tools/test/h5dump/expected/tarray6.ddl similarity index 100% rename from tools/testfiles/tarray6.ddl rename to tools/test/h5dump/expected/tarray6.ddl diff --git a/tools/testfiles/tarray7.ddl b/tools/test/h5dump/expected/tarray7.ddl similarity index 100% rename from tools/testfiles/tarray7.ddl rename to tools/test/h5dump/expected/tarray7.ddl diff --git a/tools/testfiles/tarray8.ddl b/tools/test/h5dump/expected/tarray8.ddl similarity index 100% rename from tools/testfiles/tarray8.ddl rename to tools/test/h5dump/expected/tarray8.ddl diff --git a/tools/testfiles/tattr-1.ddl b/tools/test/h5dump/expected/tattr-1.ddl similarity index 100% rename from tools/testfiles/tattr-1.ddl rename to tools/test/h5dump/expected/tattr-1.ddl diff --git a/tools/testfiles/tattr-2.ddl b/tools/test/h5dump/expected/tattr-2.ddl similarity index 100% rename from tools/testfiles/tattr-2.ddl rename to tools/test/h5dump/expected/tattr-2.ddl diff --git a/tools/testfiles/tattr-3.ddl b/tools/test/h5dump/expected/tattr-3.ddl similarity index 100% rename from tools/testfiles/tattr-3.ddl rename to tools/test/h5dump/expected/tattr-3.ddl diff --git a/tools/testfiles/tattr-4_be.ddl b/tools/test/h5dump/expected/tattr-4_be.ddl similarity index 100% rename from tools/testfiles/tattr-4_be.ddl rename to tools/test/h5dump/expected/tattr-4_be.ddl diff --git a/tools/testfiles/tattrcontents1.ddl b/tools/test/h5dump/expected/tattrcontents1.ddl similarity index 100% rename from tools/testfiles/tattrcontents1.ddl rename to tools/test/h5dump/expected/tattrcontents1.ddl diff --git a/tools/testfiles/tattrcontents2.ddl b/tools/test/h5dump/expected/tattrcontents2.ddl similarity index 100% rename from tools/testfiles/tattrcontents2.ddl rename to tools/test/h5dump/expected/tattrcontents2.ddl diff --git a/tools/testfiles/tattrintsize.ddl b/tools/test/h5dump/expected/tattrintsize.ddl similarity index 100% rename from tools/testfiles/tattrintsize.ddl rename to tools/test/h5dump/expected/tattrintsize.ddl diff --git a/tools/testfiles/tattrreg.ddl b/tools/test/h5dump/expected/tattrreg.ddl similarity index 100% rename from tools/testfiles/tattrreg.ddl rename to tools/test/h5dump/expected/tattrreg.ddl diff --git a/tools/testfiles/tattrregR.ddl b/tools/test/h5dump/expected/tattrregR.ddl similarity index 100% rename from tools/testfiles/tattrregR.ddl rename to tools/test/h5dump/expected/tattrregR.ddl diff --git a/tools/testfiles/tbigdims.ddl b/tools/test/h5dump/expected/tbigdims.ddl similarity index 100% rename from tools/testfiles/tbigdims.ddl rename to tools/test/h5dump/expected/tbigdims.ddl diff --git a/tools/testfiles/tbin1.ddl b/tools/test/h5dump/expected/tbin1.ddl similarity index 100% rename from tools/testfiles/tbin1.ddl rename to tools/test/h5dump/expected/tbin1.ddl diff --git a/tools/testfiles/tbin2.ddl b/tools/test/h5dump/expected/tbin2.ddl similarity index 100% rename from tools/testfiles/tbin2.ddl rename to tools/test/h5dump/expected/tbin2.ddl diff --git a/tools/testfiles/tbin3.ddl b/tools/test/h5dump/expected/tbin3.ddl similarity index 100% rename from tools/testfiles/tbin3.ddl rename to tools/test/h5dump/expected/tbin3.ddl diff --git a/tools/testfiles/tbin4.ddl b/tools/test/h5dump/expected/tbin4.ddl similarity index 100% rename from tools/testfiles/tbin4.ddl rename to tools/test/h5dump/expected/tbin4.ddl diff --git a/tools/testfiles/tbinregR.ddl b/tools/test/h5dump/expected/tbinregR.ddl similarity index 100% rename from tools/testfiles/tbinregR.ddl rename to tools/test/h5dump/expected/tbinregR.ddl diff --git a/tools/testfiles/tbitnopaque_be.ddl b/tools/test/h5dump/expected/tbitnopaque_be.ddl similarity index 100% rename from tools/testfiles/tbitnopaque_be.ddl rename to tools/test/h5dump/expected/tbitnopaque_be.ddl diff --git a/tools/testfiles/tbitnopaque_le.ddl b/tools/test/h5dump/expected/tbitnopaque_le.ddl similarity index 100% rename from tools/testfiles/tbitnopaque_le.ddl rename to tools/test/h5dump/expected/tbitnopaque_le.ddl diff --git a/tools/testfiles/tboot1.ddl b/tools/test/h5dump/expected/tboot1.ddl similarity index 100% rename from tools/testfiles/tboot1.ddl rename to tools/test/h5dump/expected/tboot1.ddl diff --git a/tools/testfiles/tboot2.ddl b/tools/test/h5dump/expected/tboot2.ddl similarity index 100% rename from tools/testfiles/tboot2.ddl rename to tools/test/h5dump/expected/tboot2.ddl diff --git a/tools/testfiles/tboot2A.ddl b/tools/test/h5dump/expected/tboot2A.ddl similarity index 100% rename from tools/testfiles/tboot2A.ddl rename to tools/test/h5dump/expected/tboot2A.ddl diff --git a/tools/testfiles/tboot2B.ddl b/tools/test/h5dump/expected/tboot2B.ddl similarity index 100% rename from tools/testfiles/tboot2B.ddl rename to tools/test/h5dump/expected/tboot2B.ddl diff --git a/tools/testfiles/tchar1.ddl b/tools/test/h5dump/expected/tchar1.ddl similarity index 100% rename from tools/testfiles/tchar1.ddl rename to tools/test/h5dump/expected/tchar1.ddl diff --git a/tools/testfiles/tchunked.ddl b/tools/test/h5dump/expected/tchunked.ddl similarity index 100% rename from tools/testfiles/tchunked.ddl rename to tools/test/h5dump/expected/tchunked.ddl diff --git a/tools/testfiles/tcmpdattrintsize.ddl b/tools/test/h5dump/expected/tcmpdattrintsize.ddl similarity index 100% rename from tools/testfiles/tcmpdattrintsize.ddl rename to tools/test/h5dump/expected/tcmpdattrintsize.ddl diff --git a/tools/testfiles/tcmpdintarray.ddl b/tools/test/h5dump/expected/tcmpdintarray.ddl similarity index 100% rename from tools/testfiles/tcmpdintarray.ddl rename to tools/test/h5dump/expected/tcmpdintarray.ddl diff --git a/tools/testfiles/tcmpdints.ddl b/tools/test/h5dump/expected/tcmpdints.ddl similarity index 100% rename from tools/testfiles/tcmpdints.ddl rename to tools/test/h5dump/expected/tcmpdints.ddl diff --git a/tools/testfiles/tcmpdintsize.ddl b/tools/test/h5dump/expected/tcmpdintsize.ddl similarity index 100% rename from tools/testfiles/tcmpdintsize.ddl rename to tools/test/h5dump/expected/tcmpdintsize.ddl diff --git a/tools/testfiles/tcomp-1.ddl b/tools/test/h5dump/expected/tcomp-1.ddl similarity index 100% rename from tools/testfiles/tcomp-1.ddl rename to tools/test/h5dump/expected/tcomp-1.ddl diff --git a/tools/testfiles/tcomp-2.ddl b/tools/test/h5dump/expected/tcomp-2.ddl similarity index 100% rename from tools/testfiles/tcomp-2.ddl rename to tools/test/h5dump/expected/tcomp-2.ddl diff --git a/tools/testfiles/tcomp-3.ddl b/tools/test/h5dump/expected/tcomp-3.ddl similarity index 100% rename from tools/testfiles/tcomp-3.ddl rename to tools/test/h5dump/expected/tcomp-3.ddl diff --git a/tools/testfiles/tcomp-4.ddl b/tools/test/h5dump/expected/tcomp-4.ddl similarity index 100% rename from tools/testfiles/tcomp-4.ddl rename to tools/test/h5dump/expected/tcomp-4.ddl diff --git a/tools/testfiles/tcompact.ddl b/tools/test/h5dump/expected/tcompact.ddl similarity index 100% rename from tools/testfiles/tcompact.ddl rename to tools/test/h5dump/expected/tcompact.ddl diff --git a/tools/testfiles/tcompound_complex2.ddl b/tools/test/h5dump/expected/tcompound_complex2.ddl similarity index 100% rename from tools/testfiles/tcompound_complex2.ddl rename to tools/test/h5dump/expected/tcompound_complex2.ddl diff --git a/tools/testfiles/tcontents.ddl b/tools/test/h5dump/expected/tcontents.ddl similarity index 100% rename from tools/testfiles/tcontents.ddl rename to tools/test/h5dump/expected/tcontents.ddl diff --git a/tools/testfiles/tcontiguos.ddl b/tools/test/h5dump/expected/tcontiguos.ddl similarity index 100% rename from tools/testfiles/tcontiguos.ddl rename to tools/test/h5dump/expected/tcontiguos.ddl diff --git a/tools/testfiles/tdatareg.ddl b/tools/test/h5dump/expected/tdatareg.ddl similarity index 100% rename from tools/testfiles/tdatareg.ddl rename to tools/test/h5dump/expected/tdatareg.ddl diff --git a/tools/testfiles/tdataregR.ddl b/tools/test/h5dump/expected/tdataregR.ddl similarity index 100% rename from tools/testfiles/tdataregR.ddl rename to tools/test/h5dump/expected/tdataregR.ddl diff --git a/tools/testfiles/tdeflate.ddl b/tools/test/h5dump/expected/tdeflate.ddl similarity index 100% rename from tools/testfiles/tdeflate.ddl rename to tools/test/h5dump/expected/tdeflate.ddl diff --git a/tools/testfiles/tdset-1.ddl b/tools/test/h5dump/expected/tdset-1.ddl similarity index 100% rename from tools/testfiles/tdset-1.ddl rename to tools/test/h5dump/expected/tdset-1.ddl diff --git a/tools/testfiles/tdset-2.ddl b/tools/test/h5dump/expected/tdset-2.ddl similarity index 100% rename from tools/testfiles/tdset-2.ddl rename to tools/test/h5dump/expected/tdset-2.ddl diff --git a/tools/testfiles/tdset-3s.ddl b/tools/test/h5dump/expected/tdset-3s.ddl similarity index 100% rename from tools/testfiles/tdset-3s.ddl rename to tools/test/h5dump/expected/tdset-3s.ddl diff --git a/tools/testfiles/tempty.ddl b/tools/test/h5dump/expected/tempty.ddl similarity index 100% rename from tools/testfiles/tempty.ddl rename to tools/test/h5dump/expected/tempty.ddl diff --git a/tools/testfiles/texceedsubblock.ddl b/tools/test/h5dump/expected/texceedsubblock.ddl similarity index 100% rename from tools/testfiles/texceedsubblock.ddl rename to tools/test/h5dump/expected/texceedsubblock.ddl diff --git a/tools/testfiles/texceedsubcount.ddl b/tools/test/h5dump/expected/texceedsubcount.ddl similarity index 100% rename from tools/testfiles/texceedsubcount.ddl rename to tools/test/h5dump/expected/texceedsubcount.ddl diff --git a/tools/testfiles/texceedsubstart.ddl b/tools/test/h5dump/expected/texceedsubstart.ddl similarity index 100% rename from tools/testfiles/texceedsubstart.ddl rename to tools/test/h5dump/expected/texceedsubstart.ddl diff --git a/tools/testfiles/texceedsubstride.ddl b/tools/test/h5dump/expected/texceedsubstride.ddl similarity index 100% rename from tools/testfiles/texceedsubstride.ddl rename to tools/test/h5dump/expected/texceedsubstride.ddl diff --git a/tools/testfiles/texternal.ddl b/tools/test/h5dump/expected/texternal.ddl similarity index 100% rename from tools/testfiles/texternal.ddl rename to tools/test/h5dump/expected/texternal.ddl diff --git a/tools/testfiles/textlink.ddl b/tools/test/h5dump/expected/textlink.ddl similarity index 100% rename from tools/testfiles/textlink.ddl rename to tools/test/h5dump/expected/textlink.ddl diff --git a/tools/testfiles/textlinkfar.ddl b/tools/test/h5dump/expected/textlinkfar.ddl similarity index 100% rename from tools/testfiles/textlinkfar.ddl rename to tools/test/h5dump/expected/textlinkfar.ddl diff --git a/tools/testfiles/textlinksrc.ddl b/tools/test/h5dump/expected/textlinksrc.ddl similarity index 100% rename from tools/testfiles/textlinksrc.ddl rename to tools/test/h5dump/expected/textlinksrc.ddl diff --git a/tools/testfiles/tfamily.ddl b/tools/test/h5dump/expected/tfamily.ddl similarity index 100% rename from tools/testfiles/tfamily.ddl rename to tools/test/h5dump/expected/tfamily.ddl diff --git a/tools/testfiles/tfill.ddl b/tools/test/h5dump/expected/tfill.ddl similarity index 100% rename from tools/testfiles/tfill.ddl rename to tools/test/h5dump/expected/tfill.ddl diff --git a/tools/testfiles/tfletcher32.ddl b/tools/test/h5dump/expected/tfletcher32.ddl similarity index 100% rename from tools/testfiles/tfletcher32.ddl rename to tools/test/h5dump/expected/tfletcher32.ddl diff --git a/tools/testfiles/tfloatsattrs.ddl b/tools/test/h5dump/expected/tfloatsattrs.ddl similarity index 100% rename from tools/testfiles/tfloatsattrs.ddl rename to tools/test/h5dump/expected/tfloatsattrs.ddl diff --git a/tools/testfiles/tfloatsattrs.wddl b/tools/test/h5dump/expected/tfloatsattrs.wddl similarity index 100% rename from tools/testfiles/tfloatsattrs.wddl rename to tools/test/h5dump/expected/tfloatsattrs.wddl diff --git a/tools/testfiles/tfpformat.ddl b/tools/test/h5dump/expected/tfpformat.ddl similarity index 100% rename from tools/testfiles/tfpformat.ddl rename to tools/test/h5dump/expected/tfpformat.ddl diff --git a/tools/testfiles/tgroup-1.ddl b/tools/test/h5dump/expected/tgroup-1.ddl similarity index 100% rename from tools/testfiles/tgroup-1.ddl rename to tools/test/h5dump/expected/tgroup-1.ddl diff --git a/tools/testfiles/tgroup-2.ddl b/tools/test/h5dump/expected/tgroup-2.ddl similarity index 100% rename from tools/testfiles/tgroup-2.ddl rename to tools/test/h5dump/expected/tgroup-2.ddl diff --git a/tools/testfiles/tgrp_comments.ddl b/tools/test/h5dump/expected/tgrp_comments.ddl similarity index 100% rename from tools/testfiles/tgrp_comments.ddl rename to tools/test/h5dump/expected/tgrp_comments.ddl diff --git a/tools/testfiles/tgrpnullspace.ddl b/tools/test/h5dump/expected/tgrpnullspace.ddl similarity index 100% rename from tools/testfiles/tgrpnullspace.ddl rename to tools/test/h5dump/expected/tgrpnullspace.ddl diff --git a/tools/testfiles/thlink-1.ddl b/tools/test/h5dump/expected/thlink-1.ddl similarity index 100% rename from tools/testfiles/thlink-1.ddl rename to tools/test/h5dump/expected/thlink-1.ddl diff --git a/tools/testfiles/thlink-2.ddl b/tools/test/h5dump/expected/thlink-2.ddl similarity index 100% rename from tools/testfiles/thlink-2.ddl rename to tools/test/h5dump/expected/thlink-2.ddl diff --git a/tools/testfiles/thlink-3.ddl b/tools/test/h5dump/expected/thlink-3.ddl similarity index 100% rename from tools/testfiles/thlink-3.ddl rename to tools/test/h5dump/expected/thlink-3.ddl diff --git a/tools/testfiles/thlink-4.ddl b/tools/test/h5dump/expected/thlink-4.ddl similarity index 100% rename from tools/testfiles/thlink-4.ddl rename to tools/test/h5dump/expected/thlink-4.ddl diff --git a/tools/testfiles/thlink-5.ddl b/tools/test/h5dump/expected/thlink-5.ddl similarity index 100% rename from tools/testfiles/thlink-5.ddl rename to tools/test/h5dump/expected/thlink-5.ddl diff --git a/tools/testfiles/thyperslab.ddl b/tools/test/h5dump/expected/thyperslab.ddl similarity index 100% rename from tools/testfiles/thyperslab.ddl rename to tools/test/h5dump/expected/thyperslab.ddl diff --git a/tools/testfiles/tindicesno.ddl b/tools/test/h5dump/expected/tindicesno.ddl similarity index 100% rename from tools/testfiles/tindicesno.ddl rename to tools/test/h5dump/expected/tindicesno.ddl diff --git a/tools/testfiles/tindicessub1.ddl b/tools/test/h5dump/expected/tindicessub1.ddl similarity index 100% rename from tools/testfiles/tindicessub1.ddl rename to tools/test/h5dump/expected/tindicessub1.ddl diff --git a/tools/testfiles/tindicessub2.ddl b/tools/test/h5dump/expected/tindicessub2.ddl similarity index 100% rename from tools/testfiles/tindicessub2.ddl rename to tools/test/h5dump/expected/tindicessub2.ddl diff --git a/tools/testfiles/tindicessub3.ddl b/tools/test/h5dump/expected/tindicessub3.ddl similarity index 100% rename from tools/testfiles/tindicessub3.ddl rename to tools/test/h5dump/expected/tindicessub3.ddl diff --git a/tools/testfiles/tindicessub4.ddl b/tools/test/h5dump/expected/tindicessub4.ddl similarity index 100% rename from tools/testfiles/tindicessub4.ddl rename to tools/test/h5dump/expected/tindicessub4.ddl diff --git a/tools/testfiles/tindicesyes.ddl b/tools/test/h5dump/expected/tindicesyes.ddl similarity index 100% rename from tools/testfiles/tindicesyes.ddl rename to tools/test/h5dump/expected/tindicesyes.ddl diff --git a/tools/testfiles/tints4dims.ddl b/tools/test/h5dump/expected/tints4dims.ddl similarity index 100% rename from tools/testfiles/tints4dims.ddl rename to tools/test/h5dump/expected/tints4dims.ddl diff --git a/tools/testfiles/tints4dimsBlock2.ddl b/tools/test/h5dump/expected/tints4dimsBlock2.ddl similarity index 100% rename from tools/testfiles/tints4dimsBlock2.ddl rename to tools/test/h5dump/expected/tints4dimsBlock2.ddl diff --git a/tools/testfiles/tints4dimsBlockEq.ddl b/tools/test/h5dump/expected/tints4dimsBlockEq.ddl similarity index 100% rename from tools/testfiles/tints4dimsBlockEq.ddl rename to tools/test/h5dump/expected/tints4dimsBlockEq.ddl diff --git a/tools/testfiles/tints4dimsCount2.ddl b/tools/test/h5dump/expected/tints4dimsCount2.ddl similarity index 100% rename from tools/testfiles/tints4dimsCount2.ddl rename to tools/test/h5dump/expected/tints4dimsCount2.ddl diff --git a/tools/testfiles/tints4dimsCountEq.ddl b/tools/test/h5dump/expected/tints4dimsCountEq.ddl similarity index 100% rename from tools/testfiles/tints4dimsCountEq.ddl rename to tools/test/h5dump/expected/tints4dimsCountEq.ddl diff --git a/tools/testfiles/tints4dimsStride2.ddl b/tools/test/h5dump/expected/tints4dimsStride2.ddl similarity index 100% rename from tools/testfiles/tints4dimsStride2.ddl rename to tools/test/h5dump/expected/tints4dimsStride2.ddl diff --git a/tools/testfiles/tintsattrs.ddl b/tools/test/h5dump/expected/tintsattrs.ddl similarity index 100% rename from tools/testfiles/tintsattrs.ddl rename to tools/test/h5dump/expected/tintsattrs.ddl diff --git a/tools/testfiles/tintsnodata.ddl b/tools/test/h5dump/expected/tintsnodata.ddl similarity index 100% rename from tools/testfiles/tintsnodata.ddl rename to tools/test/h5dump/expected/tintsnodata.ddl diff --git a/tools/testfiles/tlarge_objname.ddl b/tools/test/h5dump/expected/tlarge_objname.ddl similarity index 100% rename from tools/testfiles/tlarge_objname.ddl rename to tools/test/h5dump/expected/tlarge_objname.ddl diff --git a/tools/testfiles/tldouble.ddl b/tools/test/h5dump/expected/tldouble.ddl similarity index 100% rename from tools/testfiles/tldouble.ddl rename to tools/test/h5dump/expected/tldouble.ddl diff --git a/tools/testfiles/tldouble_scalar.ddl b/tools/test/h5dump/expected/tldouble_scalar.ddl similarity index 100% rename from tools/testfiles/tldouble_scalar.ddl rename to tools/test/h5dump/expected/tldouble_scalar.ddl diff --git a/tools/testfiles/tlonglinks.ddl b/tools/test/h5dump/expected/tlonglinks.ddl similarity index 100% rename from tools/testfiles/tlonglinks.ddl rename to tools/test/h5dump/expected/tlonglinks.ddl diff --git a/tools/testfiles/tloop-1.ddl b/tools/test/h5dump/expected/tloop-1.ddl similarity index 100% rename from tools/testfiles/tloop-1.ddl rename to tools/test/h5dump/expected/tloop-1.ddl diff --git a/tools/testfiles/tmulti.ddl b/tools/test/h5dump/expected/tmulti.ddl similarity index 100% rename from tools/testfiles/tmulti.ddl rename to tools/test/h5dump/expected/tmulti.ddl diff --git a/tools/testfiles/tmultifile.ddl b/tools/test/h5dump/expected/tmultifile.ddl similarity index 100% rename from tools/testfiles/tmultifile.ddl rename to tools/test/h5dump/expected/tmultifile.ddl diff --git a/tools/testfiles/tnamed_dtype_attr.ddl b/tools/test/h5dump/expected/tnamed_dtype_attr.ddl similarity index 100% rename from tools/testfiles/tnamed_dtype_attr.ddl rename to tools/test/h5dump/expected/tnamed_dtype_attr.ddl diff --git a/tools/testfiles/tnbit.ddl b/tools/test/h5dump/expected/tnbit.ddl similarity index 100% rename from tools/testfiles/tnbit.ddl rename to tools/test/h5dump/expected/tnbit.ddl diff --git a/tools/testfiles/tnestcomp-1.ddl b/tools/test/h5dump/expected/tnestcomp-1.ddl similarity index 100% rename from tools/testfiles/tnestcomp-1.ddl rename to tools/test/h5dump/expected/tnestcomp-1.ddl diff --git a/tools/testfiles/tnestedcmpddt.ddl b/tools/test/h5dump/expected/tnestedcmpddt.ddl similarity index 100% rename from tools/testfiles/tnestedcmpddt.ddl rename to tools/test/h5dump/expected/tnestedcmpddt.ddl diff --git a/tools/testfiles/tno-subset.ddl b/tools/test/h5dump/expected/tno-subset.ddl similarity index 100% rename from tools/testfiles/tno-subset.ddl rename to tools/test/h5dump/expected/tno-subset.ddl diff --git a/tools/testfiles/tnoattrdata.ddl b/tools/test/h5dump/expected/tnoattrdata.ddl similarity index 100% rename from tools/testfiles/tnoattrdata.ddl rename to tools/test/h5dump/expected/tnoattrdata.ddl diff --git a/tools/testfiles/tnoattrddl.ddl b/tools/test/h5dump/expected/tnoattrddl.ddl similarity index 100% rename from tools/testfiles/tnoattrddl.ddl rename to tools/test/h5dump/expected/tnoattrddl.ddl diff --git a/tools/testfiles/tnodata.ddl b/tools/test/h5dump/expected/tnodata.ddl similarity index 100% rename from tools/testfiles/tnodata.ddl rename to tools/test/h5dump/expected/tnodata.ddl diff --git a/tools/testfiles/tnoddl.ddl b/tools/test/h5dump/expected/tnoddl.ddl similarity index 100% rename from tools/testfiles/tnoddl.ddl rename to tools/test/h5dump/expected/tnoddl.ddl diff --git a/tools/testfiles/tnoddlfile.ddl b/tools/test/h5dump/expected/tnoddlfile.ddl similarity index 100% rename from tools/testfiles/tnoddlfile.ddl rename to tools/test/h5dump/expected/tnoddlfile.ddl diff --git a/tools/testfiles/tnullspace.ddl b/tools/test/h5dump/expected/tnullspace.ddl similarity index 100% rename from tools/testfiles/tnullspace.ddl rename to tools/test/h5dump/expected/tnullspace.ddl diff --git a/tools/testfiles/torderattr1.ddl b/tools/test/h5dump/expected/torderattr1.ddl similarity index 100% rename from tools/testfiles/torderattr1.ddl rename to tools/test/h5dump/expected/torderattr1.ddl diff --git a/tools/testfiles/torderattr2.ddl b/tools/test/h5dump/expected/torderattr2.ddl similarity index 100% rename from tools/testfiles/torderattr2.ddl rename to tools/test/h5dump/expected/torderattr2.ddl diff --git a/tools/testfiles/torderattr3.ddl b/tools/test/h5dump/expected/torderattr3.ddl similarity index 100% rename from tools/testfiles/torderattr3.ddl rename to tools/test/h5dump/expected/torderattr3.ddl diff --git a/tools/testfiles/torderattr4.ddl b/tools/test/h5dump/expected/torderattr4.ddl similarity index 100% rename from tools/testfiles/torderattr4.ddl rename to tools/test/h5dump/expected/torderattr4.ddl diff --git a/tools/testfiles/tordercontents1.ddl b/tools/test/h5dump/expected/tordercontents1.ddl similarity index 100% rename from tools/testfiles/tordercontents1.ddl rename to tools/test/h5dump/expected/tordercontents1.ddl diff --git a/tools/testfiles/tordercontents2.ddl b/tools/test/h5dump/expected/tordercontents2.ddl similarity index 100% rename from tools/testfiles/tordercontents2.ddl rename to tools/test/h5dump/expected/tordercontents2.ddl diff --git a/tools/testfiles/tordergr1.ddl b/tools/test/h5dump/expected/tordergr1.ddl similarity index 100% rename from tools/testfiles/tordergr1.ddl rename to tools/test/h5dump/expected/tordergr1.ddl diff --git a/tools/testfiles/tordergr2.ddl b/tools/test/h5dump/expected/tordergr2.ddl similarity index 100% rename from tools/testfiles/tordergr2.ddl rename to tools/test/h5dump/expected/tordergr2.ddl diff --git a/tools/testfiles/tordergr3.ddl b/tools/test/h5dump/expected/tordergr3.ddl similarity index 100% rename from tools/testfiles/tordergr3.ddl rename to tools/test/h5dump/expected/tordergr3.ddl diff --git a/tools/testfiles/tordergr4.ddl b/tools/test/h5dump/expected/tordergr4.ddl similarity index 100% rename from tools/testfiles/tordergr4.ddl rename to tools/test/h5dump/expected/tordergr4.ddl diff --git a/tools/testfiles/tordergr5.ddl b/tools/test/h5dump/expected/tordergr5.ddl similarity index 100% rename from tools/testfiles/tordergr5.ddl rename to tools/test/h5dump/expected/tordergr5.ddl diff --git a/tools/testfiles/torderlinks1.ddl b/tools/test/h5dump/expected/torderlinks1.ddl similarity index 100% rename from tools/testfiles/torderlinks1.ddl rename to tools/test/h5dump/expected/torderlinks1.ddl diff --git a/tools/testfiles/torderlinks2.ddl b/tools/test/h5dump/expected/torderlinks2.ddl similarity index 100% rename from tools/testfiles/torderlinks2.ddl rename to tools/test/h5dump/expected/torderlinks2.ddl diff --git a/tools/testfiles/tperror.ddl b/tools/test/h5dump/expected/tperror.ddl similarity index 100% rename from tools/testfiles/tperror.ddl rename to tools/test/h5dump/expected/tperror.ddl diff --git a/tools/testfiles/tqmarkfile.ddl b/tools/test/h5dump/expected/tqmarkfile.ddl similarity index 100% rename from tools/testfiles/tqmarkfile.ddl rename to tools/test/h5dump/expected/tqmarkfile.ddl diff --git a/tools/testfiles/trawdatafile.ddl b/tools/test/h5dump/expected/trawdatafile.ddl similarity index 100% rename from tools/testfiles/trawdatafile.ddl rename to tools/test/h5dump/expected/trawdatafile.ddl diff --git a/tools/testfiles/trawssetfile.ddl b/tools/test/h5dump/expected/trawssetfile.ddl similarity index 100% rename from tools/testfiles/trawssetfile.ddl rename to tools/test/h5dump/expected/trawssetfile.ddl diff --git a/tools/testfiles/treadfilter.ddl b/tools/test/h5dump/expected/treadfilter.ddl similarity index 100% rename from tools/testfiles/treadfilter.ddl rename to tools/test/h5dump/expected/treadfilter.ddl diff --git a/tools/testfiles/treadintfilter.ddl b/tools/test/h5dump/expected/treadintfilter.ddl similarity index 100% rename from tools/testfiles/treadintfilter.ddl rename to tools/test/h5dump/expected/treadintfilter.ddl diff --git a/tools/testfiles/trefer_attrR.ddl b/tools/test/h5dump/expected/trefer_attrR.ddl similarity index 100% rename from tools/testfiles/trefer_attrR.ddl rename to tools/test/h5dump/expected/trefer_attrR.ddl diff --git a/tools/testfiles/trefer_compatR.ddl b/tools/test/h5dump/expected/trefer_compatR.ddl similarity index 100% rename from tools/testfiles/trefer_compatR.ddl rename to tools/test/h5dump/expected/trefer_compatR.ddl diff --git a/tools/testfiles/trefer_extR.ddl b/tools/test/h5dump/expected/trefer_extR.ddl similarity index 100% rename from tools/testfiles/trefer_extR.ddl rename to tools/test/h5dump/expected/trefer_extR.ddl diff --git a/tools/testfiles/trefer_grpR.ddl b/tools/test/h5dump/expected/trefer_grpR.ddl similarity index 100% rename from tools/testfiles/trefer_grpR.ddl rename to tools/test/h5dump/expected/trefer_grpR.ddl diff --git a/tools/testfiles/trefer_objR.ddl b/tools/test/h5dump/expected/trefer_objR.ddl similarity index 100% rename from tools/testfiles/trefer_objR.ddl rename to tools/test/h5dump/expected/trefer_objR.ddl diff --git a/tools/testfiles/trefer_obj_delR.ddl b/tools/test/h5dump/expected/trefer_obj_delR.ddl similarity index 100% rename from tools/testfiles/trefer_obj_delR.ddl rename to tools/test/h5dump/expected/trefer_obj_delR.ddl diff --git a/tools/testfiles/trefer_paramR.ddl b/tools/test/h5dump/expected/trefer_paramR.ddl similarity index 100% rename from tools/testfiles/trefer_paramR.ddl rename to tools/test/h5dump/expected/trefer_paramR.ddl diff --git a/tools/testfiles/trefer_regR.ddl b/tools/test/h5dump/expected/trefer_regR.ddl similarity index 100% rename from tools/testfiles/trefer_regR.ddl rename to tools/test/h5dump/expected/trefer_regR.ddl diff --git a/tools/testfiles/trefer_reg_1dR.ddl b/tools/test/h5dump/expected/trefer_reg_1dR.ddl similarity index 100% rename from tools/testfiles/trefer_reg_1dR.ddl rename to tools/test/h5dump/expected/trefer_reg_1dR.ddl diff --git a/tools/testfiles/treference.ddl b/tools/test/h5dump/expected/treference.ddl similarity index 100% rename from tools/testfiles/treference.ddl rename to tools/test/h5dump/expected/treference.ddl diff --git a/tools/testfiles/tsaf.ddl b/tools/test/h5dump/expected/tsaf.ddl similarity index 100% rename from tools/testfiles/tsaf.ddl rename to tools/test/h5dump/expected/tsaf.ddl diff --git a/tools/testfiles/tscalarattrintsize.ddl b/tools/test/h5dump/expected/tscalarattrintsize.ddl similarity index 100% rename from tools/testfiles/tscalarattrintsize.ddl rename to tools/test/h5dump/expected/tscalarattrintsize.ddl diff --git a/tools/testfiles/tscalarintattrsize.ddl b/tools/test/h5dump/expected/tscalarintattrsize.ddl similarity index 100% rename from tools/testfiles/tscalarintattrsize.ddl rename to tools/test/h5dump/expected/tscalarintattrsize.ddl diff --git a/tools/testfiles/tscalarintsize.ddl b/tools/test/h5dump/expected/tscalarintsize.ddl similarity index 100% rename from tools/testfiles/tscalarintsize.ddl rename to tools/test/h5dump/expected/tscalarintsize.ddl diff --git a/tools/testfiles/tscalarstring.ddl b/tools/test/h5dump/expected/tscalarstring.ddl similarity index 100% rename from tools/testfiles/tscalarstring.ddl rename to tools/test/h5dump/expected/tscalarstring.ddl diff --git a/tools/testfiles/tscaleoffset.ddl b/tools/test/h5dump/expected/tscaleoffset.ddl similarity index 100% rename from tools/testfiles/tscaleoffset.ddl rename to tools/test/h5dump/expected/tscaleoffset.ddl diff --git a/tools/testfiles/tshuffle.ddl b/tools/test/h5dump/expected/tshuffle.ddl similarity index 100% rename from tools/testfiles/tshuffle.ddl rename to tools/test/h5dump/expected/tshuffle.ddl diff --git a/tools/testfiles/tslink-1.ddl b/tools/test/h5dump/expected/tslink-1.ddl similarity index 100% rename from tools/testfiles/tslink-1.ddl rename to tools/test/h5dump/expected/tslink-1.ddl diff --git a/tools/testfiles/tslink-2.ddl b/tools/test/h5dump/expected/tslink-2.ddl similarity index 100% rename from tools/testfiles/tslink-2.ddl rename to tools/test/h5dump/expected/tslink-2.ddl diff --git a/tools/testfiles/tslink-D.ddl b/tools/test/h5dump/expected/tslink-D.ddl similarity index 100% rename from tools/testfiles/tslink-D.ddl rename to tools/test/h5dump/expected/tslink-D.ddl diff --git a/tools/testfiles/tsplit_file.ddl b/tools/test/h5dump/expected/tsplit_file.ddl similarity index 100% rename from tools/testfiles/tsplit_file.ddl rename to tools/test/h5dump/expected/tsplit_file.ddl diff --git a/tools/testfiles/tst_onion_dset_1d.ddl b/tools/test/h5dump/expected/tst_onion_dset_1d.ddl similarity index 100% rename from tools/testfiles/tst_onion_dset_1d.ddl rename to tools/test/h5dump/expected/tst_onion_dset_1d.ddl diff --git a/tools/testfiles/tst_onion_dset_ext.ddl b/tools/test/h5dump/expected/tst_onion_dset_ext.ddl similarity index 100% rename from tools/testfiles/tst_onion_dset_ext.ddl rename to tools/test/h5dump/expected/tst_onion_dset_ext.ddl diff --git a/tools/testfiles/tst_onion_objs.ddl b/tools/test/h5dump/expected/tst_onion_objs.ddl similarity index 100% rename from tools/testfiles/tst_onion_objs.ddl rename to tools/test/h5dump/expected/tst_onion_objs.ddl diff --git a/tools/testfiles/tst_onion_revision_count.ddl b/tools/test/h5dump/expected/tst_onion_revision_count.ddl similarity index 100% rename from tools/testfiles/tst_onion_revision_count.ddl rename to tools/test/h5dump/expected/tst_onion_revision_count.ddl diff --git a/tools/testfiles/tstarfile.ddl b/tools/test/h5dump/expected/tstarfile.ddl similarity index 100% rename from tools/testfiles/tstarfile.ddl rename to tools/test/h5dump/expected/tstarfile.ddl diff --git a/tools/testfiles/tstr-1.ddl b/tools/test/h5dump/expected/tstr-1.ddl similarity index 100% rename from tools/testfiles/tstr-1.ddl rename to tools/test/h5dump/expected/tstr-1.ddl diff --git a/tools/testfiles/tstr-2.ddl b/tools/test/h5dump/expected/tstr-2.ddl similarity index 100% rename from tools/testfiles/tstr-2.ddl rename to tools/test/h5dump/expected/tstr-2.ddl diff --git a/tools/testfiles/tstring.ddl b/tools/test/h5dump/expected/tstring.ddl similarity index 100% rename from tools/testfiles/tstring.ddl rename to tools/test/h5dump/expected/tstring.ddl diff --git a/tools/testfiles/tstring2.ddl b/tools/test/h5dump/expected/tstring2.ddl similarity index 100% rename from tools/testfiles/tstring2.ddl rename to tools/test/h5dump/expected/tstring2.ddl diff --git a/tools/testfiles/tstringe.ddl b/tools/test/h5dump/expected/tstringe.ddl similarity index 100% rename from tools/testfiles/tstringe.ddl rename to tools/test/h5dump/expected/tstringe.ddl diff --git a/tools/testfiles/tszip.ddl b/tools/test/h5dump/expected/tszip.ddl similarity index 100% rename from tools/testfiles/tszip.ddl rename to tools/test/h5dump/expected/tszip.ddl diff --git a/tools/testfiles/tudfilter.ddl b/tools/test/h5dump/expected/tudfilter.ddl similarity index 100% rename from tools/testfiles/tudfilter.ddl rename to tools/test/h5dump/expected/tudfilter.ddl diff --git a/tools/testfiles/tudlink-1.ddl b/tools/test/h5dump/expected/tudlink-1.ddl similarity index 100% rename from tools/testfiles/tudlink-1.ddl rename to tools/test/h5dump/expected/tudlink-1.ddl diff --git a/tools/testfiles/tudlink-2.ddl b/tools/test/h5dump/expected/tudlink-2.ddl similarity index 100% rename from tools/testfiles/tudlink-2.ddl rename to tools/test/h5dump/expected/tudlink-2.ddl diff --git a/tools/testfiles/tuserfilter.ddl b/tools/test/h5dump/expected/tuserfilter.ddl similarity index 100% rename from tools/testfiles/tuserfilter.ddl rename to tools/test/h5dump/expected/tuserfilter.ddl diff --git a/tools/testfiles/tvldtypes1.ddl b/tools/test/h5dump/expected/tvldtypes1.ddl similarity index 100% rename from tools/testfiles/tvldtypes1.ddl rename to tools/test/h5dump/expected/tvldtypes1.ddl diff --git a/tools/testfiles/tvldtypes2.ddl b/tools/test/h5dump/expected/tvldtypes2.ddl similarity index 100% rename from tools/testfiles/tvldtypes2.ddl rename to tools/test/h5dump/expected/tvldtypes2.ddl diff --git a/tools/testfiles/tvldtypes3.ddl b/tools/test/h5dump/expected/tvldtypes3.ddl similarity index 100% rename from tools/testfiles/tvldtypes3.ddl rename to tools/test/h5dump/expected/tvldtypes3.ddl diff --git a/tools/testfiles/tvldtypes4.ddl b/tools/test/h5dump/expected/tvldtypes4.ddl similarity index 100% rename from tools/testfiles/tvldtypes4.ddl rename to tools/test/h5dump/expected/tvldtypes4.ddl diff --git a/tools/testfiles/tvldtypes5.ddl b/tools/test/h5dump/expected/tvldtypes5.ddl similarity index 100% rename from tools/testfiles/tvldtypes5.ddl rename to tools/test/h5dump/expected/tvldtypes5.ddl diff --git a/tools/testfiles/tvlenstr_array.ddl b/tools/test/h5dump/expected/tvlenstr_array.ddl similarity index 100% rename from tools/testfiles/tvlenstr_array.ddl rename to tools/test/h5dump/expected/tvlenstr_array.ddl diff --git a/tools/testfiles/tvlstr.ddl b/tools/test/h5dump/expected/tvlstr.ddl similarity index 100% rename from tools/testfiles/tvlstr.ddl rename to tools/test/h5dump/expected/tvlstr.ddl diff --git a/tools/testfiles/tvms.ddl b/tools/test/h5dump/expected/tvms.ddl similarity index 100% rename from tools/testfiles/tvms.ddl rename to tools/test/h5dump/expected/tvms.ddl diff --git a/tools/testfiles/twidedisplay.ddl b/tools/test/h5dump/expected/twidedisplay.ddl similarity index 100% rename from tools/testfiles/twidedisplay.ddl rename to tools/test/h5dump/expected/twidedisplay.ddl diff --git a/tools/testfiles/twithddlfile.ddl b/tools/test/h5dump/expected/twithddlfile.ddl similarity index 100% rename from tools/testfiles/twithddlfile.ddl rename to tools/test/h5dump/expected/twithddlfile.ddl diff --git a/tools/testfiles/vds/tvds-1.ddl b/tools/test/h5dump/expected/vds/tvds-1.ddl similarity index 100% rename from tools/testfiles/vds/tvds-1.ddl rename to tools/test/h5dump/expected/vds/tvds-1.ddl diff --git a/tools/testfiles/vds/tvds-2.ddl b/tools/test/h5dump/expected/vds/tvds-2.ddl similarity index 100% rename from tools/testfiles/vds/tvds-2.ddl rename to tools/test/h5dump/expected/vds/tvds-2.ddl diff --git a/tools/testfiles/vds/tvds-3_1.ddl b/tools/test/h5dump/expected/vds/tvds-3_1.ddl similarity index 100% rename from tools/testfiles/vds/tvds-3_1.ddl rename to tools/test/h5dump/expected/vds/tvds-3_1.ddl diff --git a/tools/testfiles/vds/tvds-3_2.ddl b/tools/test/h5dump/expected/vds/tvds-3_2.ddl similarity index 100% rename from tools/testfiles/vds/tvds-3_2.ddl rename to tools/test/h5dump/expected/vds/tvds-3_2.ddl diff --git a/tools/testfiles/vds/tvds-4.ddl b/tools/test/h5dump/expected/vds/tvds-4.ddl similarity index 100% rename from tools/testfiles/vds/tvds-4.ddl rename to tools/test/h5dump/expected/vds/tvds-4.ddl diff --git a/tools/testfiles/vds/tvds-5.ddl b/tools/test/h5dump/expected/vds/tvds-5.ddl similarity index 100% rename from tools/testfiles/vds/tvds-5.ddl rename to tools/test/h5dump/expected/vds/tvds-5.ddl diff --git a/tools/testfiles/vds/tvds_layout-1.ddl b/tools/test/h5dump/expected/vds/tvds_layout-1.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-1.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-1.ddl diff --git a/tools/testfiles/vds/tvds_layout-2.ddl b/tools/test/h5dump/expected/vds/tvds_layout-2.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-2.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-2.ddl diff --git a/tools/testfiles/vds/tvds_layout-3_1.ddl b/tools/test/h5dump/expected/vds/tvds_layout-3_1.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-3_1.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-3_1.ddl diff --git a/tools/testfiles/vds/tvds_layout-3_2.ddl b/tools/test/h5dump/expected/vds/tvds_layout-3_2.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-3_2.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-3_2.ddl diff --git a/tools/testfiles/vds/tvds_layout-4.ddl b/tools/test/h5dump/expected/vds/tvds_layout-4.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-4.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-4.ddl diff --git a/tools/testfiles/vds/tvds_layout-5.ddl b/tools/test/h5dump/expected/vds/tvds_layout-5.ddl similarity index 100% rename from tools/testfiles/vds/tvds_layout-5.ddl rename to tools/test/h5dump/expected/vds/tvds_layout-5.ddl diff --git a/tools/testfiles/vds/vds-first.ddl b/tools/test/h5dump/expected/vds/vds-first.ddl similarity index 100% rename from tools/testfiles/vds/vds-first.ddl rename to tools/test/h5dump/expected/vds/vds-first.ddl diff --git a/tools/testfiles/vds/vds-gap1.ddl b/tools/test/h5dump/expected/vds/vds-gap1.ddl similarity index 100% rename from tools/testfiles/vds/vds-gap1.ddl rename to tools/test/h5dump/expected/vds/vds-gap1.ddl diff --git a/tools/testfiles/vds/vds-gap2.ddl b/tools/test/h5dump/expected/vds/vds-gap2.ddl similarity index 100% rename from tools/testfiles/vds/vds-gap2.ddl rename to tools/test/h5dump/expected/vds/vds-gap2.ddl diff --git a/tools/testfiles/vds/vds_layout-eiger.ddl b/tools/test/h5dump/expected/vds/vds_layout-eiger.ddl similarity index 100% rename from tools/testfiles/vds/vds_layout-eiger.ddl rename to tools/test/h5dump/expected/vds/vds_layout-eiger.ddl diff --git a/tools/testfiles/vds/vds_layout-maxmin.ddl b/tools/test/h5dump/expected/vds/vds_layout-maxmin.ddl similarity index 100% rename from tools/testfiles/vds/vds_layout-maxmin.ddl rename to tools/test/h5dump/expected/vds/vds_layout-maxmin.ddl diff --git a/tools/testfiles/tall-2A.h5.xml b/tools/test/h5dump/expected/xml/tall-2A.h5.xml similarity index 100% rename from tools/testfiles/tall-2A.h5.xml rename to tools/test/h5dump/expected/xml/tall-2A.h5.xml diff --git a/tools/testfiles/tall.h5.xml b/tools/test/h5dump/expected/xml/tall.h5.xml similarity index 100% rename from tools/testfiles/tall.h5.xml rename to tools/test/h5dump/expected/xml/tall.h5.xml diff --git a/tools/testfiles/tarray1.h5.xml b/tools/test/h5dump/expected/xml/tarray1.h5.xml similarity index 100% rename from tools/testfiles/tarray1.h5.xml rename to tools/test/h5dump/expected/xml/tarray1.h5.xml diff --git a/tools/testfiles/tarray2.h5.xml b/tools/test/h5dump/expected/xml/tarray2.h5.xml similarity index 100% rename from tools/testfiles/tarray2.h5.xml rename to tools/test/h5dump/expected/xml/tarray2.h5.xml diff --git a/tools/testfiles/tarray3.h5.xml b/tools/test/h5dump/expected/xml/tarray3.h5.xml similarity index 100% rename from tools/testfiles/tarray3.h5.xml rename to tools/test/h5dump/expected/xml/tarray3.h5.xml diff --git a/tools/testfiles/tarray6.h5.xml b/tools/test/h5dump/expected/xml/tarray6.h5.xml similarity index 100% rename from tools/testfiles/tarray6.h5.xml rename to tools/test/h5dump/expected/xml/tarray6.h5.xml diff --git a/tools/testfiles/tarray7.h5.xml b/tools/test/h5dump/expected/xml/tarray7.h5.xml similarity index 100% rename from tools/testfiles/tarray7.h5.xml rename to tools/test/h5dump/expected/xml/tarray7.h5.xml diff --git a/tools/testfiles/tattr.h5.xml b/tools/test/h5dump/expected/xml/tattr.h5.xml similarity index 100% rename from tools/testfiles/tattr.h5.xml rename to tools/test/h5dump/expected/xml/tattr.h5.xml diff --git a/tools/testfiles/tbitfields_be.h5.xml b/tools/test/h5dump/expected/xml/tbitfields_be.h5.xml similarity index 100% rename from tools/testfiles/tbitfields_be.h5.xml rename to tools/test/h5dump/expected/xml/tbitfields_be.h5.xml diff --git a/tools/testfiles/tbitfields_le.h5.xml b/tools/test/h5dump/expected/xml/tbitfields_le.h5.xml similarity index 100% rename from tools/testfiles/tbitfields_le.h5.xml rename to tools/test/h5dump/expected/xml/tbitfields_le.h5.xml diff --git a/tools/testfiles/tcompound.h5.xml b/tools/test/h5dump/expected/xml/tcompound.h5.xml similarity index 100% rename from tools/testfiles/tcompound.h5.xml rename to tools/test/h5dump/expected/xml/tcompound.h5.xml diff --git a/tools/testfiles/tcompound2.h5.xml b/tools/test/h5dump/expected/xml/tcompound2.h5.xml similarity index 100% rename from tools/testfiles/tcompound2.h5.xml rename to tools/test/h5dump/expected/xml/tcompound2.h5.xml diff --git a/tools/testfiles/tcompound_complex.h5.xml b/tools/test/h5dump/expected/xml/tcompound_complex.h5.xml similarity index 100% rename from tools/testfiles/tcompound_complex.h5.xml rename to tools/test/h5dump/expected/xml/tcompound_complex.h5.xml diff --git a/tools/testfiles/tdatareg.h5.xml b/tools/test/h5dump/expected/xml/tdatareg.h5.xml similarity index 100% rename from tools/testfiles/tdatareg.h5.xml rename to tools/test/h5dump/expected/xml/tdatareg.h5.xml diff --git a/tools/testfiles/tdset.h5.xml b/tools/test/h5dump/expected/xml/tdset.h5.xml similarity index 100% rename from tools/testfiles/tdset.h5.xml rename to tools/test/h5dump/expected/xml/tdset.h5.xml diff --git a/tools/testfiles/tdset2.h5.xml b/tools/test/h5dump/expected/xml/tdset2.h5.xml similarity index 100% rename from tools/testfiles/tdset2.h5.xml rename to tools/test/h5dump/expected/xml/tdset2.h5.xml diff --git a/tools/testfiles/tempty-dtd-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml similarity index 100% rename from tools/testfiles/tempty-dtd-2.h5.xml rename to tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml diff --git a/tools/testfiles/tempty-dtd-uri.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd-uri.h5.xml similarity index 100% rename from tools/testfiles/tempty-dtd-uri.h5.xml rename to tools/test/h5dump/expected/xml/tempty-dtd-uri.h5.xml diff --git a/tools/testfiles/tempty-dtd.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd.h5.xml similarity index 100% rename from tools/testfiles/tempty-dtd.h5.xml rename to tools/test/h5dump/expected/xml/tempty-dtd.h5.xml diff --git a/tools/testfiles/tempty-nons-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml similarity index 100% rename from tools/testfiles/tempty-nons-2.h5.xml rename to tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml diff --git a/tools/testfiles/tempty-nons-uri.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons-uri.h5.xml similarity index 100% rename from tools/testfiles/tempty-nons-uri.h5.xml rename to tools/test/h5dump/expected/xml/tempty-nons-uri.h5.xml diff --git a/tools/testfiles/tempty-nons.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons.h5.xml similarity index 100% rename from tools/testfiles/tempty-nons.h5.xml rename to tools/test/h5dump/expected/xml/tempty-nons.h5.xml diff --git a/tools/testfiles/tempty-ns-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml similarity index 100% rename from tools/testfiles/tempty-ns-2.h5.xml rename to tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml diff --git a/tools/testfiles/tempty-ns.h5.xml b/tools/test/h5dump/expected/xml/tempty-ns.h5.xml similarity index 100% rename from tools/testfiles/tempty-ns.h5.xml rename to tools/test/h5dump/expected/xml/tempty-ns.h5.xml diff --git a/tools/testfiles/tempty.h5.xml b/tools/test/h5dump/expected/xml/tempty.h5.xml similarity index 100% rename from tools/testfiles/tempty.h5.xml rename to tools/test/h5dump/expected/xml/tempty.h5.xml diff --git a/tools/testfiles/tenum.h5.xml b/tools/test/h5dump/expected/xml/tenum.h5.xml similarity index 100% rename from tools/testfiles/tenum.h5.xml rename to tools/test/h5dump/expected/xml/tenum.h5.xml diff --git a/tools/testfiles/test35.nc.xml b/tools/test/h5dump/expected/xml/test35.nc.xml similarity index 100% rename from tools/testfiles/test35.nc.xml rename to tools/test/h5dump/expected/xml/test35.nc.xml diff --git a/tools/testfiles/textlink.h5.xml b/tools/test/h5dump/expected/xml/textlink.h5.xml similarity index 100% rename from tools/testfiles/textlink.h5.xml rename to tools/test/h5dump/expected/xml/textlink.h5.xml diff --git a/tools/testfiles/tfpformat.h5.xml b/tools/test/h5dump/expected/xml/tfpformat.h5.xml similarity index 100% rename from tools/testfiles/tfpformat.h5.xml rename to tools/test/h5dump/expected/xml/tfpformat.h5.xml diff --git a/tools/testfiles/tgroup.h5.xml b/tools/test/h5dump/expected/xml/tgroup.h5.xml similarity index 100% rename from tools/testfiles/tgroup.h5.xml rename to tools/test/h5dump/expected/xml/tgroup.h5.xml diff --git a/tools/testfiles/thlink.h5.xml b/tools/test/h5dump/expected/xml/thlink.h5.xml similarity index 100% rename from tools/testfiles/thlink.h5.xml rename to tools/test/h5dump/expected/xml/thlink.h5.xml diff --git a/tools/testfiles/tloop.h5.xml b/tools/test/h5dump/expected/xml/tloop.h5.xml similarity index 100% rename from tools/testfiles/tloop.h5.xml rename to tools/test/h5dump/expected/xml/tloop.h5.xml diff --git a/tools/testfiles/tloop2.h5.xml b/tools/test/h5dump/expected/xml/tloop2.h5.xml similarity index 100% rename from tools/testfiles/tloop2.h5.xml rename to tools/test/h5dump/expected/xml/tloop2.h5.xml diff --git a/tools/testfiles/tmany.h5.xml b/tools/test/h5dump/expected/xml/tmany.h5.xml similarity index 100% rename from tools/testfiles/tmany.h5.xml rename to tools/test/h5dump/expected/xml/tmany.h5.xml diff --git a/tools/testfiles/tname-amp.h5.xml b/tools/test/h5dump/expected/xml/tname-amp.h5.xml similarity index 100% rename from tools/testfiles/tname-amp.h5.xml rename to tools/test/h5dump/expected/xml/tname-amp.h5.xml diff --git a/tools/testfiles/tname-apos.h5.xml b/tools/test/h5dump/expected/xml/tname-apos.h5.xml similarity index 100% rename from tools/testfiles/tname-apos.h5.xml rename to tools/test/h5dump/expected/xml/tname-apos.h5.xml diff --git a/tools/testfiles/tname-gt.h5.xml b/tools/test/h5dump/expected/xml/tname-gt.h5.xml similarity index 100% rename from tools/testfiles/tname-gt.h5.xml rename to tools/test/h5dump/expected/xml/tname-gt.h5.xml diff --git a/tools/testfiles/tname-lt.h5.xml b/tools/test/h5dump/expected/xml/tname-lt.h5.xml similarity index 100% rename from tools/testfiles/tname-lt.h5.xml rename to tools/test/h5dump/expected/xml/tname-lt.h5.xml diff --git a/tools/testfiles/tname-quot.h5.xml b/tools/test/h5dump/expected/xml/tname-quot.h5.xml similarity index 100% rename from tools/testfiles/tname-quot.h5.xml rename to tools/test/h5dump/expected/xml/tname-quot.h5.xml diff --git a/tools/testfiles/tname-sp.h5.xml b/tools/test/h5dump/expected/xml/tname-sp.h5.xml similarity index 100% rename from tools/testfiles/tname-sp.h5.xml rename to tools/test/h5dump/expected/xml/tname-sp.h5.xml diff --git a/tools/testfiles/tnamed_dtype_attr.h5.xml b/tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml similarity index 100% rename from tools/testfiles/tnamed_dtype_attr.h5.xml rename to tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml diff --git a/tools/testfiles/tnestedcomp.h5.xml b/tools/test/h5dump/expected/xml/tnestedcomp.h5.xml similarity index 100% rename from tools/testfiles/tnestedcomp.h5.xml rename to tools/test/h5dump/expected/xml/tnestedcomp.h5.xml diff --git a/tools/testfiles/tnodata.h5.xml b/tools/test/h5dump/expected/xml/tnodata.h5.xml similarity index 100% rename from tools/testfiles/tnodata.h5.xml rename to tools/test/h5dump/expected/xml/tnodata.h5.xml diff --git a/tools/testfiles/tnullspace.h5.xml b/tools/test/h5dump/expected/xml/tnullspace.h5.xml similarity index 100% rename from tools/testfiles/tnullspace.h5.xml rename to tools/test/h5dump/expected/xml/tnullspace.h5.xml diff --git a/tools/testfiles/tobjref.h5.xml b/tools/test/h5dump/expected/xml/tobjref.h5.xml similarity index 100% rename from tools/testfiles/tobjref.h5.xml rename to tools/test/h5dump/expected/xml/tobjref.h5.xml diff --git a/tools/testfiles/topaque.h5.xml b/tools/test/h5dump/expected/xml/topaque.h5.xml similarity index 100% rename from tools/testfiles/topaque.h5.xml rename to tools/test/h5dump/expected/xml/topaque.h5.xml diff --git a/tools/testfiles/torderattr1.h5.xml b/tools/test/h5dump/expected/xml/torderattr1.h5.xml similarity index 100% rename from tools/testfiles/torderattr1.h5.xml rename to tools/test/h5dump/expected/xml/torderattr1.h5.xml diff --git a/tools/testfiles/torderattr2.h5.xml b/tools/test/h5dump/expected/xml/torderattr2.h5.xml similarity index 100% rename from tools/testfiles/torderattr2.h5.xml rename to tools/test/h5dump/expected/xml/torderattr2.h5.xml diff --git a/tools/testfiles/torderattr3.h5.xml b/tools/test/h5dump/expected/xml/torderattr3.h5.xml similarity index 100% rename from tools/testfiles/torderattr3.h5.xml rename to tools/test/h5dump/expected/xml/torderattr3.h5.xml diff --git a/tools/testfiles/torderattr4.h5.xml b/tools/test/h5dump/expected/xml/torderattr4.h5.xml similarity index 100% rename from tools/testfiles/torderattr4.h5.xml rename to tools/test/h5dump/expected/xml/torderattr4.h5.xml diff --git a/tools/testfiles/tref-escapes-at.h5.xml b/tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml similarity index 100% rename from tools/testfiles/tref-escapes-at.h5.xml rename to tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml diff --git a/tools/testfiles/tref-escapes.h5.xml b/tools/test/h5dump/expected/xml/tref-escapes.h5.xml similarity index 100% rename from tools/testfiles/tref-escapes.h5.xml rename to tools/test/h5dump/expected/xml/tref-escapes.h5.xml diff --git a/tools/testfiles/tref.h5.xml b/tools/test/h5dump/expected/xml/tref.h5.xml similarity index 100% rename from tools/testfiles/tref.h5.xml rename to tools/test/h5dump/expected/xml/tref.h5.xml diff --git a/tools/testfiles/tsaf.h5.xml b/tools/test/h5dump/expected/xml/tsaf.h5.xml similarity index 100% rename from tools/testfiles/tsaf.h5.xml rename to tools/test/h5dump/expected/xml/tsaf.h5.xml diff --git a/tools/testfiles/tslink.h5.xml b/tools/test/h5dump/expected/xml/tslink.h5.xml similarity index 100% rename from tools/testfiles/tslink.h5.xml rename to tools/test/h5dump/expected/xml/tslink.h5.xml diff --git a/tools/testfiles/tstr.h5.xml b/tools/test/h5dump/expected/xml/tstr.h5.xml similarity index 100% rename from tools/testfiles/tstr.h5.xml rename to tools/test/h5dump/expected/xml/tstr.h5.xml diff --git a/tools/testfiles/tstr2.h5.xml b/tools/test/h5dump/expected/xml/tstr2.h5.xml similarity index 100% rename from tools/testfiles/tstr2.h5.xml rename to tools/test/h5dump/expected/xml/tstr2.h5.xml diff --git a/tools/testfiles/tstring-at.h5.xml b/tools/test/h5dump/expected/xml/tstring-at.h5.xml similarity index 100% rename from tools/testfiles/tstring-at.h5.xml rename to tools/test/h5dump/expected/xml/tstring-at.h5.xml diff --git a/tools/testfiles/tstring.h5.xml b/tools/test/h5dump/expected/xml/tstring.h5.xml similarity index 100% rename from tools/testfiles/tstring.h5.xml rename to tools/test/h5dump/expected/xml/tstring.h5.xml diff --git a/tools/testfiles/tudlink.h5.xml b/tools/test/h5dump/expected/xml/tudlink.h5.xml similarity index 100% rename from tools/testfiles/tudlink.h5.xml rename to tools/test/h5dump/expected/xml/tudlink.h5.xml diff --git a/tools/testfiles/tvldtypes1.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes1.h5.xml similarity index 100% rename from tools/testfiles/tvldtypes1.h5.xml rename to tools/test/h5dump/expected/xml/tvldtypes1.h5.xml diff --git a/tools/testfiles/tvldtypes2.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes2.h5.xml similarity index 100% rename from tools/testfiles/tvldtypes2.h5.xml rename to tools/test/h5dump/expected/xml/tvldtypes2.h5.xml diff --git a/tools/testfiles/tvldtypes3.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes3.h5.xml similarity index 100% rename from tools/testfiles/tvldtypes3.h5.xml rename to tools/test/h5dump/expected/xml/tvldtypes3.h5.xml diff --git a/tools/testfiles/tvldtypes4.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes4.h5.xml similarity index 100% rename from tools/testfiles/tvldtypes4.h5.xml rename to tools/test/h5dump/expected/xml/tvldtypes4.h5.xml diff --git a/tools/testfiles/tvldtypes5.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes5.h5.xml similarity index 100% rename from tools/testfiles/tvldtypes5.h5.xml rename to tools/test/h5dump/expected/xml/tvldtypes5.h5.xml diff --git a/tools/testfiles/tvlstr.h5.xml b/tools/test/h5dump/expected/xml/tvlstr.h5.xml similarity index 100% rename from tools/testfiles/tvlstr.h5.xml rename to tools/test/h5dump/expected/xml/tvlstr.h5.xml diff --git a/tools/testfiles/zerodim.ddl b/tools/test/h5dump/expected/zerodim.ddl similarity index 100% rename from tools/testfiles/zerodim.ddl rename to tools/test/h5dump/expected/zerodim.ddl diff --git a/tools/testfiles/tall-6.exp b/tools/test/h5dump/exportfiles/tall-6.exp similarity index 100% rename from tools/testfiles/tall-6.exp rename to tools/test/h5dump/exportfiles/tall-6.exp diff --git a/tools/testfiles/tbinregR.exp b/tools/test/h5dump/exportfiles/tbinregR.exp similarity index 100% rename from tools/testfiles/tbinregR.exp rename to tools/test/h5dump/exportfiles/tbinregR.exp diff --git a/tools/testfiles/tnoddlfile.exp b/tools/test/h5dump/exportfiles/tnoddlfile.exp similarity index 100% rename from tools/testfiles/tnoddlfile.exp rename to tools/test/h5dump/exportfiles/tnoddlfile.exp diff --git a/tools/testfiles/trawdatafile.exp b/tools/test/h5dump/exportfiles/trawdatafile.exp similarity index 100% rename from tools/testfiles/trawdatafile.exp rename to tools/test/h5dump/exportfiles/trawdatafile.exp diff --git a/tools/testfiles/trawssetfile.exp b/tools/test/h5dump/exportfiles/trawssetfile.exp similarity index 100% rename from tools/testfiles/trawssetfile.exp rename to tools/test/h5dump/exportfiles/trawssetfile.exp diff --git a/tools/testfiles/tstr2bin2.exp b/tools/test/h5dump/exportfiles/tstr2bin2.exp similarity index 100% rename from tools/testfiles/tstr2bin2.exp rename to tools/test/h5dump/exportfiles/tstr2bin2.exp diff --git a/tools/testfiles/tstr2bin6.exp b/tools/test/h5dump/exportfiles/tstr2bin6.exp similarity index 100% rename from tools/testfiles/tstr2bin6.exp rename to tools/test/h5dump/exportfiles/tstr2bin6.exp diff --git a/tools/testfiles/twithddl.exp b/tools/test/h5dump/exportfiles/twithddl.exp similarity index 100% rename from tools/testfiles/twithddl.exp rename to tools/test/h5dump/exportfiles/twithddl.exp diff --git a/tools/testfiles/twithddlfile.exp b/tools/test/h5dump/exportfiles/twithddlfile.exp similarity index 100% rename from tools/testfiles/twithddlfile.exp rename to tools/test/h5dump/exportfiles/twithddlfile.exp diff --git a/tools/test/h5dump/h5dump_plugin.sh.in b/tools/test/h5dump/h5dump_plugin.sh.in index d9b77ee1017..d080c1da6a8 100644 --- a/tools/test/h5dump/h5dump_plugin.sh.in +++ b/tools/test/h5dump/h5dump_plugin.sh.in @@ -45,8 +45,8 @@ AWK='awk' SRC_TOOLS="$srcdir/../.." # testfiles source dirs for tools -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" +SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected" TESTDIR=./testplug test -d $TESTDIR || mkdir $TESTDIR @@ -62,7 +62,7 @@ test -d $TESTDIR || mkdir $TESTDIR # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES=" $SRC_H5DUMP_TESTFILES/tudfilter.h5 -$SRC_H5DUMP_TESTFILES/tudfilter.ddl +$SRC_H5DUMP_OUTFILES/tudfilter.ddl " # RUNSERIAL is used. Check if it can return exit code from executable correctly. diff --git a/tools/testfiles/charsets.h5 b/tools/test/h5dump/testfiles/charsets.h5 similarity index 100% rename from tools/testfiles/charsets.h5 rename to tools/test/h5dump/testfiles/charsets.h5 diff --git a/tools/testfiles/err_attr_dspace.h5 b/tools/test/h5dump/testfiles/err_attr_dspace.h5 similarity index 100% rename from tools/testfiles/err_attr_dspace.h5 rename to tools/test/h5dump/testfiles/err_attr_dspace.h5 diff --git a/tools/testfiles/file_space.h5 b/tools/test/h5dump/testfiles/file_space.h5 similarity index 100% rename from tools/testfiles/file_space.h5 rename to tools/test/h5dump/testfiles/file_space.h5 diff --git a/tools/testfiles/filter_fail.h5 b/tools/test/h5dump/testfiles/filter_fail.h5 similarity index 100% rename from tools/testfiles/filter_fail.h5 rename to tools/test/h5dump/testfiles/filter_fail.h5 diff --git a/tools/testfiles/packedbits.h5 b/tools/test/h5dump/testfiles/packedbits.h5 similarity index 100% rename from tools/testfiles/packedbits.h5 rename to tools/test/h5dump/testfiles/packedbits.h5 diff --git a/tools/testfiles/t128bit_float.h5 b/tools/test/h5dump/testfiles/t128bit_float.h5 similarity index 100% rename from tools/testfiles/t128bit_float.h5 rename to tools/test/h5dump/testfiles/t128bit_float.h5 diff --git a/tools/testfiles/tCVE-2021-37501_attr_decode.h5 b/tools/test/h5dump/testfiles/tCVE-2021-37501_attr_decode.h5 similarity index 100% rename from tools/testfiles/tCVE-2021-37501_attr_decode.h5 rename to tools/test/h5dump/testfiles/tCVE-2021-37501_attr_decode.h5 diff --git a/tools/testfiles/tCVE_2018_11206_fill_new.h5 b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_new.h5 similarity index 100% rename from tools/testfiles/tCVE_2018_11206_fill_new.h5 rename to tools/test/h5dump/testfiles/tCVE_2018_11206_fill_new.h5 diff --git a/tools/testfiles/tCVE_2018_11206_fill_old.h5 b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_old.h5 similarity index 100% rename from tools/testfiles/tCVE_2018_11206_fill_old.h5 rename to tools/test/h5dump/testfiles/tCVE_2018_11206_fill_old.h5 diff --git a/tools/testfiles/taindices.h5 b/tools/test/h5dump/testfiles/taindices.h5 similarity index 100% rename from tools/testfiles/taindices.h5 rename to tools/test/h5dump/testfiles/taindices.h5 diff --git a/tools/testfiles/tall.h5 b/tools/test/h5dump/testfiles/tall.h5 similarity index 100% rename from tools/testfiles/tall.h5 rename to tools/test/h5dump/testfiles/tall.h5 diff --git a/tools/testfiles/tarray1.h5 b/tools/test/h5dump/testfiles/tarray1.h5 similarity index 100% rename from tools/testfiles/tarray1.h5 rename to tools/test/h5dump/testfiles/tarray1.h5 diff --git a/tools/testfiles/tarray1_big.h5 b/tools/test/h5dump/testfiles/tarray1_big.h5 similarity index 100% rename from tools/testfiles/tarray1_big.h5 rename to tools/test/h5dump/testfiles/tarray1_big.h5 diff --git a/tools/testfiles/tarray2.h5 b/tools/test/h5dump/testfiles/tarray2.h5 similarity index 100% rename from tools/testfiles/tarray2.h5 rename to tools/test/h5dump/testfiles/tarray2.h5 diff --git a/tools/testfiles/tarray3.h5 b/tools/test/h5dump/testfiles/tarray3.h5 similarity index 100% rename from tools/testfiles/tarray3.h5 rename to tools/test/h5dump/testfiles/tarray3.h5 diff --git a/tools/testfiles/tarray4.h5 b/tools/test/h5dump/testfiles/tarray4.h5 similarity index 100% rename from tools/testfiles/tarray4.h5 rename to tools/test/h5dump/testfiles/tarray4.h5 diff --git a/tools/testfiles/tarray5.h5 b/tools/test/h5dump/testfiles/tarray5.h5 similarity index 100% rename from tools/testfiles/tarray5.h5 rename to tools/test/h5dump/testfiles/tarray5.h5 diff --git a/tools/testfiles/tarray6.h5 b/tools/test/h5dump/testfiles/tarray6.h5 similarity index 100% rename from tools/testfiles/tarray6.h5 rename to tools/test/h5dump/testfiles/tarray6.h5 diff --git a/tools/testfiles/tarray7.h5 b/tools/test/h5dump/testfiles/tarray7.h5 similarity index 100% rename from tools/testfiles/tarray7.h5 rename to tools/test/h5dump/testfiles/tarray7.h5 diff --git a/tools/testfiles/tarray8.h5 b/tools/test/h5dump/testfiles/tarray8.h5 similarity index 100% rename from tools/testfiles/tarray8.h5 rename to tools/test/h5dump/testfiles/tarray8.h5 diff --git a/tools/testfiles/tattr.h5 b/tools/test/h5dump/testfiles/tattr.h5 similarity index 100% rename from tools/testfiles/tattr.h5 rename to tools/test/h5dump/testfiles/tattr.h5 diff --git a/tools/testfiles/tattr2.h5 b/tools/test/h5dump/testfiles/tattr2.h5 similarity index 100% rename from tools/testfiles/tattr2.h5 rename to tools/test/h5dump/testfiles/tattr2.h5 diff --git a/tools/testfiles/tattr4_be.h5 b/tools/test/h5dump/testfiles/tattr4_be.h5 similarity index 100% rename from tools/testfiles/tattr4_be.h5 rename to tools/test/h5dump/testfiles/tattr4_be.h5 diff --git a/tools/testfiles/tattrintsize.h5 b/tools/test/h5dump/testfiles/tattrintsize.h5 similarity index 100% rename from tools/testfiles/tattrintsize.h5 rename to tools/test/h5dump/testfiles/tattrintsize.h5 diff --git a/tools/testfiles/tattrreg.h5 b/tools/test/h5dump/testfiles/tattrreg.h5 similarity index 100% rename from tools/testfiles/tattrreg.h5 rename to tools/test/h5dump/testfiles/tattrreg.h5 diff --git a/tools/testfiles/tbigdims.h5 b/tools/test/h5dump/testfiles/tbigdims.h5 similarity index 100% rename from tools/testfiles/tbigdims.h5 rename to tools/test/h5dump/testfiles/tbigdims.h5 diff --git a/tools/testfiles/tbinary.h5 b/tools/test/h5dump/testfiles/tbinary.h5 similarity index 100% rename from tools/testfiles/tbinary.h5 rename to tools/test/h5dump/testfiles/tbinary.h5 diff --git a/tools/testfiles/tbitnopaque.h5 b/tools/test/h5dump/testfiles/tbitnopaque.h5 similarity index 100% rename from tools/testfiles/tbitnopaque.h5 rename to tools/test/h5dump/testfiles/tbitnopaque.h5 diff --git a/tools/testfiles/tchar.h5 b/tools/test/h5dump/testfiles/tchar.h5 similarity index 100% rename from tools/testfiles/tchar.h5 rename to tools/test/h5dump/testfiles/tchar.h5 diff --git a/tools/testfiles/tcmpdattrintsize.h5 b/tools/test/h5dump/testfiles/tcmpdattrintsize.h5 similarity index 100% rename from tools/testfiles/tcmpdattrintsize.h5 rename to tools/test/h5dump/testfiles/tcmpdattrintsize.h5 diff --git a/tools/testfiles/tcmpdintarray.h5 b/tools/test/h5dump/testfiles/tcmpdintarray.h5 similarity index 100% rename from tools/testfiles/tcmpdintarray.h5 rename to tools/test/h5dump/testfiles/tcmpdintarray.h5 diff --git a/tools/testfiles/tcmpdints.h5 b/tools/test/h5dump/testfiles/tcmpdints.h5 similarity index 100% rename from tools/testfiles/tcmpdints.h5 rename to tools/test/h5dump/testfiles/tcmpdints.h5 diff --git a/tools/testfiles/tcmpdintsize.h5 b/tools/test/h5dump/testfiles/tcmpdintsize.h5 similarity index 100% rename from tools/testfiles/tcmpdintsize.h5 rename to tools/test/h5dump/testfiles/tcmpdintsize.h5 diff --git a/tools/testfiles/tcompound.h5 b/tools/test/h5dump/testfiles/tcompound.h5 similarity index 100% rename from tools/testfiles/tcompound.h5 rename to tools/test/h5dump/testfiles/tcompound.h5 diff --git a/tools/testfiles/tcompound_complex.h5 b/tools/test/h5dump/testfiles/tcompound_complex.h5 similarity index 100% rename from tools/testfiles/tcompound_complex.h5 rename to tools/test/h5dump/testfiles/tcompound_complex.h5 diff --git a/tools/testfiles/tcompound_complex2.h5 b/tools/test/h5dump/testfiles/tcompound_complex2.h5 similarity index 100% rename from tools/testfiles/tcompound_complex2.h5 rename to tools/test/h5dump/testfiles/tcompound_complex2.h5 diff --git a/tools/testfiles/tdatareg.h5 b/tools/test/h5dump/testfiles/tdatareg.h5 similarity index 100% rename from tools/testfiles/tdatareg.h5 rename to tools/test/h5dump/testfiles/tdatareg.h5 diff --git a/tools/testfiles/tdset.h5 b/tools/test/h5dump/testfiles/tdset.h5 similarity index 100% rename from tools/testfiles/tdset.h5 rename to tools/test/h5dump/testfiles/tdset.h5 diff --git a/tools/testfiles/tempty.h5 b/tools/test/h5dump/testfiles/tempty.h5 similarity index 100% rename from tools/testfiles/tempty.h5 rename to tools/test/h5dump/testfiles/tempty.h5 diff --git a/tools/testfiles/textlink.h5 b/tools/test/h5dump/testfiles/textlink.h5 similarity index 100% rename from tools/testfiles/textlink.h5 rename to tools/test/h5dump/testfiles/textlink.h5 diff --git a/tools/testfiles/textlinkfar.h5 b/tools/test/h5dump/testfiles/textlinkfar.h5 similarity index 100% rename from tools/testfiles/textlinkfar.h5 rename to tools/test/h5dump/testfiles/textlinkfar.h5 diff --git a/tools/testfiles/textlinksrc.h5 b/tools/test/h5dump/testfiles/textlinksrc.h5 similarity index 100% rename from tools/testfiles/textlinksrc.h5 rename to tools/test/h5dump/testfiles/textlinksrc.h5 diff --git a/tools/testfiles/textlinktar.h5 b/tools/test/h5dump/testfiles/textlinktar.h5 similarity index 100% rename from tools/testfiles/textlinktar.h5 rename to tools/test/h5dump/testfiles/textlinktar.h5 diff --git a/tools/testfiles/tfamily00000.h5 b/tools/test/h5dump/testfiles/tfamily00000.h5 similarity index 100% rename from tools/testfiles/tfamily00000.h5 rename to tools/test/h5dump/testfiles/tfamily00000.h5 diff --git a/tools/testfiles/tfamily00001.h5 b/tools/test/h5dump/testfiles/tfamily00001.h5 similarity index 100% rename from tools/testfiles/tfamily00001.h5 rename to tools/test/h5dump/testfiles/tfamily00001.h5 diff --git a/tools/testfiles/tfamily00002.h5 b/tools/test/h5dump/testfiles/tfamily00002.h5 similarity index 100% rename from tools/testfiles/tfamily00002.h5 rename to tools/test/h5dump/testfiles/tfamily00002.h5 diff --git a/tools/testfiles/tfamily00003.h5 b/tools/test/h5dump/testfiles/tfamily00003.h5 similarity index 100% rename from tools/testfiles/tfamily00003.h5 rename to tools/test/h5dump/testfiles/tfamily00003.h5 diff --git a/tools/testfiles/tfamily00004.h5 b/tools/test/h5dump/testfiles/tfamily00004.h5 similarity index 100% rename from tools/testfiles/tfamily00004.h5 rename to tools/test/h5dump/testfiles/tfamily00004.h5 diff --git a/tools/testfiles/tfamily00005.h5 b/tools/test/h5dump/testfiles/tfamily00005.h5 similarity index 100% rename from tools/testfiles/tfamily00005.h5 rename to tools/test/h5dump/testfiles/tfamily00005.h5 diff --git a/tools/testfiles/tfamily00006.h5 b/tools/test/h5dump/testfiles/tfamily00006.h5 similarity index 100% rename from tools/testfiles/tfamily00006.h5 rename to tools/test/h5dump/testfiles/tfamily00006.h5 diff --git a/tools/testfiles/tfamily00007.h5 b/tools/test/h5dump/testfiles/tfamily00007.h5 similarity index 100% rename from tools/testfiles/tfamily00007.h5 rename to tools/test/h5dump/testfiles/tfamily00007.h5 diff --git a/tools/testfiles/tfamily00008.h5 b/tools/test/h5dump/testfiles/tfamily00008.h5 similarity index 100% rename from tools/testfiles/tfamily00008.h5 rename to tools/test/h5dump/testfiles/tfamily00008.h5 diff --git a/tools/testfiles/tfamily00009.h5 b/tools/test/h5dump/testfiles/tfamily00009.h5 similarity index 100% rename from tools/testfiles/tfamily00009.h5 rename to tools/test/h5dump/testfiles/tfamily00009.h5 diff --git a/tools/testfiles/tfamily00010.h5 b/tools/test/h5dump/testfiles/tfamily00010.h5 similarity index 100% rename from tools/testfiles/tfamily00010.h5 rename to tools/test/h5dump/testfiles/tfamily00010.h5 diff --git a/tools/testfiles/tfcontents1.h5 b/tools/test/h5dump/testfiles/tfcontents1.h5 similarity index 100% rename from tools/testfiles/tfcontents1.h5 rename to tools/test/h5dump/testfiles/tfcontents1.h5 diff --git a/tools/testfiles/tfcontents2.h5 b/tools/test/h5dump/testfiles/tfcontents2.h5 similarity index 100% rename from tools/testfiles/tfcontents2.h5 rename to tools/test/h5dump/testfiles/tfcontents2.h5 diff --git a/tools/testfiles/tfilters.h5 b/tools/test/h5dump/testfiles/tfilters.h5 similarity index 100% rename from tools/testfiles/tfilters.h5 rename to tools/test/h5dump/testfiles/tfilters.h5 diff --git a/tools/testfiles/tfloatsattrs.h5 b/tools/test/h5dump/testfiles/tfloatsattrs.h5 similarity index 100% rename from tools/testfiles/tfloatsattrs.h5 rename to tools/test/h5dump/testfiles/tfloatsattrs.h5 diff --git a/tools/testfiles/tfpformat.h5 b/tools/test/h5dump/testfiles/tfpformat.h5 similarity index 100% rename from tools/testfiles/tfpformat.h5 rename to tools/test/h5dump/testfiles/tfpformat.h5 diff --git a/tools/testfiles/tfvalues.h5 b/tools/test/h5dump/testfiles/tfvalues.h5 similarity index 100% rename from tools/testfiles/tfvalues.h5 rename to tools/test/h5dump/testfiles/tfvalues.h5 diff --git a/tools/testfiles/tgroup.h5 b/tools/test/h5dump/testfiles/tgroup.h5 similarity index 100% rename from tools/testfiles/tgroup.h5 rename to tools/test/h5dump/testfiles/tgroup.h5 diff --git a/tools/testfiles/tgrp_comments.h5 b/tools/test/h5dump/testfiles/tgrp_comments.h5 similarity index 100% rename from tools/testfiles/tgrp_comments.h5 rename to tools/test/h5dump/testfiles/tgrp_comments.h5 diff --git a/tools/testfiles/tgrpnullspace.h5 b/tools/test/h5dump/testfiles/tgrpnullspace.h5 similarity index 100% rename from tools/testfiles/tgrpnullspace.h5 rename to tools/test/h5dump/testfiles/tgrpnullspace.h5 diff --git a/tools/testfiles/thlink.h5 b/tools/test/h5dump/testfiles/thlink.h5 similarity index 100% rename from tools/testfiles/thlink.h5 rename to tools/test/h5dump/testfiles/thlink.h5 diff --git a/tools/testfiles/thyperslab.h5 b/tools/test/h5dump/testfiles/thyperslab.h5 similarity index 100% rename from tools/testfiles/thyperslab.h5 rename to tools/test/h5dump/testfiles/thyperslab.h5 diff --git a/tools/testfiles/tints4dims.h5 b/tools/test/h5dump/testfiles/tints4dims.h5 similarity index 100% rename from tools/testfiles/tints4dims.h5 rename to tools/test/h5dump/testfiles/tints4dims.h5 diff --git a/tools/testfiles/tintsattrs.h5 b/tools/test/h5dump/testfiles/tintsattrs.h5 similarity index 100% rename from tools/testfiles/tintsattrs.h5 rename to tools/test/h5dump/testfiles/tintsattrs.h5 diff --git a/tools/testfiles/tintsnodata.h5 b/tools/test/h5dump/testfiles/tintsnodata.h5 similarity index 100% rename from tools/testfiles/tintsnodata.h5 rename to tools/test/h5dump/testfiles/tintsnodata.h5 diff --git a/tools/testfiles/tlarge_objname.h5 b/tools/test/h5dump/testfiles/tlarge_objname.h5 similarity index 100% rename from tools/testfiles/tlarge_objname.h5 rename to tools/test/h5dump/testfiles/tlarge_objname.h5 diff --git a/tools/testfiles/tldouble.h5 b/tools/test/h5dump/testfiles/tldouble.h5 similarity index 100% rename from tools/testfiles/tldouble.h5 rename to tools/test/h5dump/testfiles/tldouble.h5 diff --git a/tools/testfiles/tldouble_scalar.h5 b/tools/test/h5dump/testfiles/tldouble_scalar.h5 similarity index 100% rename from tools/testfiles/tldouble_scalar.h5 rename to tools/test/h5dump/testfiles/tldouble_scalar.h5 diff --git a/tools/testfiles/tlonglinks.h5 b/tools/test/h5dump/testfiles/tlonglinks.h5 similarity index 100% rename from tools/testfiles/tlonglinks.h5 rename to tools/test/h5dump/testfiles/tlonglinks.h5 diff --git a/tools/testfiles/tloop.h5 b/tools/test/h5dump/testfiles/tloop.h5 similarity index 100% rename from tools/testfiles/tloop.h5 rename to tools/test/h5dump/testfiles/tloop.h5 diff --git a/tools/testfiles/tmulti-b.h5 b/tools/test/h5dump/testfiles/tmulti-b.h5 similarity index 100% rename from tools/testfiles/tmulti-b.h5 rename to tools/test/h5dump/testfiles/tmulti-b.h5 diff --git a/tools/testfiles/tmulti-g.h5 b/tools/test/h5dump/testfiles/tmulti-g.h5 similarity index 100% rename from tools/testfiles/tmulti-g.h5 rename to tools/test/h5dump/testfiles/tmulti-g.h5 diff --git a/tools/testfiles/tmulti-l.h5 b/tools/test/h5dump/testfiles/tmulti-l.h5 similarity index 100% rename from tools/testfiles/tmulti-l.h5 rename to tools/test/h5dump/testfiles/tmulti-l.h5 diff --git a/tools/testfiles/tmulti-o.h5 b/tools/test/h5dump/testfiles/tmulti-o.h5 similarity index 100% rename from tools/testfiles/tmulti-o.h5 rename to tools/test/h5dump/testfiles/tmulti-o.h5 diff --git a/tools/testfiles/tmulti-r.h5 b/tools/test/h5dump/testfiles/tmulti-r.h5 similarity index 100% rename from tools/testfiles/tmulti-r.h5 rename to tools/test/h5dump/testfiles/tmulti-r.h5 diff --git a/tools/testfiles/tmulti-s.h5 b/tools/test/h5dump/testfiles/tmulti-s.h5 similarity index 100% rename from tools/testfiles/tmulti-s.h5 rename to tools/test/h5dump/testfiles/tmulti-s.h5 diff --git a/tools/testfiles/tnamed_dtype_attr.h5 b/tools/test/h5dump/testfiles/tnamed_dtype_attr.h5 similarity index 100% rename from tools/testfiles/tnamed_dtype_attr.h5 rename to tools/test/h5dump/testfiles/tnamed_dtype_attr.h5 diff --git a/tools/testfiles/tnestedcmpddt.h5 b/tools/test/h5dump/testfiles/tnestedcmpddt.h5 similarity index 100% rename from tools/testfiles/tnestedcmpddt.h5 rename to tools/test/h5dump/testfiles/tnestedcmpddt.h5 diff --git a/tools/testfiles/tnestedcomp.h5 b/tools/test/h5dump/testfiles/tnestedcomp.h5 similarity index 100% rename from tools/testfiles/tnestedcomp.h5 rename to tools/test/h5dump/testfiles/tnestedcomp.h5 diff --git a/tools/testfiles/tno-subset.h5 b/tools/test/h5dump/testfiles/tno-subset.h5 similarity index 100% rename from tools/testfiles/tno-subset.h5 rename to tools/test/h5dump/testfiles/tno-subset.h5 diff --git a/tools/test/h5dump/testfiles/tnullspace.h5 b/tools/test/h5dump/testfiles/tnullspace.h5 new file mode 100644 index 00000000000..b5dac5dff2f Binary files /dev/null and b/tools/test/h5dump/testfiles/tnullspace.h5 differ diff --git a/tools/testfiles/torderattr.h5 b/tools/test/h5dump/testfiles/torderattr.h5 similarity index 100% rename from tools/testfiles/torderattr.h5 rename to tools/test/h5dump/testfiles/torderattr.h5 diff --git a/tools/testfiles/tordergr.h5 b/tools/test/h5dump/testfiles/tordergr.h5 similarity index 100% rename from tools/testfiles/tordergr.h5 rename to tools/test/h5dump/testfiles/tordergr.h5 diff --git a/tools/testfiles/trefer_attr.h5 b/tools/test/h5dump/testfiles/trefer_attr.h5 similarity index 100% rename from tools/testfiles/trefer_attr.h5 rename to tools/test/h5dump/testfiles/trefer_attr.h5 diff --git a/tools/testfiles/trefer_compat.h5 b/tools/test/h5dump/testfiles/trefer_compat.h5 similarity index 100% rename from tools/testfiles/trefer_compat.h5 rename to tools/test/h5dump/testfiles/trefer_compat.h5 diff --git a/tools/testfiles/trefer_ext1.h5 b/tools/test/h5dump/testfiles/trefer_ext1.h5 similarity index 100% rename from tools/testfiles/trefer_ext1.h5 rename to tools/test/h5dump/testfiles/trefer_ext1.h5 diff --git a/tools/testfiles/trefer_ext2.h5 b/tools/test/h5dump/testfiles/trefer_ext2.h5 similarity index 100% rename from tools/testfiles/trefer_ext2.h5 rename to tools/test/h5dump/testfiles/trefer_ext2.h5 diff --git a/tools/testfiles/trefer_grp.h5 b/tools/test/h5dump/testfiles/trefer_grp.h5 similarity index 100% rename from tools/testfiles/trefer_grp.h5 rename to tools/test/h5dump/testfiles/trefer_grp.h5 diff --git a/tools/testfiles/trefer_obj.h5 b/tools/test/h5dump/testfiles/trefer_obj.h5 similarity index 100% rename from tools/testfiles/trefer_obj.h5 rename to tools/test/h5dump/testfiles/trefer_obj.h5 diff --git a/tools/testfiles/trefer_obj_del.h5 b/tools/test/h5dump/testfiles/trefer_obj_del.h5 similarity index 100% rename from tools/testfiles/trefer_obj_del.h5 rename to tools/test/h5dump/testfiles/trefer_obj_del.h5 diff --git a/tools/testfiles/trefer_param.h5 b/tools/test/h5dump/testfiles/trefer_param.h5 similarity index 100% rename from tools/testfiles/trefer_param.h5 rename to tools/test/h5dump/testfiles/trefer_param.h5 diff --git a/tools/testfiles/trefer_reg.h5 b/tools/test/h5dump/testfiles/trefer_reg.h5 similarity index 100% rename from tools/testfiles/trefer_reg.h5 rename to tools/test/h5dump/testfiles/trefer_reg.h5 diff --git a/tools/testfiles/trefer_reg_1d.h5 b/tools/test/h5dump/testfiles/trefer_reg_1d.h5 similarity index 100% rename from tools/testfiles/trefer_reg_1d.h5 rename to tools/test/h5dump/testfiles/trefer_reg_1d.h5 diff --git a/tools/testfiles/tsaf.h5 b/tools/test/h5dump/testfiles/tsaf.h5 similarity index 100% rename from tools/testfiles/tsaf.h5 rename to tools/test/h5dump/testfiles/tsaf.h5 diff --git a/tools/testfiles/tscalarattrintsize.h5 b/tools/test/h5dump/testfiles/tscalarattrintsize.h5 similarity index 100% rename from tools/testfiles/tscalarattrintsize.h5 rename to tools/test/h5dump/testfiles/tscalarattrintsize.h5 diff --git a/tools/testfiles/tscalarintattrsize.h5 b/tools/test/h5dump/testfiles/tscalarintattrsize.h5 similarity index 100% rename from tools/testfiles/tscalarintattrsize.h5 rename to tools/test/h5dump/testfiles/tscalarintattrsize.h5 diff --git a/tools/testfiles/tscalarintsize.h5 b/tools/test/h5dump/testfiles/tscalarintsize.h5 similarity index 100% rename from tools/testfiles/tscalarintsize.h5 rename to tools/test/h5dump/testfiles/tscalarintsize.h5 diff --git a/tools/testfiles/tscalarstring.h5 b/tools/test/h5dump/testfiles/tscalarstring.h5 similarity index 100% rename from tools/testfiles/tscalarstring.h5 rename to tools/test/h5dump/testfiles/tscalarstring.h5 diff --git a/tools/testfiles/tslink.h5 b/tools/test/h5dump/testfiles/tslink.h5 similarity index 100% rename from tools/testfiles/tslink.h5 rename to tools/test/h5dump/testfiles/tslink.h5 diff --git a/tools/testfiles/tsoftlinks.h5 b/tools/test/h5dump/testfiles/tsoftlinks.h5 similarity index 100% rename from tools/testfiles/tsoftlinks.h5 rename to tools/test/h5dump/testfiles/tsoftlinks.h5 diff --git a/tools/testfiles/tsplit_file-m.h5 b/tools/test/h5dump/testfiles/tsplit_file-m.h5 similarity index 100% rename from tools/testfiles/tsplit_file-m.h5 rename to tools/test/h5dump/testfiles/tsplit_file-m.h5 diff --git a/tools/testfiles/tsplit_file-r.h5 b/tools/test/h5dump/testfiles/tsplit_file-r.h5 similarity index 100% rename from tools/testfiles/tsplit_file-r.h5 rename to tools/test/h5dump/testfiles/tsplit_file-r.h5 diff --git a/tools/testfiles/tst_onion_dset_1d.h5 b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5 similarity index 100% rename from tools/testfiles/tst_onion_dset_1d.h5 rename to tools/test/h5dump/testfiles/tst_onion_dset_1d.h5 diff --git a/tools/testfiles/tst_onion_dset_1d.h5.onion b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5.onion similarity index 100% rename from tools/testfiles/tst_onion_dset_1d.h5.onion rename to tools/test/h5dump/testfiles/tst_onion_dset_1d.h5.onion diff --git a/tools/testfiles/tst_onion_dset_ext.h5 b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5 similarity index 100% rename from tools/testfiles/tst_onion_dset_ext.h5 rename to tools/test/h5dump/testfiles/tst_onion_dset_ext.h5 diff --git a/tools/testfiles/tst_onion_dset_ext.h5.onion b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5.onion similarity index 100% rename from tools/testfiles/tst_onion_dset_ext.h5.onion rename to tools/test/h5dump/testfiles/tst_onion_dset_ext.h5.onion diff --git a/tools/testfiles/tst_onion_objs.h5 b/tools/test/h5dump/testfiles/tst_onion_objs.h5 similarity index 100% rename from tools/testfiles/tst_onion_objs.h5 rename to tools/test/h5dump/testfiles/tst_onion_objs.h5 diff --git a/tools/testfiles/tst_onion_objs.h5.onion b/tools/test/h5dump/testfiles/tst_onion_objs.h5.onion similarity index 100% rename from tools/testfiles/tst_onion_objs.h5.onion rename to tools/test/h5dump/testfiles/tst_onion_objs.h5.onion diff --git a/tools/testfiles/tstr.h5 b/tools/test/h5dump/testfiles/tstr.h5 similarity index 100% rename from tools/testfiles/tstr.h5 rename to tools/test/h5dump/testfiles/tstr.h5 diff --git a/tools/testfiles/tstr2.h5 b/tools/test/h5dump/testfiles/tstr2.h5 similarity index 100% rename from tools/testfiles/tstr2.h5 rename to tools/test/h5dump/testfiles/tstr2.h5 diff --git a/tools/testfiles/tstr3.h5 b/tools/test/h5dump/testfiles/tstr3.h5 similarity index 100% rename from tools/testfiles/tstr3.h5 rename to tools/test/h5dump/testfiles/tstr3.h5 diff --git a/tools/testfiles/tudfilter.h5 b/tools/test/h5dump/testfiles/tudfilter.h5 similarity index 100% rename from tools/testfiles/tudfilter.h5 rename to tools/test/h5dump/testfiles/tudfilter.h5 diff --git a/tools/testfiles/tudlink.h5 b/tools/test/h5dump/testfiles/tudlink.h5 similarity index 100% rename from tools/testfiles/tudlink.h5 rename to tools/test/h5dump/testfiles/tudlink.h5 diff --git a/tools/testfiles/tvldtypes1.h5 b/tools/test/h5dump/testfiles/tvldtypes1.h5 similarity index 100% rename from tools/testfiles/tvldtypes1.h5 rename to tools/test/h5dump/testfiles/tvldtypes1.h5 diff --git a/tools/testfiles/tvldtypes2.h5 b/tools/test/h5dump/testfiles/tvldtypes2.h5 similarity index 100% rename from tools/testfiles/tvldtypes2.h5 rename to tools/test/h5dump/testfiles/tvldtypes2.h5 diff --git a/tools/testfiles/tvldtypes3.h5 b/tools/test/h5dump/testfiles/tvldtypes3.h5 similarity index 100% rename from tools/testfiles/tvldtypes3.h5 rename to tools/test/h5dump/testfiles/tvldtypes3.h5 diff --git a/tools/testfiles/tvldtypes4.h5 b/tools/test/h5dump/testfiles/tvldtypes4.h5 similarity index 100% rename from tools/testfiles/tvldtypes4.h5 rename to tools/test/h5dump/testfiles/tvldtypes4.h5 diff --git a/tools/testfiles/tvldtypes5.h5 b/tools/test/h5dump/testfiles/tvldtypes5.h5 similarity index 100% rename from tools/testfiles/tvldtypes5.h5 rename to tools/test/h5dump/testfiles/tvldtypes5.h5 diff --git a/tools/testfiles/tvlenstr_array.h5 b/tools/test/h5dump/testfiles/tvlenstr_array.h5 similarity index 100% rename from tools/testfiles/tvlenstr_array.h5 rename to tools/test/h5dump/testfiles/tvlenstr_array.h5 diff --git a/tools/testfiles/tvlstr.h5 b/tools/test/h5dump/testfiles/tvlstr.h5 similarity index 100% rename from tools/testfiles/tvlstr.h5 rename to tools/test/h5dump/testfiles/tvlstr.h5 diff --git a/tools/testfiles/tvms.h5 b/tools/test/h5dump/testfiles/tvms.h5 similarity index 100% rename from tools/testfiles/tvms.h5 rename to tools/test/h5dump/testfiles/tvms.h5 diff --git a/tools/testfiles/vds/1_a.h5 b/tools/test/h5dump/testfiles/vds/1_a.h5 similarity index 100% rename from tools/testfiles/vds/1_a.h5 rename to tools/test/h5dump/testfiles/vds/1_a.h5 diff --git a/tools/testfiles/vds/1_b.h5 b/tools/test/h5dump/testfiles/vds/1_b.h5 similarity index 100% rename from tools/testfiles/vds/1_b.h5 rename to tools/test/h5dump/testfiles/vds/1_b.h5 diff --git a/tools/testfiles/vds/1_c.h5 b/tools/test/h5dump/testfiles/vds/1_c.h5 similarity index 100% rename from tools/testfiles/vds/1_c.h5 rename to tools/test/h5dump/testfiles/vds/1_c.h5 diff --git a/tools/testfiles/vds/1_d.h5 b/tools/test/h5dump/testfiles/vds/1_d.h5 similarity index 100% rename from tools/testfiles/vds/1_d.h5 rename to tools/test/h5dump/testfiles/vds/1_d.h5 diff --git a/tools/testfiles/vds/1_e.h5 b/tools/test/h5dump/testfiles/vds/1_e.h5 similarity index 100% rename from tools/testfiles/vds/1_e.h5 rename to tools/test/h5dump/testfiles/vds/1_e.h5 diff --git a/tools/testfiles/vds/1_f.h5 b/tools/test/h5dump/testfiles/vds/1_f.h5 similarity index 100% rename from tools/testfiles/vds/1_f.h5 rename to tools/test/h5dump/testfiles/vds/1_f.h5 diff --git a/tools/testfiles/vds/1_vds.h5 b/tools/test/h5dump/testfiles/vds/1_vds.h5 similarity index 100% rename from tools/testfiles/vds/1_vds.h5 rename to tools/test/h5dump/testfiles/vds/1_vds.h5 diff --git a/tools/testfiles/vds/2_a.h5 b/tools/test/h5dump/testfiles/vds/2_a.h5 similarity index 100% rename from tools/testfiles/vds/2_a.h5 rename to tools/test/h5dump/testfiles/vds/2_a.h5 diff --git a/tools/testfiles/vds/2_b.h5 b/tools/test/h5dump/testfiles/vds/2_b.h5 similarity index 100% rename from tools/testfiles/vds/2_b.h5 rename to tools/test/h5dump/testfiles/vds/2_b.h5 diff --git a/tools/testfiles/vds/2_c.h5 b/tools/test/h5dump/testfiles/vds/2_c.h5 similarity index 100% rename from tools/testfiles/vds/2_c.h5 rename to tools/test/h5dump/testfiles/vds/2_c.h5 diff --git a/tools/testfiles/vds/2_d.h5 b/tools/test/h5dump/testfiles/vds/2_d.h5 similarity index 100% rename from tools/testfiles/vds/2_d.h5 rename to tools/test/h5dump/testfiles/vds/2_d.h5 diff --git a/tools/testfiles/vds/2_e.h5 b/tools/test/h5dump/testfiles/vds/2_e.h5 similarity index 100% rename from tools/testfiles/vds/2_e.h5 rename to tools/test/h5dump/testfiles/vds/2_e.h5 diff --git a/tools/testfiles/vds/2_vds.h5 b/tools/test/h5dump/testfiles/vds/2_vds.h5 similarity index 100% rename from tools/testfiles/vds/2_vds.h5 rename to tools/test/h5dump/testfiles/vds/2_vds.h5 diff --git a/tools/testfiles/vds/3_1_vds.h5 b/tools/test/h5dump/testfiles/vds/3_1_vds.h5 similarity index 100% rename from tools/testfiles/vds/3_1_vds.h5 rename to tools/test/h5dump/testfiles/vds/3_1_vds.h5 diff --git a/tools/testfiles/vds/3_2_vds.h5 b/tools/test/h5dump/testfiles/vds/3_2_vds.h5 similarity index 100% rename from tools/testfiles/vds/3_2_vds.h5 rename to tools/test/h5dump/testfiles/vds/3_2_vds.h5 diff --git a/tools/testfiles/vds/4_0.h5 b/tools/test/h5dump/testfiles/vds/4_0.h5 similarity index 100% rename from tools/testfiles/vds/4_0.h5 rename to tools/test/h5dump/testfiles/vds/4_0.h5 diff --git a/tools/testfiles/vds/4_1.h5 b/tools/test/h5dump/testfiles/vds/4_1.h5 similarity index 100% rename from tools/testfiles/vds/4_1.h5 rename to tools/test/h5dump/testfiles/vds/4_1.h5 diff --git a/tools/testfiles/vds/4_2.h5 b/tools/test/h5dump/testfiles/vds/4_2.h5 similarity index 100% rename from tools/testfiles/vds/4_2.h5 rename to tools/test/h5dump/testfiles/vds/4_2.h5 diff --git a/tools/testfiles/vds/4_vds.h5 b/tools/test/h5dump/testfiles/vds/4_vds.h5 similarity index 100% rename from tools/testfiles/vds/4_vds.h5 rename to tools/test/h5dump/testfiles/vds/4_vds.h5 diff --git a/tools/testfiles/vds/5_a.h5 b/tools/test/h5dump/testfiles/vds/5_a.h5 similarity index 100% rename from tools/testfiles/vds/5_a.h5 rename to tools/test/h5dump/testfiles/vds/5_a.h5 diff --git a/tools/testfiles/vds/5_b.h5 b/tools/test/h5dump/testfiles/vds/5_b.h5 similarity index 100% rename from tools/testfiles/vds/5_b.h5 rename to tools/test/h5dump/testfiles/vds/5_b.h5 diff --git a/tools/testfiles/vds/5_c.h5 b/tools/test/h5dump/testfiles/vds/5_c.h5 similarity index 100% rename from tools/testfiles/vds/5_c.h5 rename to tools/test/h5dump/testfiles/vds/5_c.h5 diff --git a/tools/testfiles/vds/5_vds.h5 b/tools/test/h5dump/testfiles/vds/5_vds.h5 similarity index 100% rename from tools/testfiles/vds/5_vds.h5 rename to tools/test/h5dump/testfiles/vds/5_vds.h5 diff --git a/tools/testfiles/vds/a.h5 b/tools/test/h5dump/testfiles/vds/a.h5 similarity index 100% rename from tools/testfiles/vds/a.h5 rename to tools/test/h5dump/testfiles/vds/a.h5 diff --git a/tools/testfiles/vds/b.h5 b/tools/test/h5dump/testfiles/vds/b.h5 similarity index 100% rename from tools/testfiles/vds/b.h5 rename to tools/test/h5dump/testfiles/vds/b.h5 diff --git a/tools/testfiles/vds/c.h5 b/tools/test/h5dump/testfiles/vds/c.h5 similarity index 100% rename from tools/testfiles/vds/c.h5 rename to tools/test/h5dump/testfiles/vds/c.h5 diff --git a/tools/testfiles/vds/d.h5 b/tools/test/h5dump/testfiles/vds/d.h5 similarity index 100% rename from tools/testfiles/vds/d.h5 rename to tools/test/h5dump/testfiles/vds/d.h5 diff --git a/tools/testfiles/vds/f-0.h5 b/tools/test/h5dump/testfiles/vds/f-0.h5 similarity index 100% rename from tools/testfiles/vds/f-0.h5 rename to tools/test/h5dump/testfiles/vds/f-0.h5 diff --git a/tools/testfiles/vds/f-3.h5 b/tools/test/h5dump/testfiles/vds/f-3.h5 similarity index 100% rename from tools/testfiles/vds/f-3.h5 rename to tools/test/h5dump/testfiles/vds/f-3.h5 diff --git a/tools/testfiles/vds/vds-eiger.h5 b/tools/test/h5dump/testfiles/vds/vds-eiger.h5 similarity index 100% rename from tools/testfiles/vds/vds-eiger.h5 rename to tools/test/h5dump/testfiles/vds/vds-eiger.h5 diff --git a/tools/testfiles/vds/vds-percival-unlim-maxmin.h5 b/tools/test/h5dump/testfiles/vds/vds-percival-unlim-maxmin.h5 similarity index 100% rename from tools/testfiles/vds/vds-percival-unlim-maxmin.h5 rename to tools/test/h5dump/testfiles/vds/vds-percival-unlim-maxmin.h5 diff --git a/tools/testfiles/tbitfields.h5 b/tools/test/h5dump/testfiles/xml/tbitfields.h5 similarity index 100% rename from tools/testfiles/tbitfields.h5 rename to tools/test/h5dump/testfiles/xml/tbitfields.h5 diff --git a/tools/testfiles/tcompound2.h5 b/tools/test/h5dump/testfiles/xml/tcompound2.h5 similarity index 100% rename from tools/testfiles/tcompound2.h5 rename to tools/test/h5dump/testfiles/xml/tcompound2.h5 diff --git a/tools/testfiles/tdset2.h5 b/tools/test/h5dump/testfiles/xml/tdset2.h5 similarity index 100% rename from tools/testfiles/tdset2.h5 rename to tools/test/h5dump/testfiles/xml/tdset2.h5 diff --git a/tools/testfiles/tenum.h5 b/tools/test/h5dump/testfiles/xml/tenum.h5 similarity index 100% rename from tools/testfiles/tenum.h5 rename to tools/test/h5dump/testfiles/xml/tenum.h5 diff --git a/tools/testfiles/test35.nc b/tools/test/h5dump/testfiles/xml/test35.nc similarity index 100% rename from tools/testfiles/test35.nc rename to tools/test/h5dump/testfiles/xml/test35.nc diff --git a/tools/testfiles/tloop2.h5 b/tools/test/h5dump/testfiles/xml/tloop2.h5 similarity index 100% rename from tools/testfiles/tloop2.h5 rename to tools/test/h5dump/testfiles/xml/tloop2.h5 diff --git a/tools/testfiles/tmany.h5 b/tools/test/h5dump/testfiles/xml/tmany.h5 similarity index 100% rename from tools/testfiles/tmany.h5 rename to tools/test/h5dump/testfiles/xml/tmany.h5 diff --git a/tools/testfiles/tname-amp.h5 b/tools/test/h5dump/testfiles/xml/tname-amp.h5 similarity index 100% rename from tools/testfiles/tname-amp.h5 rename to tools/test/h5dump/testfiles/xml/tname-amp.h5 diff --git a/tools/testfiles/tname-apos.h5 b/tools/test/h5dump/testfiles/xml/tname-apos.h5 similarity index 100% rename from tools/testfiles/tname-apos.h5 rename to tools/test/h5dump/testfiles/xml/tname-apos.h5 diff --git a/tools/testfiles/tname-gt.h5 b/tools/test/h5dump/testfiles/xml/tname-gt.h5 similarity index 100% rename from tools/testfiles/tname-gt.h5 rename to tools/test/h5dump/testfiles/xml/tname-gt.h5 diff --git a/tools/testfiles/tname-lt.h5 b/tools/test/h5dump/testfiles/xml/tname-lt.h5 similarity index 100% rename from tools/testfiles/tname-lt.h5 rename to tools/test/h5dump/testfiles/xml/tname-lt.h5 diff --git a/tools/testfiles/tname-quot.h5 b/tools/test/h5dump/testfiles/xml/tname-quot.h5 similarity index 100% rename from tools/testfiles/tname-quot.h5 rename to tools/test/h5dump/testfiles/xml/tname-quot.h5 diff --git a/tools/testfiles/tname-sp.h5 b/tools/test/h5dump/testfiles/xml/tname-sp.h5 similarity index 100% rename from tools/testfiles/tname-sp.h5 rename to tools/test/h5dump/testfiles/xml/tname-sp.h5 diff --git a/tools/testfiles/tnodata.h5 b/tools/test/h5dump/testfiles/xml/tnodata.h5 similarity index 100% rename from tools/testfiles/tnodata.h5 rename to tools/test/h5dump/testfiles/xml/tnodata.h5 diff --git a/tools/testfiles/tobjref.h5 b/tools/test/h5dump/testfiles/xml/tobjref.h5 similarity index 100% rename from tools/testfiles/tobjref.h5 rename to tools/test/h5dump/testfiles/xml/tobjref.h5 diff --git a/tools/testfiles/topaque.h5 b/tools/test/h5dump/testfiles/xml/topaque.h5 similarity index 100% rename from tools/testfiles/topaque.h5 rename to tools/test/h5dump/testfiles/xml/topaque.h5 diff --git a/tools/testfiles/tref-escapes-at.h5 b/tools/test/h5dump/testfiles/xml/tref-escapes-at.h5 similarity index 100% rename from tools/testfiles/tref-escapes-at.h5 rename to tools/test/h5dump/testfiles/xml/tref-escapes-at.h5 diff --git a/tools/testfiles/tref-escapes.h5 b/tools/test/h5dump/testfiles/xml/tref-escapes.h5 similarity index 100% rename from tools/testfiles/tref-escapes.h5 rename to tools/test/h5dump/testfiles/xml/tref-escapes.h5 diff --git a/tools/testfiles/tref.h5 b/tools/test/h5dump/testfiles/xml/tref.h5 similarity index 100% rename from tools/testfiles/tref.h5 rename to tools/test/h5dump/testfiles/xml/tref.h5 diff --git a/tools/testfiles/tstring-at.h5 b/tools/test/h5dump/testfiles/xml/tstring-at.h5 similarity index 100% rename from tools/testfiles/tstring-at.h5 rename to tools/test/h5dump/testfiles/xml/tstring-at.h5 diff --git a/tools/testfiles/tstring.h5 b/tools/test/h5dump/testfiles/xml/tstring.h5 similarity index 100% rename from tools/testfiles/tstring.h5 rename to tools/test/h5dump/testfiles/xml/tstring.h5 diff --git a/tools/testfiles/zerodim.h5 b/tools/test/h5dump/testfiles/zerodim.h5 similarity index 100% rename from tools/testfiles/zerodim.h5 rename to tools/test/h5dump/testfiles/zerodim.h5 diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in index 6ea410bb851..8796aa91fa7 100644 --- a/tools/test/h5dump/testh5dump.sh.in +++ b/tools/test/h5dump/testh5dump.sh.in @@ -52,11 +52,12 @@ verbose=yes # 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_H5DUMP_ERRORFILES="$srcdir/errfiles" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" +SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected" +SRC_H5DUMP_ERRORFILES="$SRC_TOOLS/test/h5dump/errfiles" +SRC_H5DUMP_EXPFILES="$SRC_TOOLS/test/h5dump/exportfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" @@ -193,195 +194,198 @@ $SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5.onion " LIST_OTHER_TEST_FILES=" -$SRC_H5DUMP_TESTFILES/charsets.ddl -$SRC_H5DUMP_TESTFILES/file_space.ddl -$SRC_H5DUMP_TESTFILES/filter_fail.ddl -$SRC_H5DUMP_TESTFILES/non_existing.ddl -$SRC_H5DUMP_TESTFILES/packedbits.ddl -$SRC_H5DUMP_TESTFILES/tall-1.ddl -$SRC_H5DUMP_TESTFILES/tall-2.ddl -$SRC_H5DUMP_TESTFILES/tall-2A.ddl -$SRC_H5DUMP_TESTFILES/tall-2A0.ddl -$SRC_H5DUMP_TESTFILES/tall-2B.ddl -$SRC_H5DUMP_TESTFILES/tall-3.ddl -$SRC_H5DUMP_TESTFILES/tall-4s.ddl -$SRC_H5DUMP_TESTFILES/tall-5s.ddl -$SRC_H5DUMP_TESTFILES/tall-6.ddl -$SRC_H5DUMP_TESTFILES/tall-6.exp -$SRC_H5DUMP_TESTFILES/tall-7.ddl -$SRC_H5DUMP_TESTFILES/tall-7N.ddl -$SRC_H5DUMP_TESTFILES/tallfilters.ddl -$SRC_H5DUMP_TESTFILES/tarray1.ddl -$SRC_H5DUMP_TESTFILES/tarray1_big.ddl -$SRC_H5DUMP_TESTFILES/tarray2.ddl -$SRC_H5DUMP_TESTFILES/tarray3.ddl -$SRC_H5DUMP_TESTFILES/tarray4.ddl -$SRC_H5DUMP_TESTFILES/tarray5.ddl -$SRC_H5DUMP_TESTFILES/tarray6.ddl -$SRC_H5DUMP_TESTFILES/tarray7.ddl -$SRC_H5DUMP_TESTFILES/tarray8.ddl -$SRC_H5DUMP_TESTFILES/tattr-1.ddl -$SRC_H5DUMP_TESTFILES/tattr-2.ddl -$SRC_H5DUMP_TESTFILES/tattr-3.ddl -$SRC_H5DUMP_TESTFILES/tattr-4_be.ddl -$SRC_H5DUMP_TESTFILES/tattrcontents1.ddl -$SRC_H5DUMP_TESTFILES/tattrcontents2.ddl -$SRC_H5DUMP_TESTFILES/tattrintsize.ddl -$SRC_H5DUMP_TESTFILES/tattrreg.ddl -$SRC_H5DUMP_TESTFILES/tattrregR.ddl -$SRC_H5DUMP_TESTFILES/tbin1.ddl -$SRC_H5DUMP_TESTFILES/tbin1.ddl -$SRC_H5DUMP_TESTFILES/tbin2.ddl -$SRC_H5DUMP_TESTFILES/tbin3.ddl -$SRC_H5DUMP_TESTFILES/tbin4.ddl -$SRC_H5DUMP_TESTFILES/tbinregR.ddl -$SRC_H5DUMP_TESTFILES/tbigdims.ddl -$SRC_H5DUMP_TESTFILES/tbitnopaque_be.ddl -$SRC_H5DUMP_TESTFILES/tbitnopaque_le.ddl -$SRC_H5DUMP_TESTFILES/tboot1.ddl -$SRC_H5DUMP_TESTFILES/tboot2.ddl -$SRC_H5DUMP_TESTFILES/tboot2A.ddl -$SRC_H5DUMP_TESTFILES/tboot2B.ddl -$SRC_H5DUMP_TESTFILES/tchar1.ddl -$SRC_H5DUMP_TESTFILES/tchunked.ddl -$SRC_H5DUMP_TESTFILES/tcmpdattrintsize.ddl -$SRC_H5DUMP_TESTFILES/tcmpdintsize.ddl -$SRC_H5DUMP_TESTFILES/tcomp-1.ddl -$SRC_H5DUMP_TESTFILES/tcomp-2.ddl -$SRC_H5DUMP_TESTFILES/tcomp-3.ddl -$SRC_H5DUMP_TESTFILES/tcomp-4.ddl -$SRC_H5DUMP_TESTFILES/tcompound_complex2.ddl -$SRC_H5DUMP_TESTFILES/tcompact.ddl -$SRC_H5DUMP_TESTFILES/tcontents.ddl -$SRC_H5DUMP_TESTFILES/tcontiguos.ddl -$SRC_H5DUMP_TESTFILES/tdatareg.ddl -$SRC_H5DUMP_TESTFILES/tdataregR.ddl -$SRC_H5DUMP_TESTFILES/tdeflate.ddl -$SRC_H5DUMP_TESTFILES/tdset-1.ddl -$SRC_H5DUMP_TESTFILES/tdset-2.ddl -$SRC_H5DUMP_TESTFILES/tdset-3s.ddl -$SRC_H5DUMP_TESTFILES/tempty.ddl -$SRC_H5DUMP_TESTFILES/texceedsubstart.ddl -$SRC_H5DUMP_TESTFILES/texceedsubcount.ddl -$SRC_H5DUMP_TESTFILES/texceedsubstride.ddl -$SRC_H5DUMP_TESTFILES/texceedsubblock.ddl -$SRC_H5DUMP_TESTFILES/texternal.ddl -$SRC_H5DUMP_TESTFILES/textlinksrc.ddl -$SRC_H5DUMP_TESTFILES/textlinkfar.ddl -$SRC_H5DUMP_TESTFILES/textlink.ddl -$SRC_H5DUMP_TESTFILES/tfamily.ddl -$SRC_H5DUMP_TESTFILES/tfill.ddl -$SRC_H5DUMP_TESTFILES/tfletcher32.ddl -$SRC_H5DUMP_TESTFILES/tfloatsattrs.ddl -$SRC_H5DUMP_TESTFILES/tfpformat.ddl -$SRC_H5DUMP_TESTFILES/tgroup-1.ddl -$SRC_H5DUMP_TESTFILES/tgroup-2.ddl -$SRC_H5DUMP_TESTFILES/tgrp_comments.ddl -$SRC_H5DUMP_TESTFILES/tgrpnullspace.ddl -$SRC_H5DUMP_TESTFILES/thlink-1.ddl -$SRC_H5DUMP_TESTFILES/thlink-2.ddl -$SRC_H5DUMP_TESTFILES/thlink-3.ddl -$SRC_H5DUMP_TESTFILES/thlink-4.ddl -$SRC_H5DUMP_TESTFILES/thlink-5.ddl -$SRC_H5DUMP_TESTFILES/thyperslab.ddl -$SRC_H5DUMP_TESTFILES/tindicesno.ddl -$SRC_H5DUMP_TESTFILES/tindicessub1.ddl -$SRC_H5DUMP_TESTFILES/tindicessub2.ddl -$SRC_H5DUMP_TESTFILES/tindicessub3.ddl -$SRC_H5DUMP_TESTFILES/tindicessub4.ddl -$SRC_H5DUMP_TESTFILES/tindicesyes.ddl -$SRC_H5DUMP_TESTFILES/tints4dims.ddl -$SRC_H5DUMP_TESTFILES/tints4dimsBlock2.ddl -$SRC_H5DUMP_TESTFILES/tints4dimsBlockEq.ddl -$SRC_H5DUMP_TESTFILES/tints4dimsCount2.ddl -$SRC_H5DUMP_TESTFILES/tints4dimsCountEq.ddl -$SRC_H5DUMP_TESTFILES/tints4dimsStride2.ddl -$SRC_H5DUMP_TESTFILES/tintsattrs.ddl -$SRC_H5DUMP_TESTFILES/tlarge_objname.ddl -$SRC_H5DUMP_TESTFILES/tldouble.ddl -$SRC_H5DUMP_TESTFILES/tldouble_scalar.ddl -$SRC_H5DUMP_TESTFILES/tlonglinks.ddl -$SRC_H5DUMP_TESTFILES/tloop-1.ddl -$SRC_H5DUMP_TESTFILES/tmulti.ddl -$SRC_H5DUMP_TESTFILES/tmultifile.ddl -$SRC_H5DUMP_TESTFILES/tqmarkfile.ddl -$SRC_H5DUMP_TESTFILES/tstarfile.ddl -$SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.ddl -$SRC_H5DUMP_TESTFILES/tnestcomp-1.ddl -$SRC_H5DUMP_TESTFILES/tnestedcmpddt.ddl -$SRC_H5DUMP_TESTFILES/tnbit.ddl -$SRC_H5DUMP_TESTFILES/tnoattrdata.ddl -$SRC_H5DUMP_TESTFILES/tnoattrddl.ddl -$SRC_H5DUMP_TESTFILES/tnodata.ddl -$SRC_H5DUMP_TESTFILES/tnoddl.ddl -$SRC_H5DUMP_TESTFILES/tnoddlfile.ddl -$SRC_H5DUMP_TESTFILES/tnoddlfile.exp -$SRC_H5DUMP_TESTFILES/tno-subset.ddl -$SRC_H5DUMP_TESTFILES/tnullspace.ddl -$SRC_H5DUMP_TESTFILES/trawdatafile.ddl -$SRC_H5DUMP_TESTFILES/trawdatafile.exp -$SRC_H5DUMP_TESTFILES/trawssetfile.ddl -$SRC_H5DUMP_TESTFILES/trawssetfile.exp -$SRC_H5DUMP_TESTFILES/zerodim.ddl -$SRC_H5DUMP_TESTFILES/tordergr1.ddl -$SRC_H5DUMP_TESTFILES/tordergr2.ddl -$SRC_H5DUMP_TESTFILES/tordergr3.ddl -$SRC_H5DUMP_TESTFILES/tordergr4.ddl -$SRC_H5DUMP_TESTFILES/tordergr5.ddl -$SRC_H5DUMP_TESTFILES/torderattr1.ddl -$SRC_H5DUMP_TESTFILES/torderattr2.ddl -$SRC_H5DUMP_TESTFILES/torderattr3.ddl -$SRC_H5DUMP_TESTFILES/torderattr4.ddl -$SRC_H5DUMP_TESTFILES/tordercontents1.ddl -$SRC_H5DUMP_TESTFILES/tordercontents2.ddl -$SRC_H5DUMP_TESTFILES/torderlinks1.ddl -$SRC_H5DUMP_TESTFILES/torderlinks2.ddl -$SRC_H5DUMP_TESTFILES/tperror.ddl -$SRC_H5DUMP_TESTFILES/treadfilter.ddl -$SRC_H5DUMP_TESTFILES/treadintfilter.ddl -$SRC_H5DUMP_TESTFILES/treference.ddl -$SRC_H5DUMP_TESTFILES/tsaf.ddl -$SRC_H5DUMP_TESTFILES/tscalarattrintsize.ddl -$SRC_H5DUMP_TESTFILES/tscalarintattrsize.ddl -$SRC_H5DUMP_TESTFILES/tscalarintsize.ddl -$SRC_H5DUMP_TESTFILES/tscalarstring.ddl -$SRC_H5DUMP_TESTFILES/tscaleoffset.ddl -$SRC_H5DUMP_TESTFILES/tshuffle.ddl -$SRC_H5DUMP_TESTFILES/tslink-1.ddl -$SRC_H5DUMP_TESTFILES/tslink-2.ddl -$SRC_H5DUMP_TESTFILES/tslink-D.ddl -$SRC_H5DUMP_TESTFILES/tsplit_file.ddl -$SRC_H5DUMP_TESTFILES/tstr-1.ddl -$SRC_H5DUMP_TESTFILES/tstr-2.ddl -$SRC_H5DUMP_TESTFILES/tstr2bin2.exp -$SRC_H5DUMP_TESTFILES/tstr2bin6.exp -$SRC_H5DUMP_TESTFILES/tstring.ddl -$SRC_H5DUMP_TESTFILES/tstring2.ddl -$SRC_H5DUMP_TESTFILES/tstringe.ddl -$SRC_H5DUMP_TESTFILES/tszip.ddl -$SRC_H5DUMP_TESTFILES/tudlink-1.ddl -$SRC_H5DUMP_TESTFILES/tudlink-2.ddl -$SRC_H5DUMP_TESTFILES/tuserfilter.ddl -$SRC_H5DUMP_TESTFILES/tvldtypes1.ddl -$SRC_H5DUMP_TESTFILES/tvldtypes2.ddl -$SRC_H5DUMP_TESTFILES/tvldtypes3.ddl -$SRC_H5DUMP_TESTFILES/tvldtypes4.ddl -$SRC_H5DUMP_TESTFILES/tvldtypes5.ddl -$SRC_H5DUMP_TESTFILES/tvlenstr_array.ddl -$SRC_H5DUMP_TESTFILES/tvlstr.ddl -$SRC_H5DUMP_TESTFILES/tvms.ddl -$SRC_H5DUMP_TESTFILES/twidedisplay.ddl -$SRC_H5DUMP_TESTFILES/twithddl.exp -$SRC_H5DUMP_TESTFILES/twithddlfile.ddl -$SRC_H5DUMP_TESTFILES/twithddlfile.exp -$SRC_H5DUMP_TESTFILES/h5dump-help.txt -$SRC_H5DUMP_TESTFILES/out3.h5import -$SRC_H5DUMP_TESTFILES/tbinregR.exp -$SRC_H5DUMP_TESTFILES/err_attr_dspace.ddl -$SRC_H5DUMP_TESTFILES/tst_onion_objs.ddl -$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.ddl -$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.ddl -$SRC_H5DUMP_TESTFILES/tst_onion_revision_count.ddl +$SRC_H5DUMP_OUTFILES/charsets.ddl +$SRC_H5DUMP_OUTFILES/file_space.ddl +$SRC_H5DUMP_OUTFILES/filter_fail.ddl +$SRC_H5DUMP_OUTFILES/non_existing.ddl +$SRC_H5DUMP_OUTFILES/packedbits.ddl +$SRC_H5DUMP_OUTFILES/tall-1.ddl +$SRC_H5DUMP_OUTFILES/tall-2.ddl +$SRC_H5DUMP_OUTFILES/tall-2A.ddl +$SRC_H5DUMP_OUTFILES/tall-2A0.ddl +$SRC_H5DUMP_OUTFILES/tall-2B.ddl +$SRC_H5DUMP_OUTFILES/tall-3.ddl +$SRC_H5DUMP_OUTFILES/tall-4s.ddl +$SRC_H5DUMP_OUTFILES/tall-5s.ddl +$SRC_H5DUMP_OUTFILES/tall-6.ddl +$SRC_H5DUMP_OUTFILES/tall-7.ddl +$SRC_H5DUMP_OUTFILES/tall-7N.ddl +$SRC_H5DUMP_OUTFILES/tallfilters.ddl +$SRC_H5DUMP_OUTFILES/tarray1.ddl +$SRC_H5DUMP_OUTFILES/tarray1_big.ddl +$SRC_H5DUMP_OUTFILES/tarray2.ddl +$SRC_H5DUMP_OUTFILES/tarray3.ddl +$SRC_H5DUMP_OUTFILES/tarray4.ddl +$SRC_H5DUMP_OUTFILES/tarray5.ddl +$SRC_H5DUMP_OUTFILES/tarray6.ddl +$SRC_H5DUMP_OUTFILES/tarray7.ddl +$SRC_H5DUMP_OUTFILES/tarray8.ddl +$SRC_H5DUMP_OUTFILES/tattr-1.ddl +$SRC_H5DUMP_OUTFILES/tattr-2.ddl +$SRC_H5DUMP_OUTFILES/tattr-3.ddl +$SRC_H5DUMP_OUTFILES/tattr-4_be.ddl +$SRC_H5DUMP_OUTFILES/tattrcontents1.ddl +$SRC_H5DUMP_OUTFILES/tattrcontents2.ddl +$SRC_H5DUMP_OUTFILES/tattrintsize.ddl +$SRC_H5DUMP_OUTFILES/tattrreg.ddl +$SRC_H5DUMP_OUTFILES/tattrregR.ddl +$SRC_H5DUMP_OUTFILES/tbin1.ddl +$SRC_H5DUMP_OUTFILES/tbin1.ddl +$SRC_H5DUMP_OUTFILES/tbin2.ddl +$SRC_H5DUMP_OUTFILES/tbin3.ddl +$SRC_H5DUMP_OUTFILES/tbin4.ddl +$SRC_H5DUMP_OUTFILES/tbinregR.ddl +$SRC_H5DUMP_OUTFILES/tbigdims.ddl +$SRC_H5DUMP_OUTFILES/tbitnopaque_be.ddl +$SRC_H5DUMP_OUTFILES/tbitnopaque_le.ddl +$SRC_H5DUMP_OUTFILES/tboot1.ddl +$SRC_H5DUMP_OUTFILES/tboot2.ddl +$SRC_H5DUMP_OUTFILES/tboot2A.ddl +$SRC_H5DUMP_OUTFILES/tboot2B.ddl +$SRC_H5DUMP_OUTFILES/tchar1.ddl +$SRC_H5DUMP_OUTFILES/tchunked.ddl +$SRC_H5DUMP_OUTFILES/tcmpdattrintsize.ddl +$SRC_H5DUMP_OUTFILES/tcmpdintsize.ddl +$SRC_H5DUMP_OUTFILES/tcomp-1.ddl +$SRC_H5DUMP_OUTFILES/tcomp-2.ddl +$SRC_H5DUMP_OUTFILES/tcomp-3.ddl +$SRC_H5DUMP_OUTFILES/tcomp-4.ddl +$SRC_H5DUMP_OUTFILES/tcompound_complex2.ddl +$SRC_H5DUMP_OUTFILES/tcompact.ddl +$SRC_H5DUMP_OUTFILES/tcontents.ddl +$SRC_H5DUMP_OUTFILES/tcontiguos.ddl +$SRC_H5DUMP_OUTFILES/tdatareg.ddl +$SRC_H5DUMP_OUTFILES/tdataregR.ddl +$SRC_H5DUMP_OUTFILES/tdeflate.ddl +$SRC_H5DUMP_OUTFILES/tdset-1.ddl +$SRC_H5DUMP_OUTFILES/tdset-2.ddl +$SRC_H5DUMP_OUTFILES/tdset-3s.ddl +$SRC_H5DUMP_OUTFILES/tempty.ddl +$SRC_H5DUMP_OUTFILES/texceedsubstart.ddl +$SRC_H5DUMP_OUTFILES/texceedsubcount.ddl +$SRC_H5DUMP_OUTFILES/texceedsubstride.ddl +$SRC_H5DUMP_OUTFILES/texceedsubblock.ddl +$SRC_H5DUMP_OUTFILES/texternal.ddl +$SRC_H5DUMP_OUTFILES/textlinksrc.ddl +$SRC_H5DUMP_OUTFILES/textlinkfar.ddl +$SRC_H5DUMP_OUTFILES/textlink.ddl +$SRC_H5DUMP_OUTFILES/tfamily.ddl +$SRC_H5DUMP_OUTFILES/tfill.ddl +$SRC_H5DUMP_OUTFILES/tfletcher32.ddl +$SRC_H5DUMP_OUTFILES/tfloatsattrs.ddl +$SRC_H5DUMP_OUTFILES/tfpformat.ddl +$SRC_H5DUMP_OUTFILES/tgroup-1.ddl +$SRC_H5DUMP_OUTFILES/tgroup-2.ddl +$SRC_H5DUMP_OUTFILES/tgrp_comments.ddl +$SRC_H5DUMP_OUTFILES/tgrpnullspace.ddl +$SRC_H5DUMP_OUTFILES/thlink-1.ddl +$SRC_H5DUMP_OUTFILES/thlink-2.ddl +$SRC_H5DUMP_OUTFILES/thlink-3.ddl +$SRC_H5DUMP_OUTFILES/thlink-4.ddl +$SRC_H5DUMP_OUTFILES/thlink-5.ddl +$SRC_H5DUMP_OUTFILES/thyperslab.ddl +$SRC_H5DUMP_OUTFILES/tindicesno.ddl +$SRC_H5DUMP_OUTFILES/tindicessub1.ddl +$SRC_H5DUMP_OUTFILES/tindicessub2.ddl +$SRC_H5DUMP_OUTFILES/tindicessub3.ddl +$SRC_H5DUMP_OUTFILES/tindicessub4.ddl +$SRC_H5DUMP_OUTFILES/tindicesyes.ddl +$SRC_H5DUMP_OUTFILES/tints4dims.ddl +$SRC_H5DUMP_OUTFILES/tints4dimsBlock2.ddl +$SRC_H5DUMP_OUTFILES/tints4dimsBlockEq.ddl +$SRC_H5DUMP_OUTFILES/tints4dimsCount2.ddl +$SRC_H5DUMP_OUTFILES/tints4dimsCountEq.ddl +$SRC_H5DUMP_OUTFILES/tints4dimsStride2.ddl +$SRC_H5DUMP_OUTFILES/tintsattrs.ddl +$SRC_H5DUMP_OUTFILES/tlarge_objname.ddl +$SRC_H5DUMP_OUTFILES/tldouble.ddl +$SRC_H5DUMP_OUTFILES/tldouble_scalar.ddl +$SRC_H5DUMP_OUTFILES/tlonglinks.ddl +$SRC_H5DUMP_OUTFILES/tloop-1.ddl +$SRC_H5DUMP_OUTFILES/tmulti.ddl +$SRC_H5DUMP_OUTFILES/tmultifile.ddl +$SRC_H5DUMP_OUTFILES/tqmarkfile.ddl +$SRC_H5DUMP_OUTFILES/tstarfile.ddl +$SRC_H5DUMP_OUTFILES/tnamed_dtype_attr.ddl +$SRC_H5DUMP_OUTFILES/tnestcomp-1.ddl +$SRC_H5DUMP_OUTFILES/tnestedcmpddt.ddl +$SRC_H5DUMP_OUTFILES/tnbit.ddl +$SRC_H5DUMP_OUTFILES/tnoattrdata.ddl +$SRC_H5DUMP_OUTFILES/tnoattrddl.ddl +$SRC_H5DUMP_OUTFILES/tnodata.ddl +$SRC_H5DUMP_OUTFILES/tnoddl.ddl +$SRC_H5DUMP_OUTFILES/tnoddlfile.ddl +$SRC_H5DUMP_OUTFILES/tno-subset.ddl +$SRC_H5DUMP_OUTFILES/tnullspace.ddl +$SRC_H5DUMP_OUTFILES/trawdatafile.ddl +$SRC_H5DUMP_OUTFILES/trawssetfile.ddl +$SRC_H5DUMP_OUTFILES/zerodim.ddl +$SRC_H5DUMP_OUTFILES/tordergr1.ddl +$SRC_H5DUMP_OUTFILES/tordergr2.ddl +$SRC_H5DUMP_OUTFILES/tordergr3.ddl +$SRC_H5DUMP_OUTFILES/tordergr4.ddl +$SRC_H5DUMP_OUTFILES/tordergr5.ddl +$SRC_H5DUMP_OUTFILES/torderattr1.ddl +$SRC_H5DUMP_OUTFILES/torderattr2.ddl +$SRC_H5DUMP_OUTFILES/torderattr3.ddl +$SRC_H5DUMP_OUTFILES/torderattr4.ddl +$SRC_H5DUMP_OUTFILES/tordercontents1.ddl +$SRC_H5DUMP_OUTFILES/tordercontents2.ddl +$SRC_H5DUMP_OUTFILES/torderlinks1.ddl +$SRC_H5DUMP_OUTFILES/torderlinks2.ddl +$SRC_H5DUMP_OUTFILES/tperror.ddl +$SRC_H5DUMP_OUTFILES/treadfilter.ddl +$SRC_H5DUMP_OUTFILES/treadintfilter.ddl +$SRC_H5DUMP_OUTFILES/treference.ddl +$SRC_H5DUMP_OUTFILES/tsaf.ddl +$SRC_H5DUMP_OUTFILES/tscalarattrintsize.ddl +$SRC_H5DUMP_OUTFILES/tscalarintattrsize.ddl +$SRC_H5DUMP_OUTFILES/tscalarintsize.ddl +$SRC_H5DUMP_OUTFILES/tscalarstring.ddl +$SRC_H5DUMP_OUTFILES/tscaleoffset.ddl +$SRC_H5DUMP_OUTFILES/tshuffle.ddl +$SRC_H5DUMP_OUTFILES/tslink-1.ddl +$SRC_H5DUMP_OUTFILES/tslink-2.ddl +$SRC_H5DUMP_OUTFILES/tslink-D.ddl +$SRC_H5DUMP_OUTFILES/tsplit_file.ddl +$SRC_H5DUMP_OUTFILES/tstr-1.ddl +$SRC_H5DUMP_OUTFILES/tstr-2.ddl +$SRC_H5DUMP_OUTFILES/tstring.ddl +$SRC_H5DUMP_OUTFILES/tstring2.ddl +$SRC_H5DUMP_OUTFILES/tstringe.ddl +$SRC_H5DUMP_OUTFILES/tszip.ddl +$SRC_H5DUMP_OUTFILES/tudlink-1.ddl +$SRC_H5DUMP_OUTFILES/tudlink-2.ddl +$SRC_H5DUMP_OUTFILES/tuserfilter.ddl +$SRC_H5DUMP_OUTFILES/tvldtypes1.ddl +$SRC_H5DUMP_OUTFILES/tvldtypes2.ddl +$SRC_H5DUMP_OUTFILES/tvldtypes3.ddl +$SRC_H5DUMP_OUTFILES/tvldtypes4.ddl +$SRC_H5DUMP_OUTFILES/tvldtypes5.ddl +$SRC_H5DUMP_OUTFILES/tvlenstr_array.ddl +$SRC_H5DUMP_OUTFILES/tvlstr.ddl +$SRC_H5DUMP_OUTFILES/tvms.ddl +$SRC_H5DUMP_OUTFILES/twidedisplay.ddl +$SRC_H5DUMP_OUTFILES/twithddlfile.ddl +$SRC_H5DUMP_OUTFILES/h5dump-help.txt +$SRC_H5DUMP_OUTFILES/out3.h5import +$SRC_H5DUMP_OUTFILES/err_attr_dspace.ddl +$SRC_H5DUMP_OUTFILES/tst_onion_objs.ddl +$SRC_H5DUMP_OUTFILES/tst_onion_dset_ext.ddl +$SRC_H5DUMP_OUTFILES/tst_onion_dset_1d.ddl +$SRC_H5DUMP_OUTFILES/tst_onion_revision_count.ddl +" + +LIST_EXPORT_TEST_FILES=" +$SRC_H5DUMP_EXPFILES/tall-6.exp +$SRC_H5DUMP_EXPFILES/tbinregR.exp +$SRC_H5DUMP_EXPFILES/tnoddlfile.exp +$SRC_H5DUMP_EXPFILES/trawdatafile.exp +$SRC_H5DUMP_EXPFILES/trawssetfile.exp +$SRC_H5DUMP_EXPFILES/tstr2bin2.exp +$SRC_H5DUMP_EXPFILES/tstr2bin6.exp +$SRC_H5DUMP_EXPFILES/twithddl.exp +$SRC_H5DUMP_EXPFILES/twithddlfile.exp " LIST_ERROR_TEST_FILES=" @@ -415,7 +419,7 @@ ${SRC_H5DUMP_ERRORFILES}/tslink-D.err # # copy test files and expected output files from source dirs to test dir # -COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES $LIST_ERROR_TEST_FILES" +COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES $LIST_EXPORT_TEST_FILES $LIST_ERROR_TEST_FILES" COPY_TESTFILES_TO_TESTDIR() { diff --git a/tools/test/h5dump/testh5dumppbits.sh.in b/tools/test/h5dump/testh5dumppbits.sh.in index e638bb9287b..4094bfc8da7 100644 --- a/tools/test/h5dump/testh5dumppbits.sh.in +++ b/tools/test/h5dump/testh5dumppbits.sh.in @@ -45,11 +45,11 @@ verbose=yes # 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_H5DUMP_ERRORFILES="$srcdir/errfiles" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" +SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected" +SRC_H5DUMP_ERRORFILES="$SRC_TOOLS/test/h5dump/errfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" @@ -78,75 +78,75 @@ $SRC_H5DUMP_TESTFILES/tcompound.h5 " LIST_OTHER_TEST_FILES=" -$SRC_H5DUMP_TESTFILES/pbits/tnofilename-with-packed-bits.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsArray.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsCompound.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsIncomplete.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsLengthExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsCharLengthExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsIntLengthExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsLongLengthExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsLengthPositive.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsMax.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsMaxExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsOffsetExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsCharOffsetExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsIntOffsetExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsLongOffsetExceeded.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsOffsetNegative.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsOverlapped.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedIntWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedIntWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole1.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole1.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole63.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole63.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned4.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned4.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt8.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt8.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong16.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong16.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong32.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong32.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned2.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned2.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt4.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt4.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong8.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong8.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong16.ddl -$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong16.ddl +$SRC_H5DUMP_OUTFILES/pbits/tnofilename-with-packed-bits.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsArray.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsCompound.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsIncomplete.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsLengthExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsCharLengthExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsIntLengthExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsLongLengthExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsLengthPositive.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsMax.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsMaxExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsOffsetExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsCharOffsetExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsIntOffsetExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsLongOffsetExceeded.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsOffsetNegative.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsOverlapped.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedIntWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedIntWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole1.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole1.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole63.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole63.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned4.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned4.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt8.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt8.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong16.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong16.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong32.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong32.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned2.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned2.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt4.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt4.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong8.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong8.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong16.ddl +$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong16.ddl " LIST_ERROR_TEST_FILES=" -${SRC_H5DUMP_ERRORFILES}/tnofilename-with-packed-bits.err -${SRC_H5DUMP_ERRORFILES}/tpbitsCharLengthExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsCharOffsetExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsIncomplete.err -${SRC_H5DUMP_ERRORFILES}/tpbitsIntLengthExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsIntOffsetExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsLengthExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsLengthPositive.err -${SRC_H5DUMP_ERRORFILES}/tpbitsLongLengthExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsLongOffsetExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsMaxExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsOffsetExceeded.err -${SRC_H5DUMP_ERRORFILES}/tpbitsOffsetNegative.err +${SRC_H5DUMP_ERRORFILES}/pbits/tnofilename-with-packed-bits.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsCharLengthExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsCharOffsetExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIncomplete.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIntLengthExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIntOffsetExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLengthExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLengthPositive.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLongLengthExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLongOffsetExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsMaxExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsOffsetExceeded.err +${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsOffsetNegative.err " # diff --git a/tools/test/h5dump/testh5dumpvds.sh.in b/tools/test/h5dump/testh5dumpvds.sh.in index 00e01e54532..e09e429eb39 100644 --- a/tools/test/h5dump/testh5dumpvds.sh.in +++ b/tools/test/h5dump/testh5dumpvds.sh.in @@ -45,10 +45,10 @@ verbose=yes # 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_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected" SRC_H5DUMP_ERRORFILES="$srcdir/errfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" @@ -106,23 +106,23 @@ $SRC_H5DUMP_TESTFILES/vds/vds-eiger.h5 " LIST_OTHER_TEST_FILES=" -$SRC_H5DUMP_TESTFILES/vds/tvds-1.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds-2.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds-3_1.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds-3_2.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds-4.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds-5.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-1.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-2.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_1.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_2.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-4.ddl -$SRC_H5DUMP_TESTFILES/vds/tvds_layout-5.ddl -$SRC_H5DUMP_TESTFILES/vds/vds-first.ddl -$SRC_H5DUMP_TESTFILES/vds/vds-gap1.ddl -$SRC_H5DUMP_TESTFILES/vds/vds-gap2.ddl -$SRC_H5DUMP_TESTFILES/vds/vds_layout-eiger.ddl -$SRC_H5DUMP_TESTFILES/vds/vds_layout-maxmin.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-1.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-2.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-3_1.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-3_2.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-4.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds-5.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-1.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-2.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-3_1.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-3_2.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-4.ddl +$SRC_H5DUMP_OUTFILES/vds/tvds_layout-5.ddl +$SRC_H5DUMP_OUTFILES/vds/vds-first.ddl +$SRC_H5DUMP_OUTFILES/vds/vds-gap1.ddl +$SRC_H5DUMP_OUTFILES/vds/vds-gap2.ddl +$SRC_H5DUMP_OUTFILES/vds/vds_layout-eiger.ddl +$SRC_H5DUMP_OUTFILES/vds/vds_layout-maxmin.ddl " LIST_ERROR_TEST_FILES=" diff --git a/tools/test/h5dump/testh5dumpxml.sh.in b/tools/test/h5dump/testh5dumpxml.sh.in index cebdb972069..b433fa210e3 100644 --- a/tools/test/h5dump/testh5dumpxml.sh.in +++ b/tools/test/h5dump/testh5dumpxml.sh.in @@ -37,16 +37,16 @@ verbose=yes # 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" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected" TEST_P_DIR=./testfiles TESTDIR=./testfiles/xml @@ -63,6 +63,30 @@ test -d $TESTDIR || mkdir -p $TESTDIR # Comment '#' without space can be used. # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES_XML=" +$SRC_H5DUMP_TESTFILES/xml/tbitfields.h5 +$SRC_H5DUMP_TESTFILES/xml/tcompound2.h5 +$SRC_H5DUMP_TESTFILES/xml/tdset2.h5 +$SRC_H5DUMP_TESTFILES/xml/tenum.h5 +$SRC_H5DUMP_TESTFILES/xml/test35.nc +$SRC_H5DUMP_TESTFILES/xml/tloop2.h5 +$SRC_H5DUMP_TESTFILES/xml/tmany.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-amp.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-apos.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-gt.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-lt.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-quot.h5 +$SRC_H5DUMP_TESTFILES/xml/tname-sp.h5 +$SRC_H5DUMP_TESTFILES/xml/tnodata.h5 +$SRC_H5DUMP_TESTFILES/xml/tobjref.h5 +$SRC_H5DUMP_TESTFILES/xml/topaque.h5 +$SRC_H5DUMP_TESTFILES/xml/tref.h5 +$SRC_H5DUMP_TESTFILES/xml/tref-escapes.h5 +$SRC_H5DUMP_TESTFILES/xml/tref-escapes-at.h5 +$SRC_H5DUMP_TESTFILES/xml/tstring.h5 +$SRC_H5DUMP_TESTFILES/xml/tstring-at.h5 +" + +LIST_HDF5_TEST_FILES=" $SRC_H5DUMP_TESTFILES/tall.h5 $SRC_H5DUMP_TESTFILES/tarray1.h5 $SRC_H5DUMP_TESTFILES/tarray2.h5 @@ -70,43 +94,22 @@ $SRC_H5DUMP_TESTFILES/tarray3.h5 $SRC_H5DUMP_TESTFILES/tarray6.h5 $SRC_H5DUMP_TESTFILES/tarray7.h5 $SRC_H5DUMP_TESTFILES/tattr.h5 -$SRC_H5DUMP_TESTFILES/tbitfields.h5 $SRC_H5DUMP_TESTFILES/tcompound.h5 -$SRC_H5DUMP_TESTFILES/tcompound2.h5 $SRC_H5DUMP_TESTFILES/tcompound_complex.h5 $SRC_H5DUMP_TESTFILES/tdatareg.h5 $SRC_H5DUMP_TESTFILES/tdset.h5 -$SRC_H5DUMP_TESTFILES/tdset2.h5 $SRC_H5DUMP_TESTFILES/tempty.h5 -$SRC_H5DUMP_TESTFILES/tenum.h5 -$SRC_H5DUMP_TESTFILES/test35.nc $SRC_H5DUMP_TESTFILES/textlink.h5 $SRC_H5DUMP_TESTFILES/tfpformat.h5 $SRC_H5DUMP_TESTFILES/tgroup.h5 $SRC_H5DUMP_TESTFILES/thlink.h5 $SRC_H5DUMP_TESTFILES/tloop.h5 -$SRC_H5DUMP_TESTFILES/tloop2.h5 -$SRC_H5DUMP_TESTFILES/tmany.h5 -$SRC_H5DUMP_TESTFILES/tname-amp.h5 -$SRC_H5DUMP_TESTFILES/tname-apos.h5 -$SRC_H5DUMP_TESTFILES/tname-gt.h5 -$SRC_H5DUMP_TESTFILES/tname-lt.h5 -$SRC_H5DUMP_TESTFILES/tname-quot.h5 -$SRC_H5DUMP_TESTFILES/tname-sp.h5 $SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.h5 $SRC_H5DUMP_TESTFILES/tnestedcomp.h5 -$SRC_H5DUMP_TESTFILES/tnodata.h5 $SRC_H5DUMP_TESTFILES/tnullspace.h5 -$SRC_H5DUMP_TESTFILES/tobjref.h5 -$SRC_H5DUMP_TESTFILES/topaque.h5 $SRC_H5DUMP_TESTFILES/torderattr.h5 -$SRC_H5DUMP_TESTFILES/tref.h5 -$SRC_H5DUMP_TESTFILES/tref-escapes.h5 -$SRC_H5DUMP_TESTFILES/tref-escapes-at.h5 $SRC_H5DUMP_TESTFILES/tsaf.h5 $SRC_H5DUMP_TESTFILES/tslink.h5 -$SRC_H5DUMP_TESTFILES/tstring.h5 -$SRC_H5DUMP_TESTFILES/tstring-at.h5 $SRC_H5DUMP_TESTFILES/tstr.h5 $SRC_H5DUMP_TESTFILES/tstr2.h5 $SRC_H5DUMP_TESTFILES/tudlink.h5 @@ -119,78 +122,78 @@ $SRC_H5DUMP_TESTFILES/tvlstr.h5 " LIST_OTHER_TEST_FILES_XML=" -$SRC_H5DUMP_TESTFILES/tall.h5.xml -$SRC_H5DUMP_TESTFILES/tall-2A.h5.xml -$SRC_H5DUMP_TESTFILES/tarray1.h5.xml -$SRC_H5DUMP_TESTFILES/tarray2.h5.xml -$SRC_H5DUMP_TESTFILES/tarray3.h5.xml -$SRC_H5DUMP_TESTFILES/tarray6.h5.xml -$SRC_H5DUMP_TESTFILES/tarray7.h5.xml -$SRC_H5DUMP_TESTFILES/tattr.h5.xml -$SRC_H5DUMP_TESTFILES/tbitfields_be.h5.xml -$SRC_H5DUMP_TESTFILES/tbitfields_le.h5.xml -$SRC_H5DUMP_TESTFILES/tcompound_complex.h5.xml -$SRC_H5DUMP_TESTFILES/tcompound.h5.xml -$SRC_H5DUMP_TESTFILES/tcompound2.h5.xml -$SRC_H5DUMP_TESTFILES/tdatareg.h5.xml -$SRC_H5DUMP_TESTFILES/tdset.h5.xml -$SRC_H5DUMP_TESTFILES/tdset2.h5.xml -$SRC_H5DUMP_TESTFILES/tempty.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-dtd.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-dtd-2.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-dtd-uri.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-nons.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-nons-2.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-nons-uri.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-ns.h5.xml -$SRC_H5DUMP_TESTFILES/tempty-ns-2.h5.xml -$SRC_H5DUMP_TESTFILES/tenum.h5.xml -$SRC_H5DUMP_TESTFILES/test35.nc.xml -$SRC_H5DUMP_TESTFILES/textlink.h5.xml -$SRC_H5DUMP_TESTFILES/tfpformat.h5.xml -$SRC_H5DUMP_TESTFILES/tgroup.h5.xml -$SRC_H5DUMP_TESTFILES/thlink.h5.xml -$SRC_H5DUMP_TESTFILES/tloop.h5.xml -$SRC_H5DUMP_TESTFILES/tloop2.h5.xml -$SRC_H5DUMP_TESTFILES/tmany.h5.xml -$SRC_H5DUMP_TESTFILES/tname-amp.h5.xml -$SRC_H5DUMP_TESTFILES/tname-apos.h5.xml -$SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.h5.xml -$SRC_H5DUMP_TESTFILES/tname-gt.h5.xml -$SRC_H5DUMP_TESTFILES/tname-lt.h5.xml -$SRC_H5DUMP_TESTFILES/tname-quot.h5.xml -$SRC_H5DUMP_TESTFILES/tname-sp.h5.xml -$SRC_H5DUMP_TESTFILES/tnestedcomp.h5.xml -$SRC_H5DUMP_TESTFILES/tnodata.h5.xml -$SRC_H5DUMP_TESTFILES/tnullspace.h5.xml -$SRC_H5DUMP_TESTFILES/tobjref.h5.xml -$SRC_H5DUMP_TESTFILES/topaque.h5.xml -$SRC_H5DUMP_TESTFILES/torderattr1.h5.xml -$SRC_H5DUMP_TESTFILES/torderattr2.h5.xml -$SRC_H5DUMP_TESTFILES/torderattr3.h5.xml -$SRC_H5DUMP_TESTFILES/torderattr4.h5.xml -$SRC_H5DUMP_TESTFILES/tref.h5.xml -$SRC_H5DUMP_TESTFILES/tref-escapes.h5.xml -$SRC_H5DUMP_TESTFILES/tref-escapes-at.h5.xml -$SRC_H5DUMP_TESTFILES/tsaf.h5.xml -$SRC_H5DUMP_TESTFILES/tslink.h5.xml -$SRC_H5DUMP_TESTFILES/tstr.h5.xml -$SRC_H5DUMP_TESTFILES/tstr2.h5.xml -$SRC_H5DUMP_TESTFILES/tstring.h5.xml -$SRC_H5DUMP_TESTFILES/tstring-at.h5.xml -$SRC_H5DUMP_TESTFILES/tudlink.h5.xml -$SRC_H5DUMP_TESTFILES/tvldtypes1.h5.xml -$SRC_H5DUMP_TESTFILES/tvldtypes2.h5.xml -$SRC_H5DUMP_TESTFILES/tvldtypes3.h5.xml -$SRC_H5DUMP_TESTFILES/tvldtypes4.h5.xml -$SRC_H5DUMP_TESTFILES/tvldtypes5.h5.xml -$SRC_H5DUMP_TESTFILES/tvlstr.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tall.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tall-2A.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tarray1.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tarray2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tarray3.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tarray6.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tarray7.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tattr.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tbitfields_be.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tbitfields_le.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tcompound_complex.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tcompound.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tcompound2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tdatareg.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tdset.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tdset2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-dtd.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-dtd-2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-dtd-uri.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-nons.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-nons-2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-nons-uri.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-ns.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tempty-ns-2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tenum.h5.xml +$SRC_H5DUMP_OUTFILES/xml/test35.nc.xml +$SRC_H5DUMP_OUTFILES/xml/textlink.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tfpformat.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tgroup.h5.xml +$SRC_H5DUMP_OUTFILES/xml/thlink.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tloop.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tloop2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tmany.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-amp.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-apos.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tnamed_dtype_attr.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-gt.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-lt.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-quot.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tname-sp.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tnestedcomp.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tnodata.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tnullspace.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tobjref.h5.xml +$SRC_H5DUMP_OUTFILES/xml/topaque.h5.xml +$SRC_H5DUMP_OUTFILES/xml/torderattr1.h5.xml +$SRC_H5DUMP_OUTFILES/xml/torderattr2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/torderattr3.h5.xml +$SRC_H5DUMP_OUTFILES/xml/torderattr4.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tref.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tref-escapes.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tref-escapes-at.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tsaf.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tslink.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tstr.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tstr2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tstring.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tstring-at.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tudlink.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvldtypes1.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvldtypes2.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvldtypes3.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvldtypes4.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvldtypes5.h5.xml +$SRC_H5DUMP_OUTFILES/xml/tvlstr.h5.xml " # # copy test files and expected output files from source dirs to test dir # -COPY_TESTFILES="$LIST_HDF5_TEST_FILES_XML $LIST_OTHER_TEST_FILES_XML" +COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_HDF5_TEST_FILES_XML $LIST_OTHER_TEST_FILES_XML" COPY_TESTFILES_TO_TESTDIR() { diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake index 73cb2ee6f59..3046521a365 100644 --- a/tools/test/h5format_convert/CMakeTests.cmake +++ b/tools/test/h5format_convert/CMakeTests.cmake @@ -79,15 +79,15 @@ add_custom_target(h5fc-files ALL COMMENT "Copying files needed by h5fc tests") foreach (ddl_file ${HDF5_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${ddl_file}" "${PROJECT_BINARY_DIR}/testfiles/${ddl_file}" "h5fc_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${ddl_file}" "${PROJECT_BINARY_DIR}/testfiles/${ddl_file}" "h5fc_files") endforeach () foreach (h5_file ${HDF5_REFERENCE_ERR_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files") endforeach () foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files") endforeach () add_custom_target(h5fc_files ALL COMMENT "Copying files needed by h5fc tests" DEPENDS ${h5fc_files_list}) diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl b/tools/test/h5format_convert/expected/h5fc_d_file-d.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl rename to tools/test/h5format_convert/expected/h5fc_d_file-d.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl b/tools/test/h5format_convert/expected/h5fc_d_file.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_d_file.ddl rename to tools/test/h5format_convert/expected/h5fc_d_file.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_d_file.ddl.err similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err rename to tools/test/h5format_convert/expected/h5fc_d_file.ddl.err diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.ddl b/tools/test/h5format_convert/expected/h5fc_dname.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_dname.ddl rename to tools/test/h5format_convert/expected/h5fc_dname.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.err b/tools/test/h5format_convert/expected/h5fc_dname.err similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_dname.err rename to tools/test/h5format_convert/expected/h5fc_dname.err diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext1_f.ddl rename to tools/test/h5format_convert/expected/h5fc_ext1_f.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext1_i.ddl rename to tools/test/h5format_convert/expected/h5fc_ext1_i.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext1_s.ddl rename to tools/test/h5format_convert/expected/h5fc_ext1_s.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext2_if.ddl rename to tools/test/h5format_convert/expected/h5fc_ext2_if.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext2_is.ddl rename to tools/test/h5format_convert/expected/h5fc_ext2_is.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext2_sf.ddl rename to tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_ext3_isf.ddl rename to tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_help.ddl b/tools/test/h5format_convert/expected/h5fc_help.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_help.ddl rename to tools/test/h5format_convert/expected/h5fc_help.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err rename to tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err rename to tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err diff --git a/tools/test/h5format_convert/testfiles/h5fc_nooption.ddl b/tools/test/h5format_convert/expected/h5fc_nooption.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_nooption.ddl rename to tools/test/h5format_convert/expected/h5fc_nooption.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_all.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_all.ddl rename to tools/test/h5format_convert/expected/h5fc_v_all.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_bt1.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_bt1.ddl rename to tools/test/h5format_convert/expected/h5fc_v_bt1.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl b/tools/test/h5format_convert/expected/h5fc_v_err.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_err.ddl rename to tools/test/h5format_convert/expected/h5fc_v_err.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err b/tools/test/h5format_convert/expected/h5fc_v_err.ddl.err similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err rename to tools/test/h5format_convert/expected/h5fc_v_err.ddl.err diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_n_1d.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_n_1d.ddl rename to tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_n_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_all.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_n_all.ddl rename to tools/test/h5format_convert/expected/h5fc_v_n_all.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl rename to tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_non_chunked.ddl b/tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/h5fc_v_non_chunked.ddl rename to tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext1_f.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext1_i.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext1_s.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext2_if.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext2_is.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl similarity index 100% rename from tools/test/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl rename to tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl diff --git a/tools/test/h5format_convert/testh5fc.sh.in b/tools/test/h5format_convert/testh5fc.sh.in index cd2b8014e0d..4ba46cbe88c 100644 --- a/tools/test/h5format_convert/testh5fc.sh.in +++ b/tools/test/h5format_convert/testh5fc.sh.in @@ -49,11 +49,10 @@ verbose=yes # 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" @@ -61,6 +60,7 @@ SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" SRC_H5FORMCONV_TESTFILES="$SRC_TOOLS/test/h5format_convert/testfiles" +SRC_H5FORMCONV_OUTFILES="$SRC_TOOLS/test/h5format_convert/expected" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -103,39 +103,39 @@ $SRC_H5FORMCONV_TESTFILES/h5fc_err_level.h5 " LIST_ERR_TEST_FILES=" -$SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl.err -$SRC_H5FORMCONV_TESTFILES/h5fc_dname.err -$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistfile.ddl.err -$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistdset_file.ddl.err +$SRC_H5FORMCONV_OUTFILES/h5fc_d_file.ddl.err +$SRC_H5FORMCONV_OUTFILES/h5fc_dname.err +$SRC_H5FORMCONV_OUTFILES/h5fc_nonexistfile.ddl.err +$SRC_H5FORMCONV_OUTFILES/h5fc_nonexistdset_file.ddl.err " LIST_OTHER_TEST_FILES=" -$SRC_H5FORMCONV_TESTFILES/h5fc_help.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_nooption.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_dname.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_non_chunked.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_bt1.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_ndata_bt1.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_all.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_n_1d.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_n_all.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_i.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_s.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_f.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_if.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_is.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_sf.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_ext3_isf.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_i.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_s.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_f.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_if.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_is.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_sf.ddl -$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext3_isf.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_err.ddl -$SRC_H5FORMCONV_TESTFILES/h5fc_v_err.ddl.err +$SRC_H5FORMCONV_OUTFILES/h5fc_help.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_nooption.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_d_file.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_dname.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_non_chunked.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_bt1.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_ndata_bt1.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_all.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_n_1d.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_n_all.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_i.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_s.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_f.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_if.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_is.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_sf.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_ext3_isf.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_i.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_s.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_f.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_if.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_is.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_sf.ddl +$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext3_isf.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_err.ddl +$SRC_H5FORMCONV_OUTFILES/h5fc_v_err.ddl.err " # diff --git a/tools/test/h5import/CMakeTests.cmake b/tools/test/h5import/CMakeTests.cmake index 750611698f4..c3bbd79857c 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 ba91ee55c0e..65b899fc9c4 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=" diff --git a/tools/test/h5jam/CMakeTests.cmake b/tools/test/h5jam/CMakeTests.cmake index e19ec867fe0..eb6070ea5bf 100644 --- a/tools/test/h5jam/CMakeTests.cmake +++ b/tools/test/h5jam/CMakeTests.cmake @@ -33,11 +33,11 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files") endforeach () foreach (txt_file ${HDF5_REFERENCE_TXT_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5jam_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5jam_files") endforeach () add_custom_target(h5jam_files ALL COMMENT "Copying files needed by h5jam tests" DEPENDS ${h5jam_files_list}) diff --git a/tools/test/h5jam/testfiles/h5jam-help.txt b/tools/test/h5jam/expected/h5jam-help.txt similarity index 100% rename from tools/test/h5jam/testfiles/h5jam-help.txt rename to tools/test/h5jam/expected/h5jam-help.txt diff --git a/tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt b/tools/test/h5jam/expected/h5jam-ub-nohdf5.txt similarity index 100% rename from tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt rename to tools/test/h5jam/expected/h5jam-ub-nohdf5.txt diff --git a/tools/test/h5jam/testfiles/h5unjam-help.txt b/tools/test/h5jam/expected/h5unjam-help.txt similarity index 100% rename from tools/test/h5jam/testfiles/h5unjam-help.txt rename to tools/test/h5jam/expected/h5unjam-help.txt diff --git a/tools/test/h5jam/testfiles/u10.txt b/tools/test/h5jam/expected/u10.txt similarity index 100% rename from tools/test/h5jam/testfiles/u10.txt rename to tools/test/h5jam/expected/u10.txt diff --git a/tools/test/h5jam/testfiles/u511.txt b/tools/test/h5jam/expected/u511.txt similarity index 100% rename from tools/test/h5jam/testfiles/u511.txt rename to tools/test/h5jam/expected/u511.txt diff --git a/tools/test/h5jam/testfiles/u512.txt b/tools/test/h5jam/expected/u512.txt similarity index 100% rename from tools/test/h5jam/testfiles/u512.txt rename to tools/test/h5jam/expected/u512.txt diff --git a/tools/test/h5jam/testfiles/u513.txt b/tools/test/h5jam/expected/u513.txt similarity index 100% rename from tools/test/h5jam/testfiles/u513.txt rename to tools/test/h5jam/expected/u513.txt diff --git a/tools/test/h5jam/testh5jam.sh.in b/tools/test/h5jam/testh5jam.sh.in index 805ce11e06e..49598da07d0 100644 --- a/tools/test/h5jam/testh5jam.sh.in +++ b/tools/test/h5jam/testh5jam.sh.in @@ -43,17 +43,17 @@ verbose=yes # 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" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5JAM_OUTFILES="$SRC_TOOLS/test/h5jam/expected" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -73,13 +73,13 @@ $SRC_H5JAM_TESTFILES/twithub.h5 $SRC_H5JAM_TESTFILES/twithub513.h5 " LIST_OTHER_TEST_FILES=" -$SRC_H5JAM_TESTFILES/u10.txt -$SRC_H5JAM_TESTFILES/u511.txt -$SRC_H5JAM_TESTFILES/u512.txt -$SRC_H5JAM_TESTFILES/u513.txt -$SRC_H5JAM_TESTFILES/h5jam-help.txt -$SRC_H5JAM_TESTFILES/h5unjam-help.txt -$SRC_H5JAM_TESTFILES/h5jam-ub-nohdf5.txt +$SRC_H5JAM_OUTFILES/u10.txt +$SRC_H5JAM_OUTFILES/u511.txt +$SRC_H5JAM_OUTFILES/u512.txt +$SRC_H5JAM_OUTFILES/u513.txt +$SRC_H5JAM_OUTFILES/h5jam-help.txt +$SRC_H5JAM_OUTFILES/h5unjam-help.txt +$SRC_H5JAM_OUTFILES/h5jam-ub-nohdf5.txt " # Source in the output filter function definitions. diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake index 15f18b5e7a8..14a7e5d97a3 100644 --- a/tools/test/h5ls/CMakeTests.cmake +++ b/tools/test/h5ls/CMakeTests.cmake @@ -19,112 +19,119 @@ # -------------------------------------------------------------------- # Copy all the test files from source directory to test directory # -------------------------------------------------------------------- + set (LIST_HDF5_TESTLS_FILES + tdset_idx.h5 + ) + set (LIST_HDF5_TEST_FILES - ${HDF5_TOOLS_DIR}/testfiles/tall.h5 - ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5 - ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdset.h5 - ${HDF5_TOOLS_DIR}/testfiles/tempty.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5 - ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.h5 - ${HDF5_TOOLS_DIR}/testfiles/thlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tloop.h5 - ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5 - ${HDF5_TOOLS_DIR}/testfiles/tslink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5 - ${HDF5_TOOLS_DIR}/testfiles/tstr.h5 - ${HDF5_TOOLS_DIR}/testfiles/tudfilter.h5 - ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5 - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdset_idx.h5 + tall.h5 + tarray1.h5 + tattr2.h5 + tattrreg.h5 + tcompound.h5 + tdatareg.h5 + tdset.h5 + tempty.h5 + textlink.h5 + textlinksrc.h5 + textlinktar.h5 + tgroup.h5 + tgrp_comments.h5 + tgrpnullspace.h5 + thlink.h5 + tloop.h5 + tnestedcomp.h5 + tsaf.h5 + tslink.h5 + tsoftlinks.h5 + tstr.h5 + tudfilter.h5 + tudlink.h5 + tvldtypes1.h5 ) set (LIST_ERR_TEST_FILES - ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/nosuchfile.err - ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/textlinksrc-nodangle-1.err - ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/tgroup-1.err + nosuchfile.err + textlinksrc-nodangle-1.err + tgroup-1.err ) set (LIST_OTHER_TEST_FILES - ${HDF5_TOOLS_DIR}/testfiles/help-1.ls - ${HDF5_TOOLS_DIR}/testfiles/help-2.ls - ${HDF5_TOOLS_DIR}/testfiles/help-3.ls - ${HDF5_TOOLS_DIR}/testfiles/nosuchfile.ls - ${HDF5_TOOLS_DIR}/testfiles/tall-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tall-2.ls - ${HDF5_TOOLS_DIR}/testfiles/tarray1.ls - ${HDF5_TOOLS_DIR}/testfiles/tattr2.ls - ${HDF5_TOOLS_DIR}/testfiles/tattrreg_le.ls - ${HDF5_TOOLS_DIR}/testfiles/tattrreg_be.ls - ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tdataregbe.ls - ${HDF5_TOOLS_DIR}/testfiles/tdataregle.ls - ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tempty.ls - ${HDF5_TOOLS_DIR}/testfiles/textlink-1.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-4.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-5.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1-old.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2-old.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3-old.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6-old.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7-old.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-2.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-3.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-4.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-5.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-1.ls - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-2.ls - ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ls - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-nodangle-1.ls - ${HDF5_TOOLS_DIR}/testfiles/thlinks-nodangle-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tgroup.ls - ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ls - ${HDF5_TOOLS_DIR}/testfiles/tgroup-3.ls - ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.ls - ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ls - ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-2.ls - ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-3.ls - ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-4.ls - ${HDF5_TOOLS_DIR}/testfiles/tsaf.ls - ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tudfilter.ls - ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ls - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ls - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2le.ls - ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2be.ls - ${HDF5_TOOLS_DIR}/testfiles/tdset_idx.ls + help-1.ls + help-2.ls + help-3.ls + nosuchfile.ls + tall-1.ls + tall-2.ls + tarray1.ls + tattr2.ls + tattrreg_le.ls + tattrreg_be.ls + tcomp-1.ls + tdataregbe.ls + tdataregle.ls + tdset-1.ls + tdset_idx.ls + tempty.ls + textlink-1.ls + textlinksrc-1.ls + textlinksrc-2.ls + textlinksrc-3.ls + textlinksrc-4.ls + textlinksrc-5.ls + textlinksrc-6.ls + textlinksrc-7.ls + textlinksrc-1-old.ls + textlinksrc-2-old.ls + textlinksrc-3-old.ls + textlinksrc-6-old.ls + textlinksrc-7-old.ls + textlinksrc-nodangle-1.ls + textlinksrc-nodangle-2.ls + tgroup.ls + tgroup-1.ls + tgroup-2.ls + tgroup-3.ls + tgrpnullspace.ls + tgrp_comments.ls + thlinks-nodangle-1.ls + thlink-1.ls + tloop-1.ls + tmultifile.ls + tnestcomp-1.ls + tnestcomp-2.ls + tnestcomp-3.ls + tnestcomp-4.ls + tsaf.ls + tslink-1.ls + tsoftlinks-1.ls + tsoftlinks-2.ls + tsoftlinks-3.ls + tsoftlinks-4.ls + tsoftlinks-5.ls + tsoftlinks-nodangle-1.ls + tstr-1.ls + tudfilter.ls + tudlink-1.ls + tvldtypes1.ls + tvldtypes2le.ls + tvldtypes2be.ls ) file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") # copy the list of test files - foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5ls_files") + foreach (listlsfiles ${LIST_HDF5_TESTLS_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${listlsfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listlsfiles}" "h5ls_files") + endforeach () + foreach (listfiles ${LIST_HDF5_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5ls_files") + endforeach () + foreach (listothers ${LIST_OTHER_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/${listothers}" "h5ls_files") endforeach () - foreach (listfiles ${LIST_ERR_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5ls_files") + foreach (listerrfiles ${LIST_ERR_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${listerrfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listerrfiles}" "h5ls_files") endforeach () add_custom_target(h5ls_files ALL COMMENT "Copying files needed by h5ls tests" DEPENDS ${h5ls_files_list}) diff --git a/tools/test/h5ls/CMakeTestsVDS.cmake b/tools/test/h5ls/CMakeTestsVDS.cmake index 5ef21abbb29..3718f64e51c 100644 --- a/tools/test/h5ls/CMakeTestsVDS.cmake +++ b/tools/test/h5ls/CMakeTestsVDS.cmake @@ -57,19 +57,20 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") # copy the list of test files - foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5ls_vds_files") + foreach (listfiles ${LIST_HDF5_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/${listfiles}" "h5ls_vds_files") + endforeach () + + foreach (listothers ${LIST_OTHER_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/vds/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/vds/${listothers}" "h5ls_vds_files") endforeach () foreach (listfiles ${LIST_HDF5_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5ls_vds_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${listfiles}" "h5ls_vds_files") endforeach () - foreach (listfiles ${LIST_OTHER_TEST_FILES}) - get_filename_component(fname "${listfiles}" NAME) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5LS_SOURCE_DIR}/vds_prefix/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5ls_vds_files") + foreach (listothers ${LIST_OTHER_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/vds_prefix/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${listothers}" "h5ls_vds_files") endforeach () add_custom_target(h5ls_vds_files ALL COMMENT "Copying files needed by h5ls_vds tests" DEPENDS ${h5ls_vds_files_list}) diff --git a/tools/testfiles/help-1.ls b/tools/test/h5ls/expected/help-1.ls similarity index 100% rename from tools/testfiles/help-1.ls rename to tools/test/h5ls/expected/help-1.ls diff --git a/tools/testfiles/help-2.ls b/tools/test/h5ls/expected/help-2.ls similarity index 100% rename from tools/testfiles/help-2.ls rename to tools/test/h5ls/expected/help-2.ls diff --git a/tools/testfiles/help-3.ls b/tools/test/h5ls/expected/help-3.ls similarity index 100% rename from tools/testfiles/help-3.ls rename to tools/test/h5ls/expected/help-3.ls diff --git a/tools/testfiles/nosuchfile.ls b/tools/test/h5ls/expected/nosuchfile.ls similarity index 100% rename from tools/testfiles/nosuchfile.ls rename to tools/test/h5ls/expected/nosuchfile.ls diff --git a/tools/testfiles/tall-1.ls b/tools/test/h5ls/expected/tall-1.ls similarity index 100% rename from tools/testfiles/tall-1.ls rename to tools/test/h5ls/expected/tall-1.ls diff --git a/tools/testfiles/tall-2.ls b/tools/test/h5ls/expected/tall-2.ls similarity index 100% rename from tools/testfiles/tall-2.ls rename to tools/test/h5ls/expected/tall-2.ls diff --git a/tools/testfiles/tarray1.ls b/tools/test/h5ls/expected/tarray1.ls similarity index 100% rename from tools/testfiles/tarray1.ls rename to tools/test/h5ls/expected/tarray1.ls diff --git a/tools/testfiles/tattr2.ls b/tools/test/h5ls/expected/tattr2.ls similarity index 100% rename from tools/testfiles/tattr2.ls rename to tools/test/h5ls/expected/tattr2.ls diff --git a/tools/testfiles/tattrreg_be.ls b/tools/test/h5ls/expected/tattrreg_be.ls similarity index 100% rename from tools/testfiles/tattrreg_be.ls rename to tools/test/h5ls/expected/tattrreg_be.ls diff --git a/tools/testfiles/tattrreg_le.ls b/tools/test/h5ls/expected/tattrreg_le.ls similarity index 100% rename from tools/testfiles/tattrreg_le.ls rename to tools/test/h5ls/expected/tattrreg_le.ls diff --git a/tools/testfiles/tcomp-1.ls b/tools/test/h5ls/expected/tcomp-1.ls similarity index 100% rename from tools/testfiles/tcomp-1.ls rename to tools/test/h5ls/expected/tcomp-1.ls diff --git a/tools/testfiles/tdataregbe.ls b/tools/test/h5ls/expected/tdataregbe.ls similarity index 100% rename from tools/testfiles/tdataregbe.ls rename to tools/test/h5ls/expected/tdataregbe.ls diff --git a/tools/testfiles/tdataregle.ls b/tools/test/h5ls/expected/tdataregle.ls similarity index 100% rename from tools/testfiles/tdataregle.ls rename to tools/test/h5ls/expected/tdataregle.ls diff --git a/tools/testfiles/tdset-1.ls b/tools/test/h5ls/expected/tdset-1.ls similarity index 100% rename from tools/testfiles/tdset-1.ls rename to tools/test/h5ls/expected/tdset-1.ls diff --git a/tools/testfiles/tdset_idx.ls b/tools/test/h5ls/expected/tdset_idx.ls similarity index 100% rename from tools/testfiles/tdset_idx.ls rename to tools/test/h5ls/expected/tdset_idx.ls diff --git a/tools/testfiles/tempty.ls b/tools/test/h5ls/expected/tempty.ls similarity index 100% rename from tools/testfiles/tempty.ls rename to tools/test/h5ls/expected/tempty.ls diff --git a/tools/testfiles/textlink-1.ls b/tools/test/h5ls/expected/textlink-1.ls similarity index 100% rename from tools/testfiles/textlink-1.ls rename to tools/test/h5ls/expected/textlink-1.ls diff --git a/tools/testfiles/textlinksrc-1-old.ls b/tools/test/h5ls/expected/textlinksrc-1-old.ls similarity index 100% rename from tools/testfiles/textlinksrc-1-old.ls rename to tools/test/h5ls/expected/textlinksrc-1-old.ls diff --git a/tools/testfiles/textlinksrc-1.ls b/tools/test/h5ls/expected/textlinksrc-1.ls similarity index 100% rename from tools/testfiles/textlinksrc-1.ls rename to tools/test/h5ls/expected/textlinksrc-1.ls diff --git a/tools/testfiles/textlinksrc-2-old.ls b/tools/test/h5ls/expected/textlinksrc-2-old.ls similarity index 100% rename from tools/testfiles/textlinksrc-2-old.ls rename to tools/test/h5ls/expected/textlinksrc-2-old.ls diff --git a/tools/testfiles/textlinksrc-2.ls b/tools/test/h5ls/expected/textlinksrc-2.ls similarity index 100% rename from tools/testfiles/textlinksrc-2.ls rename to tools/test/h5ls/expected/textlinksrc-2.ls diff --git a/tools/testfiles/textlinksrc-3-old.ls b/tools/test/h5ls/expected/textlinksrc-3-old.ls similarity index 100% rename from tools/testfiles/textlinksrc-3-old.ls rename to tools/test/h5ls/expected/textlinksrc-3-old.ls diff --git a/tools/testfiles/textlinksrc-3.ls b/tools/test/h5ls/expected/textlinksrc-3.ls similarity index 100% rename from tools/testfiles/textlinksrc-3.ls rename to tools/test/h5ls/expected/textlinksrc-3.ls diff --git a/tools/testfiles/textlinksrc-4.ls b/tools/test/h5ls/expected/textlinksrc-4.ls similarity index 100% rename from tools/testfiles/textlinksrc-4.ls rename to tools/test/h5ls/expected/textlinksrc-4.ls diff --git a/tools/testfiles/textlinksrc-5.ls b/tools/test/h5ls/expected/textlinksrc-5.ls similarity index 100% rename from tools/testfiles/textlinksrc-5.ls rename to tools/test/h5ls/expected/textlinksrc-5.ls diff --git a/tools/testfiles/textlinksrc-6-old.ls b/tools/test/h5ls/expected/textlinksrc-6-old.ls similarity index 100% rename from tools/testfiles/textlinksrc-6-old.ls rename to tools/test/h5ls/expected/textlinksrc-6-old.ls diff --git a/tools/testfiles/textlinksrc-6.ls b/tools/test/h5ls/expected/textlinksrc-6.ls similarity index 100% rename from tools/testfiles/textlinksrc-6.ls rename to tools/test/h5ls/expected/textlinksrc-6.ls diff --git a/tools/testfiles/textlinksrc-7-old.ls b/tools/test/h5ls/expected/textlinksrc-7-old.ls similarity index 100% rename from tools/testfiles/textlinksrc-7-old.ls rename to tools/test/h5ls/expected/textlinksrc-7-old.ls diff --git a/tools/testfiles/textlinksrc-7.ls b/tools/test/h5ls/expected/textlinksrc-7.ls similarity index 100% rename from tools/testfiles/textlinksrc-7.ls rename to tools/test/h5ls/expected/textlinksrc-7.ls diff --git a/tools/testfiles/textlinksrc-nodangle-1.ls b/tools/test/h5ls/expected/textlinksrc-nodangle-1.ls similarity index 100% rename from tools/testfiles/textlinksrc-nodangle-1.ls rename to tools/test/h5ls/expected/textlinksrc-nodangle-1.ls diff --git a/tools/testfiles/textlinksrc-nodangle-2.ls b/tools/test/h5ls/expected/textlinksrc-nodangle-2.ls similarity index 100% rename from tools/testfiles/textlinksrc-nodangle-2.ls rename to tools/test/h5ls/expected/textlinksrc-nodangle-2.ls diff --git a/tools/testfiles/tgroup-1.ls b/tools/test/h5ls/expected/tgroup-1.ls similarity index 100% rename from tools/testfiles/tgroup-1.ls rename to tools/test/h5ls/expected/tgroup-1.ls diff --git a/tools/testfiles/tgroup-2.ls b/tools/test/h5ls/expected/tgroup-2.ls similarity index 100% rename from tools/testfiles/tgroup-2.ls rename to tools/test/h5ls/expected/tgroup-2.ls diff --git a/tools/testfiles/tgroup-3.ls b/tools/test/h5ls/expected/tgroup-3.ls similarity index 100% rename from tools/testfiles/tgroup-3.ls rename to tools/test/h5ls/expected/tgroup-3.ls diff --git a/tools/testfiles/tgroup.ls b/tools/test/h5ls/expected/tgroup.ls similarity index 100% rename from tools/testfiles/tgroup.ls rename to tools/test/h5ls/expected/tgroup.ls diff --git a/tools/testfiles/tgrp_comments.ls b/tools/test/h5ls/expected/tgrp_comments.ls similarity index 100% rename from tools/testfiles/tgrp_comments.ls rename to tools/test/h5ls/expected/tgrp_comments.ls diff --git a/tools/testfiles/tgrpnullspace.ls b/tools/test/h5ls/expected/tgrpnullspace.ls similarity index 100% rename from tools/testfiles/tgrpnullspace.ls rename to tools/test/h5ls/expected/tgrpnullspace.ls diff --git a/tools/testfiles/thlink-1.ls b/tools/test/h5ls/expected/thlink-1.ls similarity index 100% rename from tools/testfiles/thlink-1.ls rename to tools/test/h5ls/expected/thlink-1.ls diff --git a/tools/testfiles/thlinks-nodangle-1.ls b/tools/test/h5ls/expected/thlinks-nodangle-1.ls similarity index 100% rename from tools/testfiles/thlinks-nodangle-1.ls rename to tools/test/h5ls/expected/thlinks-nodangle-1.ls diff --git a/tools/testfiles/tloop-1.ls b/tools/test/h5ls/expected/tloop-1.ls similarity index 100% rename from tools/testfiles/tloop-1.ls rename to tools/test/h5ls/expected/tloop-1.ls diff --git a/tools/testfiles/tmultifile.ls b/tools/test/h5ls/expected/tmultifile.ls similarity index 100% rename from tools/testfiles/tmultifile.ls rename to tools/test/h5ls/expected/tmultifile.ls diff --git a/tools/testfiles/tnestcomp-1.ls b/tools/test/h5ls/expected/tnestcomp-1.ls similarity index 100% rename from tools/testfiles/tnestcomp-1.ls rename to tools/test/h5ls/expected/tnestcomp-1.ls diff --git a/tools/testfiles/tnestcomp-2.ls b/tools/test/h5ls/expected/tnestcomp-2.ls similarity index 100% rename from tools/testfiles/tnestcomp-2.ls rename to tools/test/h5ls/expected/tnestcomp-2.ls diff --git a/tools/testfiles/tnestcomp-3.ls b/tools/test/h5ls/expected/tnestcomp-3.ls similarity index 100% rename from tools/testfiles/tnestcomp-3.ls rename to tools/test/h5ls/expected/tnestcomp-3.ls diff --git a/tools/testfiles/tnestcomp-4.ls b/tools/test/h5ls/expected/tnestcomp-4.ls similarity index 100% rename from tools/testfiles/tnestcomp-4.ls rename to tools/test/h5ls/expected/tnestcomp-4.ls diff --git a/tools/testfiles/tsaf.ls b/tools/test/h5ls/expected/tsaf.ls similarity index 100% rename from tools/testfiles/tsaf.ls rename to tools/test/h5ls/expected/tsaf.ls diff --git a/tools/testfiles/tslink-1.ls b/tools/test/h5ls/expected/tslink-1.ls similarity index 100% rename from tools/testfiles/tslink-1.ls rename to tools/test/h5ls/expected/tslink-1.ls diff --git a/tools/testfiles/tsoftlinks-1.ls b/tools/test/h5ls/expected/tsoftlinks-1.ls similarity index 100% rename from tools/testfiles/tsoftlinks-1.ls rename to tools/test/h5ls/expected/tsoftlinks-1.ls diff --git a/tools/testfiles/tsoftlinks-2.ls b/tools/test/h5ls/expected/tsoftlinks-2.ls similarity index 100% rename from tools/testfiles/tsoftlinks-2.ls rename to tools/test/h5ls/expected/tsoftlinks-2.ls diff --git a/tools/testfiles/tsoftlinks-3.ls b/tools/test/h5ls/expected/tsoftlinks-3.ls similarity index 100% rename from tools/testfiles/tsoftlinks-3.ls rename to tools/test/h5ls/expected/tsoftlinks-3.ls diff --git a/tools/testfiles/tsoftlinks-4.ls b/tools/test/h5ls/expected/tsoftlinks-4.ls similarity index 100% rename from tools/testfiles/tsoftlinks-4.ls rename to tools/test/h5ls/expected/tsoftlinks-4.ls diff --git a/tools/testfiles/tsoftlinks-5.ls b/tools/test/h5ls/expected/tsoftlinks-5.ls similarity index 100% rename from tools/testfiles/tsoftlinks-5.ls rename to tools/test/h5ls/expected/tsoftlinks-5.ls diff --git a/tools/testfiles/tsoftlinks-nodangle-1.ls b/tools/test/h5ls/expected/tsoftlinks-nodangle-1.ls similarity index 100% rename from tools/testfiles/tsoftlinks-nodangle-1.ls rename to tools/test/h5ls/expected/tsoftlinks-nodangle-1.ls diff --git a/tools/testfiles/tstr-1.ls b/tools/test/h5ls/expected/tstr-1.ls similarity index 100% rename from tools/testfiles/tstr-1.ls rename to tools/test/h5ls/expected/tstr-1.ls diff --git a/tools/testfiles/tudfilter.ls b/tools/test/h5ls/expected/tudfilter.ls similarity index 100% rename from tools/testfiles/tudfilter.ls rename to tools/test/h5ls/expected/tudfilter.ls diff --git a/tools/testfiles/tudlink-1.ls b/tools/test/h5ls/expected/tudlink-1.ls similarity index 100% rename from tools/testfiles/tudlink-1.ls rename to tools/test/h5ls/expected/tudlink-1.ls diff --git a/tools/testfiles/tvldtypes1.ls b/tools/test/h5ls/expected/tvldtypes1.ls similarity index 100% rename from tools/testfiles/tvldtypes1.ls rename to tools/test/h5ls/expected/tvldtypes1.ls diff --git a/tools/testfiles/tvldtypes2be.ls b/tools/test/h5ls/expected/tvldtypes2be.ls similarity index 100% rename from tools/testfiles/tvldtypes2be.ls rename to tools/test/h5ls/expected/tvldtypes2be.ls diff --git a/tools/testfiles/tvldtypes2le.ls b/tools/test/h5ls/expected/tvldtypes2le.ls similarity index 100% rename from tools/testfiles/tvldtypes2le.ls rename to tools/test/h5ls/expected/tvldtypes2le.ls diff --git a/tools/testfiles/vds/tvds-1.ls b/tools/test/h5ls/expected/vds/tvds-1.ls similarity index 100% rename from tools/testfiles/vds/tvds-1.ls rename to tools/test/h5ls/expected/vds/tvds-1.ls diff --git a/tools/testfiles/vds/tvds-2.ls b/tools/test/h5ls/expected/vds/tvds-2.ls similarity index 100% rename from tools/testfiles/vds/tvds-2.ls rename to tools/test/h5ls/expected/vds/tvds-2.ls diff --git a/tools/testfiles/vds/tvds-3_1.ls b/tools/test/h5ls/expected/vds/tvds-3_1.ls similarity index 100% rename from tools/testfiles/vds/tvds-3_1.ls rename to tools/test/h5ls/expected/vds/tvds-3_1.ls diff --git a/tools/testfiles/vds/tvds-3_2.ls b/tools/test/h5ls/expected/vds/tvds-3_2.ls similarity index 100% rename from tools/testfiles/vds/tvds-3_2.ls rename to tools/test/h5ls/expected/vds/tvds-3_2.ls diff --git a/tools/testfiles/vds/tvds-4.ls b/tools/test/h5ls/expected/vds/tvds-4.ls similarity index 100% rename from tools/testfiles/vds/tvds-4.ls rename to tools/test/h5ls/expected/vds/tvds-4.ls diff --git a/tools/testfiles/vds/tvds-5.ls b/tools/test/h5ls/expected/vds/tvds-5.ls similarity index 100% rename from tools/testfiles/vds/tvds-5.ls rename to tools/test/h5ls/expected/vds/tvds-5.ls diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in index 02e0cf7c499..3408876e0b0 100644 --- a/tools/test/h5ls/h5ls_plugin.sh.in +++ b/tools/test/h5ls/h5ls_plugin.sh.in @@ -45,8 +45,9 @@ AWK='awk' SRC_TOOLS="$srcdir/../.." # testfiles source dirs for tools -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" +SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected" TESTDIR=./testplug test -d $TESTDIR || mkdir $TESTDIR @@ -61,8 +62,8 @@ test -d $TESTDIR || mkdir $TESTDIR # Comment '#' without space can be used. # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES=" -$SRC_TOOLS_TESTFILES/tudfilter.h5 -$SRC_TOOLS_TESTFILES/tudfilter.ls +$SRC_H5DUMP_TESTFILES/tudfilter.h5 +$SRC_H5LS_OUTFILES/tudfilter.ls " # RUNSERIAL is used. Check if it can return exit code from executable correctly. diff --git a/tools/testfiles/tdset_idx.h5 b/tools/test/h5ls/testfiles/tdset_idx.h5 similarity index 100% rename from tools/testfiles/tdset_idx.h5 rename to tools/test/h5ls/testfiles/tdset_idx.h5 diff --git a/tools/test/h5ls/testh5ls.sh.in b/tools/test/h5ls/testh5ls.sh.in index 9b0e5cb85bf..fc6daab00ac 100644 --- a/tools/test/h5ls/testh5ls.sh.in +++ b/tools/test/h5ls/testh5ls.sh.in @@ -41,11 +41,10 @@ h5haveexitcode=yes # default is yes # 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" @@ -53,6 +52,7 @@ SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" SRC_H5LS_ERRFILES="$SRC_TOOLS/test/h5ls/errfiles" +SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -67,29 +67,29 @@ test -d $TESTDIR || mkdir $TESTDIR # Comment '#' without space can be used. # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES=" -$SRC_H5LS_TESTFILES/tall.h5 -$SRC_H5LS_TESTFILES/tarray1.h5 -$SRC_H5LS_TESTFILES/tattr2.h5 -$SRC_H5LS_TESTFILES/tattrreg.h5 -$SRC_H5LS_TESTFILES/tcompound.h5 -$SRC_H5LS_TESTFILES/tdatareg.h5 -$SRC_H5LS_TESTFILES/tdset.h5 -$SRC_H5LS_TESTFILES/tempty.h5 -$SRC_H5LS_TESTFILES/textlink.h5 -$SRC_H5LS_TESTFILES/textlinksrc.h5 -$SRC_H5LS_TESTFILES/textlinktar.h5 -$SRC_H5LS_TESTFILES/tgroup.h5 -$SRC_H5LS_TESTFILES/tgrp_comments.h5 -$SRC_H5LS_TESTFILES/tgrpnullspace.h5 -$SRC_H5LS_TESTFILES/thlink.h5 -$SRC_H5LS_TESTFILES/tloop.h5 -$SRC_H5LS_TESTFILES/tnestedcomp.h5 -$SRC_H5LS_TESTFILES/tsaf.h5 -$SRC_H5LS_TESTFILES/tslink.h5 -$SRC_H5LS_TESTFILES/tsoftlinks.h5 -$SRC_H5LS_TESTFILES/tstr.h5 -$SRC_H5LS_TESTFILES/tudlink.h5 -$SRC_H5LS_TESTFILES/tvldtypes1.h5 +$SRC_H5DUMP_TESTFILES/tall.h5 +$SRC_H5DUMP_TESTFILES/tarray1.h5 +$SRC_H5DUMP_TESTFILES/tattr2.h5 +$SRC_H5DUMP_TESTFILES/tattrreg.h5 +$SRC_H5DUMP_TESTFILES/tcompound.h5 +$SRC_H5DUMP_TESTFILES/tdatareg.h5 +$SRC_H5DUMP_TESTFILES/tdset.h5 +$SRC_H5DUMP_TESTFILES/tempty.h5 +$SRC_H5DUMP_TESTFILES/textlink.h5 +$SRC_H5DUMP_TESTFILES/textlinksrc.h5 +$SRC_H5DUMP_TESTFILES/textlinktar.h5 +$SRC_H5DUMP_TESTFILES/tgroup.h5 +$SRC_H5DUMP_TESTFILES/tgrp_comments.h5 +$SRC_H5DUMP_TESTFILES/tgrpnullspace.h5 +$SRC_H5DUMP_TESTFILES/thlink.h5 +$SRC_H5DUMP_TESTFILES/tloop.h5 +$SRC_H5DUMP_TESTFILES/tnestedcomp.h5 +$SRC_H5DUMP_TESTFILES/tsaf.h5 +$SRC_H5DUMP_TESTFILES/tslink.h5 +$SRC_H5DUMP_TESTFILES/tsoftlinks.h5 +$SRC_H5DUMP_TESTFILES/tstr.h5 +$SRC_H5DUMP_TESTFILES/tudlink.h5 +$SRC_H5DUMP_TESTFILES/tvldtypes1.h5 $SRC_H5LS_TESTFILES/tdset_idx.h5 " @@ -100,64 +100,64 @@ $SRC_H5LS_ERRFILES/tgroup-1.err " LIST_OTHER_TEST_FILES=" -$SRC_H5LS_TESTFILES/help-1.ls -$SRC_H5LS_TESTFILES/help-2.ls -$SRC_H5LS_TESTFILES/help-3.ls -$SRC_H5LS_TESTFILES/nosuchfile.ls -$SRC_H5LS_TESTFILES/tall-1.ls -$SRC_H5LS_TESTFILES/tall-2.ls -$SRC_H5LS_TESTFILES/tarray1.ls -$SRC_H5LS_TESTFILES/tattr2.ls -$SRC_H5LS_TESTFILES/tattrreg_le.ls -$SRC_H5LS_TESTFILES/tattrreg_be.ls -$SRC_H5LS_TESTFILES/tcomp-1.ls -$SRC_H5LS_TESTFILES/tdataregbe.ls -$SRC_H5LS_TESTFILES/tdataregle.ls -$SRC_H5LS_TESTFILES/tdset-1.ls -$SRC_H5LS_TESTFILES/tempty.ls -$SRC_H5LS_TESTFILES/textlink-1.ls -$SRC_H5LS_TESTFILES/textlinksrc-1.ls -$SRC_H5LS_TESTFILES/textlinksrc-2.ls -$SRC_H5LS_TESTFILES/textlinksrc-3.ls -$SRC_H5LS_TESTFILES/textlinksrc-4.ls -$SRC_H5LS_TESTFILES/textlinksrc-5.ls -$SRC_H5LS_TESTFILES/textlinksrc-6.ls -$SRC_H5LS_TESTFILES/textlinksrc-7.ls -$SRC_H5LS_TESTFILES/textlinksrc-1-old.ls -$SRC_H5LS_TESTFILES/textlinksrc-2-old.ls -$SRC_H5LS_TESTFILES/textlinksrc-3-old.ls -$SRC_H5LS_TESTFILES/textlinksrc-6-old.ls -$SRC_H5LS_TESTFILES/textlinksrc-7-old.ls -$SRC_H5LS_TESTFILES/tsoftlinks-1.ls -$SRC_H5LS_TESTFILES/tsoftlinks-2.ls -$SRC_H5LS_TESTFILES/tsoftlinks-3.ls -$SRC_H5LS_TESTFILES/tsoftlinks-4.ls -$SRC_H5LS_TESTFILES/tsoftlinks-5.ls -$SRC_H5LS_TESTFILES/textlinksrc-nodangle-1.ls -$SRC_H5LS_TESTFILES/textlinksrc-nodangle-2.ls -$SRC_H5LS_TESTFILES/tgrp_comments.ls -$SRC_H5LS_TESTFILES/tsoftlinks-nodangle-1.ls -$SRC_H5LS_TESTFILES/thlinks-nodangle-1.ls -$SRC_H5LS_TESTFILES/tgroup.ls -$SRC_H5LS_TESTFILES/tgroup-1.ls -$SRC_H5LS_TESTFILES/tgroup-2.ls -$SRC_H5LS_TESTFILES/tgroup-3.ls -$SRC_H5LS_TESTFILES/tgrpnullspace.ls -$SRC_H5LS_TESTFILES/thlink-1.ls -$SRC_H5LS_TESTFILES/tloop-1.ls -$SRC_H5LS_TESTFILES/tmultifile.ls -$SRC_H5LS_TESTFILES/tnestcomp-1.ls -$SRC_H5LS_TESTFILES/tnestcomp-2.ls -$SRC_H5LS_TESTFILES/tnestcomp-3.ls -$SRC_H5LS_TESTFILES/tnestcomp-4.ls -$SRC_H5LS_TESTFILES/tsaf.ls -$SRC_H5LS_TESTFILES/tslink-1.ls -$SRC_H5LS_TESTFILES/tstr-1.ls -$SRC_H5LS_TESTFILES/tudlink-1.ls -$SRC_H5LS_TESTFILES/tvldtypes1.ls -$SRC_H5LS_TESTFILES/tvldtypes2le.ls -$SRC_H5LS_TESTFILES/tvldtypes2be.ls -$SRC_H5LS_TESTFILES/tdset_idx.ls +$SRC_H5LS_OUTFILES/help-1.ls +$SRC_H5LS_OUTFILES/help-2.ls +$SRC_H5LS_OUTFILES/help-3.ls +$SRC_H5LS_OUTFILES/nosuchfile.ls +$SRC_H5LS_OUTFILES/tall-1.ls +$SRC_H5LS_OUTFILES/tall-2.ls +$SRC_H5LS_OUTFILES/tarray1.ls +$SRC_H5LS_OUTFILES/tattr2.ls +$SRC_H5LS_OUTFILES/tattrreg_le.ls +$SRC_H5LS_OUTFILES/tattrreg_be.ls +$SRC_H5LS_OUTFILES/tcomp-1.ls +$SRC_H5LS_OUTFILES/tdataregbe.ls +$SRC_H5LS_OUTFILES/tdataregle.ls +$SRC_H5LS_OUTFILES/tdset-1.ls +$SRC_H5LS_OUTFILES/tempty.ls +$SRC_H5LS_OUTFILES/textlink-1.ls +$SRC_H5LS_OUTFILES/textlinksrc-1.ls +$SRC_H5LS_OUTFILES/textlinksrc-2.ls +$SRC_H5LS_OUTFILES/textlinksrc-3.ls +$SRC_H5LS_OUTFILES/textlinksrc-4.ls +$SRC_H5LS_OUTFILES/textlinksrc-5.ls +$SRC_H5LS_OUTFILES/textlinksrc-6.ls +$SRC_H5LS_OUTFILES/textlinksrc-7.ls +$SRC_H5LS_OUTFILES/textlinksrc-1-old.ls +$SRC_H5LS_OUTFILES/textlinksrc-2-old.ls +$SRC_H5LS_OUTFILES/textlinksrc-3-old.ls +$SRC_H5LS_OUTFILES/textlinksrc-6-old.ls +$SRC_H5LS_OUTFILES/textlinksrc-7-old.ls +$SRC_H5LS_OUTFILES/tsoftlinks-1.ls +$SRC_H5LS_OUTFILES/tsoftlinks-2.ls +$SRC_H5LS_OUTFILES/tsoftlinks-3.ls +$SRC_H5LS_OUTFILES/tsoftlinks-4.ls +$SRC_H5LS_OUTFILES/tsoftlinks-5.ls +$SRC_H5LS_OUTFILES/textlinksrc-nodangle-1.ls +$SRC_H5LS_OUTFILES/textlinksrc-nodangle-2.ls +$SRC_H5LS_OUTFILES/tgrp_comments.ls +$SRC_H5LS_OUTFILES/tsoftlinks-nodangle-1.ls +$SRC_H5LS_OUTFILES/thlinks-nodangle-1.ls +$SRC_H5LS_OUTFILES/tgroup.ls +$SRC_H5LS_OUTFILES/tgroup-1.ls +$SRC_H5LS_OUTFILES/tgroup-2.ls +$SRC_H5LS_OUTFILES/tgroup-3.ls +$SRC_H5LS_OUTFILES/tgrpnullspace.ls +$SRC_H5LS_OUTFILES/thlink-1.ls +$SRC_H5LS_OUTFILES/tloop-1.ls +$SRC_H5LS_OUTFILES/tmultifile.ls +$SRC_H5LS_OUTFILES/tnestcomp-1.ls +$SRC_H5LS_OUTFILES/tnestcomp-2.ls +$SRC_H5LS_OUTFILES/tnestcomp-3.ls +$SRC_H5LS_OUTFILES/tnestcomp-4.ls +$SRC_H5LS_OUTFILES/tsaf.ls +$SRC_H5LS_OUTFILES/tslink-1.ls +$SRC_H5LS_OUTFILES/tstr-1.ls +$SRC_H5LS_OUTFILES/tudlink-1.ls +$SRC_H5LS_OUTFILES/tvldtypes1.ls +$SRC_H5LS_OUTFILES/tvldtypes2le.ls +$SRC_H5LS_OUTFILES/tvldtypes2be.ls +$SRC_H5LS_OUTFILES/tdset_idx.ls " diff --git a/tools/test/h5ls/testh5lsvds.sh.in b/tools/test/h5ls/testh5lsvds.sh.in index beba73fe187..2408ee29466 100644 --- a/tools/test/h5ls/testh5lsvds.sh.in +++ b/tools/test/h5ls/testh5lsvds.sh.in @@ -38,17 +38,17 @@ h5haveexitcode=yes # default is yes # 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" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected" TEST_P_DIR=./testfiles TESTDIR=./testfiles/vds @@ -65,38 +65,38 @@ test -d $TESTDIR || mkdir $TESTDIR # Comment '#' without space can be used. # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES=" -$SRC_H5LS_TESTFILES/vds/1_a.h5 -$SRC_H5LS_TESTFILES/vds/1_b.h5 -$SRC_H5LS_TESTFILES/vds/1_c.h5 -$SRC_H5LS_TESTFILES/vds/1_d.h5 -$SRC_H5LS_TESTFILES/vds/1_e.h5 -$SRC_H5LS_TESTFILES/vds/1_f.h5 -$SRC_H5LS_TESTFILES/vds/1_vds.h5 -$SRC_H5LS_TESTFILES/vds/2_a.h5 -$SRC_H5LS_TESTFILES/vds/2_b.h5 -$SRC_H5LS_TESTFILES/vds/2_c.h5 -$SRC_H5LS_TESTFILES/vds/2_d.h5 -$SRC_H5LS_TESTFILES/vds/2_e.h5 -$SRC_H5LS_TESTFILES/vds/2_vds.h5 -$SRC_H5LS_TESTFILES/vds/3_1_vds.h5 -$SRC_H5LS_TESTFILES/vds/3_2_vds.h5 -$SRC_H5LS_TESTFILES/vds/4_0.h5 -$SRC_H5LS_TESTFILES/vds/4_1.h5 -$SRC_H5LS_TESTFILES/vds/4_2.h5 -$SRC_H5LS_TESTFILES/vds/4_vds.h5 -$SRC_H5LS_TESTFILES/vds/5_a.h5 -$SRC_H5LS_TESTFILES/vds/5_b.h5 -$SRC_H5LS_TESTFILES/vds/5_c.h5 -$SRC_H5LS_TESTFILES/vds/5_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/1_a.h5 +$SRC_H5DUMP_TESTFILES/vds/1_b.h5 +$SRC_H5DUMP_TESTFILES/vds/1_c.h5 +$SRC_H5DUMP_TESTFILES/vds/1_d.h5 +$SRC_H5DUMP_TESTFILES/vds/1_e.h5 +$SRC_H5DUMP_TESTFILES/vds/1_f.h5 +$SRC_H5DUMP_TESTFILES/vds/1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/2_a.h5 +$SRC_H5DUMP_TESTFILES/vds/2_b.h5 +$SRC_H5DUMP_TESTFILES/vds/2_c.h5 +$SRC_H5DUMP_TESTFILES/vds/2_d.h5 +$SRC_H5DUMP_TESTFILES/vds/2_e.h5 +$SRC_H5DUMP_TESTFILES/vds/2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/4_0.h5 +$SRC_H5DUMP_TESTFILES/vds/4_1.h5 +$SRC_H5DUMP_TESTFILES/vds/4_2.h5 +$SRC_H5DUMP_TESTFILES/vds/4_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/5_a.h5 +$SRC_H5DUMP_TESTFILES/vds/5_b.h5 +$SRC_H5DUMP_TESTFILES/vds/5_c.h5 +$SRC_H5DUMP_TESTFILES/vds/5_vds.h5 " LIST_OTHER_TEST_FILES=" -$SRC_H5LS_TESTFILES/vds/tvds-1.ls -$SRC_H5LS_TESTFILES/vds/tvds-2.ls -$SRC_H5LS_TESTFILES/vds/tvds-3_1.ls -$SRC_H5LS_TESTFILES/vds/tvds-3_2.ls -$SRC_H5LS_TESTFILES/vds/tvds-4.ls -$SRC_H5LS_TESTFILES/vds/tvds-5.ls +$SRC_H5LS_OUTFILES/vds/tvds-1.ls +$SRC_H5LS_OUTFILES/vds/tvds-2.ls +$SRC_H5LS_OUTFILES/vds/tvds-3_1.ls +$SRC_H5LS_OUTFILES/vds/tvds-3_2.ls +$SRC_H5LS_OUTFILES/vds/tvds-4.ls +$SRC_H5LS_OUTFILES/vds/tvds-5.ls " diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake index bd2cb9b9f05..5c412545af2 100644 --- a/tools/test/h5repack/CMakeTests.cmake +++ b/tools/test/h5repack/CMakeTests.cmake @@ -19,203 +19,224 @@ # -------------------------------------------------------------------- # Copy all the HDF5 files from the source directory into the test directory # -------------------------------------------------------------------- - set (LIST_HDF5_TEST_FILES - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/bounds_latest_latest.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_attr.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_attr_refs.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_deflate.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_early.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_ext.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le_ex-0.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le_ex.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fill.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fletcher.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_hlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex-0.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex-1.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d_ex-0.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d_ex.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d_ex-0.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d_ex.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layouto.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout2.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout3.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_named_dtypes.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum_deflated.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_CVE-2018-17432.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_CVE-2018-14460.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nbit.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_objs.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_refs.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_shuffle.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_soffset.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_szip.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-0.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-1.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-2.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-3.dat - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex.h5 + set (LIST_REPACK_TEST_FILES + bounds_latest_latest.h5 + h5repack_attr.h5 + h5repack_attr_refs.h5 + h5repack_deflate.h5 + h5repack_early.h5 + h5repack_ext.h5 + h5repack_f32le.h5 + h5repack_f32le_ex-0.dat + h5repack_f32le_ex.h5 + h5repack_fill.h5 + h5repack_filters.h5 + h5repack_fletcher.h5 + h5repack_hlink.h5 + h5repack_int32le_1d.h5 + h5repack_int32le_1d_ex-0.dat + h5repack_int32le_1d_ex-1.dat + h5repack_int32le_1d_ex.h5 + h5repack_int32le_2d.h5 + h5repack_int32le_2d_ex-0.dat + h5repack_int32le_2d_ex.h5 + h5repack_int32le_3d.h5 + h5repack_int32le_3d_ex-0.dat + h5repack_int32le_3d_ex.h5 + h5repack_layout.h5 + h5repack_layouto.h5 + h5repack_layout2.h5 + h5repack_layout3.h5 + h5repack_layout.UD.h5 + h5repack_named_dtypes.h5 + h5repack_nested_8bit_enum.h5 + h5repack_nested_8bit_enum_deflated.h5 + h5repack_CVE-2018-17432.h5 + h5repack_CVE-2018-14460.h5 + h5repack_nbit.h5 + h5repack_objs.h5 + h5repack_refs.h5 + h5repack_shuffle.h5 + h5repack_soffset.h5 + h5repack_szip.h5 + h5repack_uint8be.h5 + h5repack_uint8be_ex-0.dat + h5repack_uint8be_ex-1.dat + h5repack_uint8be_ex-2.dat + h5repack_uint8be_ex-3.dat + h5repack_uint8be_ex.h5 # fsm - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_aggr.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fsm_aggr_nopersist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fsm_aggr_persist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_none.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_paged_nopersist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_paged_persist.h5 - # h5diff/testfile - ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5 + h5repack_aggr.h5 + h5repack_fsm_aggr_nopersist.h5 + h5repack_fsm_aggr_persist.h5 + h5repack_none.h5 + h5repack_paged_nopersist.h5 + h5repack_paged_persist.h5 + ) + # h5diff/testfile + set (LIST_DIFF_TEST_FILES + h5diff_attr1.h5 + ) + # tools/testfiles/vds + set (LIST_VDS_TEST_FILES + 1_a.h5 + 1_b.h5 + 1_c.h5 + 1_d.h5 + 1_e.h5 + 1_f.h5 + 1_vds.h5 + 2_a.h5 + 2_b.h5 + 2_c.h5 + 2_d.h5 + 2_e.h5 + 2_vds.h5 + 3_1_vds.h5 + 3_2_vds.h5 + 4_0.h5 + 4_1.h5 + 4_2.h5 + 4_vds.h5 + 5_a.h5 + 5_b.h5 + 5_c.h5 + 5_vds.h5 + ) + set (LIST_COPY_TEST_FILES + h5copy_extlinks_src.h5 + h5copy_extlinks_trg.h5 + ) + set (LIST_HDF5_TEST_FILES # tools/testfiles for external links - ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5 - ${HDF5_TOOLS_DIR}/testfiles/textlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_trg.h5 + tsoftlinks.h5 + textlinkfar.h5 + textlinksrc.h5 + textlinktar.h5 + textlink.h5 # tools/testfiles - ${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5 - ${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5 - ${HDF5_TOOLS_DIR}/testfiles/tordergr.h5 + tfamily00000.h5 + tfamily00001.h5 + tfamily00002.h5 + tfamily00003.h5 + tfamily00004.h5 + tfamily00005.h5 + tfamily00006.h5 + tfamily00007.h5 + tfamily00008.h5 + tfamily00009.h5 + tfamily00010.h5 + tordergr.h5 # reference conversion files - ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5 - ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5 - # tools/testfiles/vds - ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5 - ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5 + tattrreg.h5 + tdatareg.h5 # tools/testfiles onion VFD files - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5.onion - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5.onion - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5 - ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5.onion + tst_onion_dset_1d.h5 + tst_onion_dset_1d.h5.onion + tst_onion_dset_ext.h5 + tst_onion_dset_ext.h5.onion + tst_onion_objs.h5 + tst_onion_objs.h5.onion ) set (LIST_OTHER_TEST_FILES - h5repack-help.txt h5repack_ext.bin h5repack.info ublock.bin ) set (LIST_TST_TEST_FILES - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5-gzip_verbose_filters - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_test.h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_version_test.h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_zero.h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_none.h5repack_layout.UD.h5 + h5repack-help.txt + h5repack_filters.h5-gzip_verbose_filters.tst + h5repack_layout.h5-dset2_chunk_20x10-errstk.tst + plugin_test.h5repack_layout.h5.tst + plugin_version_test.h5repack_layout.h5.tst + plugin_zero.h5repack_layout.h5.tst + plugin_none.h5repack_layout.UD.h5.tst # tools/testfiles for external links - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-merge.tsoftlinks.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-merge.textlinkfar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-merge.textlinksrc.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-merge.textlinktar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-merge.textlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5 + tsoftlinks-merge.tsoftlinks.h5.tst + textlinkfar-merge.textlinkfar.h5.tst + textlinksrc-merge.textlinksrc.h5.tst + textlinktar-merge.textlinktar.h5.tst + textlink-merge.textlink.h5.tst + h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst ) set (LIST_DDL_TEST_FILES - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/crtorder.tordergr.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/deflate_limit.h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_test - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_version_test - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_zero - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5-plugin_none + crtorder.tordergr.h5.ddl + deflate_limit.h5repack_layout.h5.ddl + h5repack_layout.h5.ddl + h5repack_layout.h5-plugin_test.ddl + h5repack_layout.h5-plugin_version_test.ddl + h5repack_layout.h5-plugin_zero.ddl + h5repack_layout.UD.h5-plugin_none.ddl # fsm - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/STG.h5repack_none.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SPT.h5repack_aggr.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SP.h5repack_fsm_aggr_nopersist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/S.h5repack_fsm_aggr_persist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/GS.h5repack_paged_nopersist.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SP.h5repack_paged_persist.h5 + STG.h5repack_none.h5.ddl + SPT.h5repack_aggr.h5.ddl + SP.h5repack_fsm_aggr_nopersist.h5.ddl + S.h5repack_fsm_aggr_persist.h5.ddl + GS.h5repack_paged_nopersist.h5.ddl + SP.h5repack_paged_persist.h5.ddl # vds - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/2_vds.h5-vds_chunk3x6x9-v - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/3_1_vds.h5-vds_chunk2x5x8-v - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_compa-v - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_conti-v + 1_vds.h5-vds_dset_chunk20x10x5-v.ddl + 2_vds.h5-vds_chunk3x6x9-v.ddl + 3_1_vds.h5-vds_chunk2x5x8-v.ddl + 4_vds.h5-vds_compa-v.ddl + 4_vds.h5-vds_conti-v.ddl # refs - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/attrregion.tattrreg.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/dataregion.tdatareg.h5 + attrregion.tattrreg.h5.ddl + dataregion.tdatareg.h5.ddl # tools/testfiles for external links - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-base.textlinkfar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-base.textlinksrc.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-base.textlinktar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-base.textlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-base.tsoftlinks.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-prune.textlinkfar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-prune.textlinksrc.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-prune.textlinktar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-prune.textlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-prune.tsoftlinks.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-mergeprune.textlinkfar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-mergeprune.textlinksrc.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-mergeprune.textlinktar.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-mergeprune.textlink.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5 - ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5 + textlinkfar-base.textlinkfar.h5.ddl + textlinksrc-base.textlinksrc.h5.ddl + textlinktar-base.textlinktar.h5.ddl + textlink-base.textlink.h5.ddl + tsoftlinks-base.tsoftlinks.h5.ddl + h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl + textlinkfar-prune.textlinkfar.h5.ddl + textlinksrc-prune.textlinksrc.h5.ddl + textlinktar-prune.textlinktar.h5.ddl + textlink-prune.textlink.h5.ddl + tsoftlinks-prune.tsoftlinks.h5.ddl + h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl + textlinkfar-mergeprune.textlinkfar.h5.ddl + textlinksrc-mergeprune.textlinksrc.h5.ddl + textlinktar-mergeprune.textlinktar.h5.ddl + textlink-mergeprune.textlink.h5.ddl + tsoftlinks-mergeprune.tsoftlinks.h5.ddl + h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl ) + foreach (h5_file ${LIST_REPACK_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") + endforeach () + + foreach (h5_file ${LIST_COPY_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5copy/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") + endforeach () + + foreach (h5_file ${LIST_DIFF_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5diff/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") + endforeach () + + foreach (h5_file ${LIST_VDS_TEST_FILES}) + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") + endforeach () + foreach (h5_file ${LIST_HDF5_TEST_FILES}) - get_filename_component(fname "${h5_file}" NAME) - HDFTEST_COPY_FILE("${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5repack_files") + HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") endforeach () foreach (h5_file ${LIST_OTHER_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") endforeach () foreach (h5_file ${LIST_TST_TEST_FILES}) - get_filename_component(fname "${h5_file}" NAME) - HDFTEST_COPY_FILE("${h5_file}.tst" "${PROJECT_BINARY_DIR}/testfiles/${fname}.tst" "h5repack_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") endforeach () foreach (h5_file ${LIST_DDL_TEST_FILES}) - get_filename_component(fname "${h5_file}" NAME) - HDFTEST_COPY_FILE("${h5_file}.ddl" "${PROJECT_BINARY_DIR}/testfiles/${fname}.ddl" "h5repack_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files") endforeach () add_custom_target(h5repack_files ALL COMMENT "Copying files needed by h5repack tests" DEPENDS ${h5repack_files_list}) diff --git a/tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl b/tools/test/h5repack/expected/1_vds.h5-vds_dset_chunk20x10x5-v.ddl similarity index 100% rename from tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl rename to tools/test/h5repack/expected/1_vds.h5-vds_dset_chunk20x10x5-v.ddl diff --git a/tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl b/tools/test/h5repack/expected/2_vds.h5-vds_chunk3x6x9-v.ddl similarity index 100% rename from tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl rename to tools/test/h5repack/expected/2_vds.h5-vds_chunk3x6x9-v.ddl diff --git a/tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl b/tools/test/h5repack/expected/3_1_vds.h5-vds_chunk2x5x8-v.ddl similarity index 100% rename from tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl rename to tools/test/h5repack/expected/3_1_vds.h5-vds_chunk2x5x8-v.ddl diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl b/tools/test/h5repack/expected/4_vds.h5-vds_compa-v.ddl similarity index 100% rename from tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl rename to tools/test/h5repack/expected/4_vds.h5-vds_compa-v.ddl diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl b/tools/test/h5repack/expected/4_vds.h5-vds_conti-v.ddl similarity index 100% rename from tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl rename to tools/test/h5repack/expected/4_vds.h5-vds_conti-v.ddl diff --git a/tools/test/h5repack/testfiles/GS.h5repack_paged_nopersist.h5.ddl b/tools/test/h5repack/expected/GS.h5repack_paged_nopersist.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/GS.h5repack_paged_nopersist.h5.ddl rename to tools/test/h5repack/expected/GS.h5repack_paged_nopersist.h5.ddl diff --git a/tools/test/h5repack/testfiles/S.h5repack_fsm_aggr_persist.h5.ddl b/tools/test/h5repack/expected/S.h5repack_fsm_aggr_persist.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/S.h5repack_fsm_aggr_persist.h5.ddl rename to tools/test/h5repack/expected/S.h5repack_fsm_aggr_persist.h5.ddl diff --git a/tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl b/tools/test/h5repack/expected/SP.h5repack_fsm_aggr_nopersist.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl rename to tools/test/h5repack/expected/SP.h5repack_fsm_aggr_nopersist.h5.ddl diff --git a/tools/test/h5repack/testfiles/SP.h5repack_paged_persist.h5.ddl b/tools/test/h5repack/expected/SP.h5repack_paged_persist.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/SP.h5repack_paged_persist.h5.ddl rename to tools/test/h5repack/expected/SP.h5repack_paged_persist.h5.ddl diff --git a/tools/test/h5repack/testfiles/SPT.h5repack_aggr.h5.ddl b/tools/test/h5repack/expected/SPT.h5repack_aggr.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/SPT.h5repack_aggr.h5.ddl rename to tools/test/h5repack/expected/SPT.h5repack_aggr.h5.ddl diff --git a/tools/test/h5repack/testfiles/STG.h5repack_none.h5.ddl b/tools/test/h5repack/expected/STG.h5repack_none.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/STG.h5repack_none.h5.ddl rename to tools/test/h5repack/expected/STG.h5repack_none.h5.ddl diff --git a/tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl b/tools/test/h5repack/expected/attrregion.tattrreg.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl rename to tools/test/h5repack/expected/attrregion.tattrreg.h5.ddl diff --git a/tools/test/h5repack/testfiles/crtorder.tordergr.h5.ddl b/tools/test/h5repack/expected/crtorder.tordergr.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/crtorder.tordergr.h5.ddl rename to tools/test/h5repack/expected/crtorder.tordergr.h5.ddl diff --git a/tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl b/tools/test/h5repack/expected/dataregion.tdatareg.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl rename to tools/test/h5repack/expected/dataregion.tdatareg.h5.ddl diff --git a/tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl b/tools/test/h5repack/expected/deflate_limit.h5repack_layout.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl rename to tools/test/h5repack/expected/deflate_limit.h5repack_layout.h5.ddl diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl rename to tools/test/h5repack/expected/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst b/tools/test/h5repack/expected/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst rename to tools/test/h5repack/expected/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl rename to tools/test/h5repack/expected/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl rename to tools/test/h5repack/expected/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl diff --git a/tools/test/h5repack/testfiles/h5repack-help.txt b/tools/test/h5repack/expected/h5repack-help.txt similarity index 100% rename from tools/test/h5repack/testfiles/h5repack-help.txt rename to tools/test/h5repack/expected/h5repack-help.txt diff --git a/tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst b/tools/test/h5repack/expected/h5repack_filters.h5-gzip_verbose_filters.tst similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst rename to tools/test/h5repack/expected/h5repack_filters.h5-gzip_verbose_filters.tst diff --git a/tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl b/tools/test/h5repack/expected/h5repack_layout.UD.h5-plugin_none.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl rename to tools/test/h5repack/expected/h5repack_layout.UD.h5-plugin_none.ddl diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/expected/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst rename to tools/test/h5repack/expected/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_test.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl rename to tools/test/h5repack/expected/h5repack_layout.h5-plugin_test.ddl diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl rename to tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_zero.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl rename to tools/test/h5repack/expected/h5repack_layout.h5-plugin_zero.ddl diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5.ddl b/tools/test/h5repack/expected/h5repack_layout.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/h5repack_layout.h5.ddl rename to tools/test/h5repack/expected/h5repack_layout.h5.ddl diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_dset_1d.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_dset_1d.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/onion.tst_onion_dset_1d.h5.ddl rename to tools/test/h5repack/expected/onion.tst_onion_dset_1d.h5.ddl diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_dset_ext.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_dset_ext.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/onion.tst_onion_dset_ext.h5.ddl rename to tools/test/h5repack/expected/onion.tst_onion_dset_ext.h5.ddl diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_objs.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_objs.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/onion.tst_onion_objs.h5.ddl rename to tools/test/h5repack/expected/onion.tst_onion_objs.h5.ddl diff --git a/tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst b/tools/test/h5repack/expected/plugin_none.h5repack_layout.UD.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst rename to tools/test/h5repack/expected/plugin_none.h5repack_layout.UD.h5.tst diff --git a/tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_test.h5repack_layout.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst rename to tools/test/h5repack/expected/plugin_test.h5repack_layout.h5.tst diff --git a/tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_version_test.h5repack_layout.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst rename to tools/test/h5repack/expected/plugin_version_test.h5repack_layout.h5.tst diff --git a/tools/test/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_zero.h5repack_layout.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst rename to tools/test/h5repack/expected/plugin_zero.h5repack_layout.h5.tst diff --git a/tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-base.textlink.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl rename to tools/test/h5repack/expected/textlink-base.textlink.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst b/tools/test/h5repack/expected/textlink-merge.textlink.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst rename to tools/test/h5repack/expected/textlink-merge.textlink.h5.tst diff --git a/tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-mergeprune.textlink.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl rename to tools/test/h5repack/expected/textlink-mergeprune.textlink.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-prune.textlink.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl rename to tools/test/h5repack/expected/textlink-prune.textlink.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-base.textlinkfar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl rename to tools/test/h5repack/expected/textlinkfar-base.textlinkfar.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst b/tools/test/h5repack/expected/textlinkfar-merge.textlinkfar.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst rename to tools/test/h5repack/expected/textlinkfar-merge.textlinkfar.h5.tst diff --git a/tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-mergeprune.textlinkfar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl rename to tools/test/h5repack/expected/textlinkfar-mergeprune.textlinkfar.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-prune.textlinkfar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl rename to tools/test/h5repack/expected/textlinkfar-prune.textlinkfar.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-base.textlinksrc.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl rename to tools/test/h5repack/expected/textlinksrc-base.textlinksrc.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst b/tools/test/h5repack/expected/textlinksrc-merge.textlinksrc.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst rename to tools/test/h5repack/expected/textlinksrc-merge.textlinksrc.h5.tst diff --git a/tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-mergeprune.textlinksrc.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl rename to tools/test/h5repack/expected/textlinksrc-mergeprune.textlinksrc.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-prune.textlinksrc.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl rename to tools/test/h5repack/expected/textlinksrc-prune.textlinksrc.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-base.textlinktar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl rename to tools/test/h5repack/expected/textlinktar-base.textlinktar.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst b/tools/test/h5repack/expected/textlinktar-merge.textlinktar.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst rename to tools/test/h5repack/expected/textlinktar-merge.textlinktar.h5.tst diff --git a/tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-mergeprune.textlinktar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl rename to tools/test/h5repack/expected/textlinktar-mergeprune.textlinktar.h5.ddl diff --git a/tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-prune.textlinktar.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl rename to tools/test/h5repack/expected/textlinktar-prune.textlinktar.h5.ddl diff --git a/tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-base.tsoftlinks.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl rename to tools/test/h5repack/expected/tsoftlinks-base.tsoftlinks.h5.ddl diff --git a/tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst b/tools/test/h5repack/expected/tsoftlinks-merge.tsoftlinks.h5.tst similarity index 100% rename from tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst rename to tools/test/h5repack/expected/tsoftlinks-merge.tsoftlinks.h5.tst diff --git a/tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-mergeprune.tsoftlinks.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl rename to tools/test/h5repack/expected/tsoftlinks-mergeprune.tsoftlinks.h5.ddl diff --git a/tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-prune.tsoftlinks.h5.ddl similarity index 100% rename from tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl rename to tools/test/h5repack/expected/tsoftlinks-prune.tsoftlinks.h5.ddl diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in index 9b58965997f..f3b8d3eb9b9 100644 --- a/tools/test/h5repack/h5repack.sh.in +++ b/tools/test/h5repack/h5repack.sh.in @@ -56,17 +56,17 @@ verbose=yes # 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" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected" TESTDIR=./testpack test -d $TESTDIR || mkdir $TESTDIR @@ -127,62 +127,62 @@ $SRC_H5DIFF_TESTFILES/h5diff_attr1.h5 $SRC_H5REPACK_TESTFILES/h5repack_CVE-2018-17432.h5 $SRC_H5REPACK_TESTFILES/h5repack_CVE-2018-14460.h5 ########tools/testfiles#for#external#links######## -$SRC_TOOLS_TESTFILES/tsoftlinks.h5 -$SRC_TOOLS_TESTFILES/textlinkfar.h5 -$SRC_TOOLS_TESTFILES/textlinksrc.h5 -$SRC_TOOLS_TESTFILES/textlinktar.h5 -$SRC_TOOLS_TESTFILES/textlink.h5 -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src.h5 -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_trg.h5 +$SRC_H5DUMP_TESTFILES/tsoftlinks.h5 +$SRC_H5DUMP_TESTFILES/textlinkfar.h5 +$SRC_H5DUMP_TESTFILES/textlinksrc.h5 +$SRC_H5DUMP_TESTFILES/textlinktar.h5 +$SRC_H5DUMP_TESTFILES/textlink.h5 +$SRC_H5COPY_TESTFILES/h5copy_extlinks_src.h5 +$SRC_H5COPY_TESTFILES/h5copy_extlinks_trg.h5 ########tools/testfiles######## -$SRC_TOOLS_TESTFILES/tfamily00000.h5 -$SRC_TOOLS_TESTFILES/tfamily00001.h5 -$SRC_TOOLS_TESTFILES/tfamily00002.h5 -$SRC_TOOLS_TESTFILES/tfamily00003.h5 -$SRC_TOOLS_TESTFILES/tfamily00004.h5 -$SRC_TOOLS_TESTFILES/tfamily00005.h5 -$SRC_TOOLS_TESTFILES/tfamily00006.h5 -$SRC_TOOLS_TESTFILES/tfamily00007.h5 -$SRC_TOOLS_TESTFILES/tfamily00008.h5 -$SRC_TOOLS_TESTFILES/tfamily00009.h5 -$SRC_TOOLS_TESTFILES/tfamily00010.h5 -$SRC_TOOLS_TESTFILES/tordergr.h5 +$SRC_H5DUMP_TESTFILES/tfamily00000.h5 +$SRC_H5DUMP_TESTFILES/tfamily00001.h5 +$SRC_H5DUMP_TESTFILES/tfamily00002.h5 +$SRC_H5DUMP_TESTFILES/tfamily00003.h5 +$SRC_H5DUMP_TESTFILES/tfamily00004.h5 +$SRC_H5DUMP_TESTFILES/tfamily00005.h5 +$SRC_H5DUMP_TESTFILES/tfamily00006.h5 +$SRC_H5DUMP_TESTFILES/tfamily00007.h5 +$SRC_H5DUMP_TESTFILES/tfamily00008.h5 +$SRC_H5DUMP_TESTFILES/tfamily00009.h5 +$SRC_H5DUMP_TESTFILES/tfamily00010.h5 +$SRC_H5DUMP_TESTFILES/tordergr.h5 ########reference#conversion#files######## ########tools/testfiles/vds######## -$SRC_TOOLS_TESTFILES/vds/1_a.h5 -$SRC_TOOLS_TESTFILES/vds/1_b.h5 -$SRC_TOOLS_TESTFILES/vds/1_c.h5 -$SRC_TOOLS_TESTFILES/vds/1_d.h5 -$SRC_TOOLS_TESTFILES/vds/1_e.h5 -$SRC_TOOLS_TESTFILES/vds/1_f.h5 -$SRC_TOOLS_TESTFILES/vds/1_vds.h5 -$SRC_TOOLS_TESTFILES/vds/2_a.h5 -$SRC_TOOLS_TESTFILES/vds/2_b.h5 -$SRC_TOOLS_TESTFILES/vds/2_c.h5 -$SRC_TOOLS_TESTFILES/vds/2_d.h5 -$SRC_TOOLS_TESTFILES/vds/2_e.h5 -$SRC_TOOLS_TESTFILES/vds/2_vds.h5 -$SRC_TOOLS_TESTFILES/vds/3_1_vds.h5 -$SRC_TOOLS_TESTFILES/vds/3_2_vds.h5 -$SRC_TOOLS_TESTFILES/vds/4_0.h5 -$SRC_TOOLS_TESTFILES/vds/4_1.h5 -$SRC_TOOLS_TESTFILES/vds/4_2.h5 -$SRC_TOOLS_TESTFILES/vds/4_vds.h5 -$SRC_TOOLS_TESTFILES/vds/5_a.h5 -$SRC_TOOLS_TESTFILES/vds/5_b.h5 -$SRC_TOOLS_TESTFILES/vds/5_c.h5 -$SRC_TOOLS_TESTFILES/vds/5_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/1_a.h5 +$SRC_H5DUMP_TESTFILES/vds/1_b.h5 +$SRC_H5DUMP_TESTFILES/vds/1_c.h5 +$SRC_H5DUMP_TESTFILES/vds/1_d.h5 +$SRC_H5DUMP_TESTFILES/vds/1_e.h5 +$SRC_H5DUMP_TESTFILES/vds/1_f.h5 +$SRC_H5DUMP_TESTFILES/vds/1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/2_a.h5 +$SRC_H5DUMP_TESTFILES/vds/2_b.h5 +$SRC_H5DUMP_TESTFILES/vds/2_c.h5 +$SRC_H5DUMP_TESTFILES/vds/2_d.h5 +$SRC_H5DUMP_TESTFILES/vds/2_e.h5 +$SRC_H5DUMP_TESTFILES/vds/2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/4_0.h5 +$SRC_H5DUMP_TESTFILES/vds/4_1.h5 +$SRC_H5DUMP_TESTFILES/vds/4_2.h5 +$SRC_H5DUMP_TESTFILES/vds/4_vds.h5 +$SRC_H5DUMP_TESTFILES/vds/5_a.h5 +$SRC_H5DUMP_TESTFILES/vds/5_b.h5 +$SRC_H5DUMP_TESTFILES/vds/5_c.h5 +$SRC_H5DUMP_TESTFILES/vds/5_vds.h5 ########tools/testfiles######## -$SRC_TOOLS_TESTFILES/tst_onion_dset_1d.h5 -$SRC_TOOLS_TESTFILES/tst_onion_dset_1d.h5.onion -$SRC_TOOLS_TESTFILES/tst_onion_dset_ext.h5 -$SRC_TOOLS_TESTFILES/tst_onion_dset_ext.h5.onion -$SRC_TOOLS_TESTFILES/tst_onion_objs.h5 -$SRC_TOOLS_TESTFILES/tst_onion_objs.h5.onion +$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5 +$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5.onion +$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.h5 +$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.h5.onion +$SRC_H5DUMP_TESTFILES/tst_onion_objs.h5 +$SRC_H5DUMP_TESTFILES/tst_onion_objs.h5.onion " LIST_OTHER_TEST_FILES=" -$SRC_H5REPACK_TESTFILES/h5repack-help.txt +$SRC_H5REPACK_OUTFILES/h5repack-help.txt $SRC_H5REPACK_TESTFILES/h5repack_ext.bin $SRC_H5REPACK_TESTFILES/ublock.bin $SRC_H5REPACK_TESTFILES/h5repack.info @@ -197,66 +197,66 @@ $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-1.dat $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-2.dat $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-3.dat ############### -$SRC_H5REPACK_TESTFILES/crtorder.tordergr.h5.ddl -$SRC_H5REPACK_TESTFILES/deflate_limit.h5repack_layout.h5.ddl -$SRC_H5REPACK_TESTFILES/h5repack_layout.h5.ddl -$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl +$SRC_H5REPACK_OUTFILES/crtorder.tordergr.h5.ddl +$SRC_H5REPACK_OUTFILES/deflate_limit.h5repack_layout.h5.ddl +$SRC_H5REPACK_OUTFILES/h5repack_layout.h5.ddl +$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_test.ddl ########fsm#files######## -$SRC_H5REPACK_TESTFILES/SP.h5repack_fsm_aggr_nopersist.h5.ddl -$SRC_H5REPACK_TESTFILES/S.h5repack_fsm_aggr_persist.h5.ddl -$SRC_H5REPACK_TESTFILES/STG.h5repack_none.h5.ddl -$SRC_H5REPACK_TESTFILES/GS.h5repack_paged_nopersist.h5.ddl -$SRC_H5REPACK_TESTFILES/SP.h5repack_paged_persist.h5.ddl -$SRC_H5REPACK_TESTFILES/SPT.h5repack_aggr.h5.ddl +$SRC_H5REPACK_OUTFILES/SP.h5repack_fsm_aggr_nopersist.h5.ddl +$SRC_H5REPACK_OUTFILES/S.h5repack_fsm_aggr_persist.h5.ddl +$SRC_H5REPACK_OUTFILES/STG.h5repack_none.h5.ddl +$SRC_H5REPACK_OUTFILES/GS.h5repack_paged_nopersist.h5.ddl +$SRC_H5REPACK_OUTFILES/SP.h5repack_paged_persist.h5.ddl +$SRC_H5REPACK_OUTFILES/SPT.h5repack_aggr.h5.ddl ########vds#files######## -$SRC_H5REPACK_TESTFILES/1_vds.h5-vds_dset_chunk20x10x5-v.ddl -$SRC_H5REPACK_TESTFILES/2_vds.h5-vds_chunk3x6x9-v.ddl -$SRC_H5REPACK_TESTFILES/3_1_vds.h5-vds_chunk2x5x8-v.ddl -$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_compa-v.ddl -$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_conti-v.ddl +$SRC_H5REPACK_OUTFILES/1_vds.h5-vds_dset_chunk20x10x5-v.ddl +$SRC_H5REPACK_OUTFILES/2_vds.h5-vds_chunk3x6x9-v.ddl +$SRC_H5REPACK_OUTFILES/3_1_vds.h5-vds_chunk2x5x8-v.ddl +$SRC_H5REPACK_OUTFILES/4_vds.h5-vds_compa-v.ddl +$SRC_H5REPACK_OUTFILES/4_vds.h5-vds_conti-v.ddl ########refs#files######## -$SRC_H5REPACK_TESTFILES/attrregion.tattrreg.h5.ddl -$SRC_H5REPACK_TESTFILES/dataregion.tdatareg.h5.ddl +$SRC_H5REPACK_OUTFILES/attrregion.tattrreg.h5.ddl +$SRC_H5REPACK_OUTFILES/dataregion.tdatareg.h5.ddl ########external#links#files######## -$SRC_H5REPACK_TESTFILES/textlinkfar-base.textlinkfar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinksrc-base.textlinksrc.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinktar-base.textlinktar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlink-base.textlink.h5.ddl -$SRC_H5REPACK_TESTFILES/tsoftlinks-base.tsoftlinks.h5.ddl -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinkfar-merge.textlinkfar.h5.tst -$SRC_H5REPACK_TESTFILES/textlinksrc-merge.textlinksrc.h5.tst -$SRC_H5REPACK_TESTFILES/textlinktar-merge.textlinktar.h5.tst -$SRC_H5REPACK_TESTFILES/textlink-merge.textlink.h5.tst -$SRC_H5REPACK_TESTFILES/tsoftlinks-merge.tsoftlinks.h5.tst -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst -$SRC_H5REPACK_TESTFILES/textlinkfar-prune.textlinkfar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinksrc-prune.textlinksrc.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinktar-prune.textlinktar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlink-prune.textlink.h5.ddl -$SRC_H5REPACK_TESTFILES/tsoftlinks-prune.tsoftlinks.h5.ddl -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinkfar-mergeprune.textlinkfar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinksrc-mergeprune.textlinksrc.h5.ddl -$SRC_H5REPACK_TESTFILES/textlinktar-mergeprune.textlinktar.h5.ddl -$SRC_H5REPACK_TESTFILES/textlink-mergeprune.textlink.h5.ddl -$SRC_H5REPACK_TESTFILES/tsoftlinks-mergeprune.tsoftlinks.h5.ddl -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinkfar-base.textlinkfar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinksrc-base.textlinksrc.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinktar-base.textlinktar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlink-base.textlink.h5.ddl +$SRC_H5REPACK_OUTFILES/tsoftlinks-base.tsoftlinks.h5.ddl +$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinkfar-merge.textlinkfar.h5.tst +$SRC_H5REPACK_OUTFILES/textlinksrc-merge.textlinksrc.h5.tst +$SRC_H5REPACK_OUTFILES/textlinktar-merge.textlinktar.h5.tst +$SRC_H5REPACK_OUTFILES/textlink-merge.textlink.h5.tst +$SRC_H5REPACK_OUTFILES/tsoftlinks-merge.tsoftlinks.h5.tst +$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst +$SRC_H5REPACK_OUTFILES/textlinkfar-prune.textlinkfar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinksrc-prune.textlinksrc.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinktar-prune.textlinktar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlink-prune.textlink.h5.ddl +$SRC_H5REPACK_OUTFILES/tsoftlinks-prune.tsoftlinks.h5.ddl +$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinkfar-mergeprune.textlinkfar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinksrc-mergeprune.textlinksrc.h5.ddl +$SRC_H5REPACK_OUTFILES/textlinktar-mergeprune.textlinktar.h5.ddl +$SRC_H5REPACK_OUTFILES/textlink-mergeprune.textlink.h5.ddl +$SRC_H5REPACK_OUTFILES/tsoftlinks-mergeprune.tsoftlinks.h5.ddl +$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl ########tst#files######## -$SRC_H5REPACK_TESTFILES/h5repack_filters.h5-gzip_verbose_filters.tst -$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst -$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst +$SRC_H5REPACK_OUTFILES/h5repack_filters.h5-gzip_verbose_filters.tst +$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst +$SRC_H5REPACK_OUTFILES/plugin_test.h5repack_layout.h5.tst ########external#links#tst#files######## -$SRC_H5REPACK_TESTFILES/tsoftlinks-merge.tsoftlinks.h5.tst -$SRC_H5REPACK_TESTFILES/textlinkfar-merge.textlinkfar.h5.tst -$SRC_H5REPACK_TESTFILES/textlinksrc-merge.textlinksrc.h5.tst -$SRC_H5REPACK_TESTFILES/textlinktar-merge.textlinktar.h5.tst -$SRC_H5REPACK_TESTFILES/textlink-merge.textlink.h5.tst -$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst +$SRC_H5REPACK_OUTFILES/tsoftlinks-merge.tsoftlinks.h5.tst +$SRC_H5REPACK_OUTFILES/textlinkfar-merge.textlinkfar.h5.tst +$SRC_H5REPACK_OUTFILES/textlinksrc-merge.textlinksrc.h5.tst +$SRC_H5REPACK_OUTFILES/textlinktar-merge.textlinktar.h5.tst +$SRC_H5REPACK_OUTFILES/textlink-merge.textlink.h5.tst +$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst ########onion#files######## -$SRC_H5REPACK_TESTFILES/onion.tst_onion_dset_1d.h5.ddl -$SRC_H5REPACK_TESTFILES/onion.tst_onion_dset_ext.h5.ddl -$SRC_H5REPACK_TESTFILES/onion.tst_onion_objs.h5.ddl +$SRC_H5REPACK_OUTFILES/onion.tst_onion_dset_1d.h5.ddl +$SRC_H5REPACK_OUTFILES/onion.tst_onion_dset_ext.h5.ddl +$SRC_H5REPACK_OUTFILES/onion.tst_onion_objs.h5.ddl " # diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in index bd7c3a1229c..43be1ee1c7b 100644 --- a/tools/test/h5repack/h5repack_plugin.sh.in +++ b/tools/test/h5repack/h5repack_plugin.sh.in @@ -47,6 +47,7 @@ SRC_TOOLS="$srcdir/../.." # testfiles source dirs for tools SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" +SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected" TESTDIR=testplug test -d $TESTDIR || mkdir $TESTDIR @@ -62,14 +63,14 @@ test -d $TESTDIR || mkdir $TESTDIR # -------------------------------------------------------------------- LIST_HDF5_TEST_FILES=" $SRC_H5REPACK_TESTFILES/h5repack_layout.h5 -$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl -$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst -$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_version_test.ddl -$SRC_H5REPACK_TESTFILES/plugin_version_test.h5repack_layout.h5.tst +$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_test.ddl +$SRC_H5REPACK_OUTFILES/plugin_test.h5repack_layout.h5.tst +$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_version_test.ddl +$SRC_H5REPACK_OUTFILES/plugin_version_test.h5repack_layout.h5.tst " #$SRC_H5REPACK_TESTFILES/h5repack_layout.UD.h5 -#$SRC_H5REPACK_TESTFILES/h5repack_layout.UD.h5-plugin_none.ddl -#$SRC_H5REPACK_TESTFILES/plugin_none.h5repack_layout.UD.h5.tst +#$SRC_H5REPACK_OUTFILES/h5repack_layout.UD.h5-plugin_none.ddl +#$SRC_H5REPACK_OUTFILES/plugin_none.h5repack_layout.UD.h5.tst #" # diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5 b/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5 deleted file mode 100644 index 7b8621e1fad..00000000000 Binary files a/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5 and /dev/null differ diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5 b/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5 deleted file mode 100644 index 3a0242d5252..00000000000 Binary files a/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5 and /dev/null differ diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake index 14bb5ea3a8c..31b3ae34051 100644 --- a/tools/test/h5stat/CMakeTests.cmake +++ b/tools/test/h5stat/CMakeTests.cmake @@ -75,15 +75,15 @@ ) foreach (ddl_file ${HDF5_REFERENCE_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files") endforeach () foreach (h5_file ${HDF5_REFERENCE_ERR_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${h5_file}.err" "${PROJECT_BINARY_DIR}/${h5_file}.err" "h5stat_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}.err" "${PROJECT_BINARY_DIR}/${h5_file}.err" "h5stat_files") endforeach () foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5stat_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5stat_files") endforeach () add_custom_target(h5stat_files ALL COMMENT "Copying files needed by h5stat tests" DEPENDS ${h5stat_files_list}) diff --git a/tools/test/h5stat/testfiles/h5stat_dims1.ddl b/tools/test/h5stat/expected/h5stat_dims1.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_dims1.ddl rename to tools/test/h5stat/expected/h5stat_dims1.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_dims2.ddl b/tools/test/h5stat/expected/h5stat_dims2.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_dims2.ddl rename to tools/test/h5stat/expected/h5stat_dims2.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_err1_dims.err b/tools/test/h5stat/expected/h5stat_err1_dims.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err1_dims.err rename to tools/test/h5stat/expected/h5stat_err1_dims.err diff --git a/tools/test/h5stat/testfiles/h5stat_err1_links.err b/tools/test/h5stat/expected/h5stat_err1_links.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err1_links.err rename to tools/test/h5stat/expected/h5stat_err1_links.err diff --git a/tools/test/h5stat/testfiles/h5stat_err1_numattrs.err b/tools/test/h5stat/expected/h5stat_err1_numattrs.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err1_numattrs.err rename to tools/test/h5stat/expected/h5stat_err1_numattrs.err diff --git a/tools/test/h5stat/testfiles/h5stat_err2_numattrs.err b/tools/test/h5stat/expected/h5stat_err2_numattrs.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err2_numattrs.err rename to tools/test/h5stat/expected/h5stat_err2_numattrs.err diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl b/tools/test/h5stat/expected/h5stat_err_old_fill.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl rename to tools/test/h5stat/expected/h5stat_err_old_fill.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_fill.err b/tools/test/h5stat/expected/h5stat_err_old_fill.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_old_fill.err rename to tools/test/h5stat/expected/h5stat_err_old_fill.err diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl b/tools/test/h5stat/expected/h5stat_err_old_layout.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl rename to tools/test/h5stat/expected/h5stat_err_old_layout.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_layout.err b/tools/test/h5stat/expected/h5stat_err_old_layout.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_old_layout.err rename to tools/test/h5stat/expected/h5stat_err_old_layout.err diff --git a/tools/test/h5stat/testfiles/h5stat_err_refcount.ddl b/tools/test/h5stat/expected/h5stat_err_refcount.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_refcount.ddl rename to tools/test/h5stat/expected/h5stat_err_refcount.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_err_refcount.err b/tools/test/h5stat/expected/h5stat_err_refcount.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_err_refcount.err rename to tools/test/h5stat/expected/h5stat_err_refcount.err diff --git a/tools/test/h5stat/testfiles/h5stat_filters-F.ddl b/tools/test/h5stat/expected/h5stat_filters-F.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-F.ddl rename to tools/test/h5stat/expected/h5stat_filters-F.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-UD.ddl b/tools/test/h5stat/expected/h5stat_filters-UD.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-UD.ddl rename to tools/test/h5stat/expected/h5stat_filters-UD.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-UT.ddl b/tools/test/h5stat/expected/h5stat_filters-UT.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-UT.ddl rename to tools/test/h5stat/expected/h5stat_filters-UT.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-d.ddl b/tools/test/h5stat/expected/h5stat_filters-d.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-d.ddl rename to tools/test/h5stat/expected/h5stat_filters-d.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-dT.ddl b/tools/test/h5stat/expected/h5stat_filters-dT.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-dT.ddl rename to tools/test/h5stat/expected/h5stat_filters-dT.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-file.ddl b/tools/test/h5stat/expected/h5stat_filters-file.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-file.ddl rename to tools/test/h5stat/expected/h5stat_filters-file.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters-g.ddl b/tools/test/h5stat/expected/h5stat_filters-g.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters-g.ddl rename to tools/test/h5stat/expected/h5stat_filters-g.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_filters.ddl b/tools/test/h5stat/expected/h5stat_filters.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_filters.ddl rename to tools/test/h5stat/expected/h5stat_filters.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_help1.ddl b/tools/test/h5stat/expected/h5stat_help1.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_help1.ddl rename to tools/test/h5stat/expected/h5stat_help1.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_help2.ddl b/tools/test/h5stat/expected/h5stat_help2.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_help2.ddl rename to tools/test/h5stat/expected/h5stat_help2.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_idx.ddl b/tools/test/h5stat/expected/h5stat_idx.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_idx.ddl rename to tools/test/h5stat/expected/h5stat_idx.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_links1.ddl b/tools/test/h5stat/expected/h5stat_links1.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_links1.ddl rename to tools/test/h5stat/expected/h5stat_links1.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_links2.ddl b/tools/test/h5stat/expected/h5stat_links2.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_links2.ddl rename to tools/test/h5stat/expected/h5stat_links2.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_links3.ddl b/tools/test/h5stat/expected/h5stat_links3.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_links3.ddl rename to tools/test/h5stat/expected/h5stat_links3.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_links4.ddl b/tools/test/h5stat/expected/h5stat_links4.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_links4.ddl rename to tools/test/h5stat/expected/h5stat_links4.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_links5.ddl b/tools/test/h5stat/expected/h5stat_links5.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_links5.ddl rename to tools/test/h5stat/expected/h5stat_links5.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl b/tools/test/h5stat/expected/h5stat_newgrat-UA.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl rename to tools/test/h5stat/expected/h5stat_newgrat-UA.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl b/tools/test/h5stat/expected/h5stat_newgrat-UG.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl rename to tools/test/h5stat/expected/h5stat_newgrat-UG.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat.ddl b/tools/test/h5stat/expected/h5stat_newgrat.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_newgrat.ddl rename to tools/test/h5stat/expected/h5stat_newgrat.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_nofile.ddl b/tools/test/h5stat/expected/h5stat_nofile.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_nofile.ddl rename to tools/test/h5stat/expected/h5stat_nofile.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_nofile.err b/tools/test/h5stat/expected/h5stat_nofile.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_nofile.err rename to tools/test/h5stat/expected/h5stat_nofile.err diff --git a/tools/test/h5stat/testfiles/h5stat_notexist.ddl b/tools/test/h5stat/expected/h5stat_notexist.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_notexist.ddl rename to tools/test/h5stat/expected/h5stat_notexist.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_notexist.err b/tools/test/h5stat/expected/h5stat_notexist.err similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_notexist.err rename to tools/test/h5stat/expected/h5stat_notexist.err diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs1.ddl b/tools/test/h5stat/expected/h5stat_numattrs1.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_numattrs1.ddl rename to tools/test/h5stat/expected/h5stat_numattrs1.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs2.ddl b/tools/test/h5stat/expected/h5stat_numattrs2.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_numattrs2.ddl rename to tools/test/h5stat/expected/h5stat_numattrs2.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs3.ddl b/tools/test/h5stat/expected/h5stat_numattrs3.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_numattrs3.ddl rename to tools/test/h5stat/expected/h5stat_numattrs3.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs4.ddl b/tools/test/h5stat/expected/h5stat_numattrs4.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_numattrs4.ddl rename to tools/test/h5stat/expected/h5stat_numattrs4.ddl diff --git a/tools/test/h5stat/testfiles/h5stat_tsohm.ddl b/tools/test/h5stat/expected/h5stat_tsohm.ddl similarity index 100% rename from tools/test/h5stat/testfiles/h5stat_tsohm.ddl rename to tools/test/h5stat/expected/h5stat_tsohm.ddl diff --git a/tools/test/h5stat/testh5stat.sh.in b/tools/test/h5stat/testh5stat.sh.in index 65e40c4d820..1223c8fc5d4 100644 --- a/tools/test/h5stat/testh5stat.sh.in +++ b/tools/test/h5stat/testh5stat.sh.in @@ -39,17 +39,17 @@ verbose=yes # 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" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5STAT_OUTFILES="$SRC_TOOLS/test/h5stat/expected" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -75,49 +75,49 @@ $SRC_H5STAT_TESTFILES/h5stat_threshold.h5 " LIST_ERR_TEST_FILES=" -$SRC_H5STAT_TESTFILES/h5stat_err_refcount.err -$SRC_H5STAT_TESTFILES/h5stat_err_old_layout.err -$SRC_H5STAT_TESTFILES/h5stat_err_old_fill.err -$SRC_H5STAT_TESTFILES/h5stat_err1_links.err -$SRC_H5STAT_TESTFILES/h5stat_err1_dims.err -$SRC_H5STAT_TESTFILES/h5stat_err1_numattrs.err -$SRC_H5STAT_TESTFILES/h5stat_err2_numattrs.err -$SRC_H5STAT_TESTFILES/h5stat_notexist.err -$SRC_H5STAT_TESTFILES/h5stat_nofile.err +$SRC_H5STAT_OUTFILES/h5stat_err_refcount.err +$SRC_H5STAT_OUTFILES/h5stat_err_old_layout.err +$SRC_H5STAT_OUTFILES/h5stat_err_old_fill.err +$SRC_H5STAT_OUTFILES/h5stat_err1_links.err +$SRC_H5STAT_OUTFILES/h5stat_err1_dims.err +$SRC_H5STAT_OUTFILES/h5stat_err1_numattrs.err +$SRC_H5STAT_OUTFILES/h5stat_err2_numattrs.err +$SRC_H5STAT_OUTFILES/h5stat_notexist.err +$SRC_H5STAT_OUTFILES/h5stat_nofile.err " LIST_OTHER_TEST_FILES=" -$SRC_H5STAT_TESTFILES/h5stat_err_refcount.ddl -$SRC_H5STAT_TESTFILES/h5stat_err_old_layout.ddl -$SRC_H5STAT_TESTFILES/h5stat_err_old_fill.ddl -$SRC_H5STAT_TESTFILES/h5stat_help1.ddl -$SRC_H5STAT_TESTFILES/h5stat_help2.ddl -$SRC_H5STAT_TESTFILES/h5stat_notexist.ddl -$SRC_H5STAT_TESTFILES/h5stat_nofile.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-file.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-F.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-d.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-g.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-dT.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-UD.ddl -$SRC_H5STAT_TESTFILES/h5stat_filters-UT.ddl -$SRC_H5STAT_TESTFILES/h5stat_tsohm.ddl -$SRC_H5STAT_TESTFILES/h5stat_newgrat.ddl -$SRC_H5STAT_TESTFILES/h5stat_newgrat-UG.ddl -$SRC_H5STAT_TESTFILES/h5stat_newgrat-UA.ddl -$SRC_H5STAT_TESTFILES/h5stat_idx.ddl -$SRC_H5STAT_TESTFILES/h5stat_links1.ddl -$SRC_H5STAT_TESTFILES/h5stat_links2.ddl -$SRC_H5STAT_TESTFILES/h5stat_links3.ddl -$SRC_H5STAT_TESTFILES/h5stat_links4.ddl -$SRC_H5STAT_TESTFILES/h5stat_links5.ddl -$SRC_H5STAT_TESTFILES/h5stat_dims1.ddl -$SRC_H5STAT_TESTFILES/h5stat_dims2.ddl -$SRC_H5STAT_TESTFILES/h5stat_numattrs1.ddl -$SRC_H5STAT_TESTFILES/h5stat_numattrs2.ddl -$SRC_H5STAT_TESTFILES/h5stat_numattrs3.ddl -$SRC_H5STAT_TESTFILES/h5stat_numattrs4.ddl +$SRC_H5STAT_OUTFILES/h5stat_err_refcount.ddl +$SRC_H5STAT_OUTFILES/h5stat_err_old_layout.ddl +$SRC_H5STAT_OUTFILES/h5stat_err_old_fill.ddl +$SRC_H5STAT_OUTFILES/h5stat_help1.ddl +$SRC_H5STAT_OUTFILES/h5stat_help2.ddl +$SRC_H5STAT_OUTFILES/h5stat_notexist.ddl +$SRC_H5STAT_OUTFILES/h5stat_nofile.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-file.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-F.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-d.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-g.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-dT.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-UD.ddl +$SRC_H5STAT_OUTFILES/h5stat_filters-UT.ddl +$SRC_H5STAT_OUTFILES/h5stat_tsohm.ddl +$SRC_H5STAT_OUTFILES/h5stat_newgrat.ddl +$SRC_H5STAT_OUTFILES/h5stat_newgrat-UG.ddl +$SRC_H5STAT_OUTFILES/h5stat_newgrat-UA.ddl +$SRC_H5STAT_OUTFILES/h5stat_idx.ddl +$SRC_H5STAT_OUTFILES/h5stat_links1.ddl +$SRC_H5STAT_OUTFILES/h5stat_links2.ddl +$SRC_H5STAT_OUTFILES/h5stat_links3.ddl +$SRC_H5STAT_OUTFILES/h5stat_links4.ddl +$SRC_H5STAT_OUTFILES/h5stat_links5.ddl +$SRC_H5STAT_OUTFILES/h5stat_dims1.ddl +$SRC_H5STAT_OUTFILES/h5stat_dims2.ddl +$SRC_H5STAT_OUTFILES/h5stat_numattrs1.ddl +$SRC_H5STAT_OUTFILES/h5stat_numattrs2.ddl +$SRC_H5STAT_OUTFILES/h5stat_numattrs3.ddl +$SRC_H5STAT_OUTFILES/h5stat_numattrs4.ddl " # diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake index 5e307aa3fcc..2f3c62f9652 100644 --- a/tools/test/misc/CMakeTestsClear.cmake +++ b/tools/test/misc/CMakeTestsClear.cmake @@ -63,11 +63,14 @@ h5clear_open_fail.err ) - foreach (h5_file ${HDF5_TEST_FILES} ${HDF5_SEC2_TEST_FILES} ${HDF5_REFERENCE_TEST_FILES}) + foreach (h5_file ${HDF5_TEST_FILES} ${HDF5_SEC2_TEST_FILES}) HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files") endforeach () + foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files") + endforeach () foreach (h5_file ${HDF5_REFERENCE_ERR_FILES}) - HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files") endforeach () # make second copy of h5clear_sec2.h5 foreach (h5_file ${HDF5_SEC2_TEST_FILES}) @@ -99,6 +102,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 () @@ -117,6 +124,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 () diff --git a/tools/test/misc/CMakeTestsMkgrp.cmake b/tools/test/misc/CMakeTestsMkgrp.cmake index b4d1a563a30..9e4f7393518 100644 --- a/tools/test/misc/CMakeTestsMkgrp.cmake +++ b/tools/test/misc/CMakeTestsMkgrp.cmake @@ -40,10 +40,10 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") foreach (h5_mkgrp_file ${HDF5_MKGRP_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_mkgrp_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_mkgrp_file}" "h5mkgrp_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_mkgrp_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_mkgrp_file}" "h5mkgrp_files") endforeach () - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/testfiles/h5mkgrp_help.txt" "${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_help.txt" "h5mkgrp_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/h5mkgrp_help.txt" "${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_help.txt" "h5mkgrp_files") add_custom_target(h5mkgrp_files ALL COMMENT "Copying files needed by h5mkgrp tests" DEPENDS ${h5mkgrp_files_list}) configure_file (${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/testfiles/h5mkgrp_version.txt.in ${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_version.txt @ONLY) diff --git a/tools/test/misc/CMakeTestsRepart.cmake b/tools/test/misc/CMakeTestsRepart.cmake index 04c74ecc257..764778e9b96 100644 --- a/tools/test/misc/CMakeTestsRepart.cmake +++ b/tools/test/misc/CMakeTestsRepart.cmake @@ -41,7 +41,7 @@ ) foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5repart_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5repart_files") endforeach () add_custom_target(h5repart_files ALL COMMENT "Copying files needed by h5repart tests" DEPENDS ${h5repart_files_list}) diff --git a/tools/test/misc/testfiles/h5clear_equal_after_size.ddl b/tools/test/misc/expected/h5clear_equal_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_equal_after_size.ddl rename to tools/test/misc/expected/h5clear_equal_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_equal_before_size.ddl b/tools/test/misc/expected/h5clear_equal_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_equal_before_size.ddl rename to tools/test/misc/expected/h5clear_equal_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_greater_after_size.ddl b/tools/test/misc/expected/h5clear_greater_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_greater_after_size.ddl rename to tools/test/misc/expected/h5clear_greater_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_greater_before_size.ddl b/tools/test/misc/expected/h5clear_greater_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_greater_before_size.ddl rename to tools/test/misc/expected/h5clear_greater_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_less_after_size.ddl b/tools/test/misc/expected/h5clear_less_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_less_after_size.ddl rename to tools/test/misc/expected/h5clear_less_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_less_before_size.ddl b/tools/test/misc/expected/h5clear_less_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_less_before_size.ddl rename to tools/test/misc/expected/h5clear_less_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_missing_file.ddl b/tools/test/misc/expected/h5clear_missing_file.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_missing_file.ddl rename to tools/test/misc/expected/h5clear_missing_file.ddl diff --git a/tools/test/misc/testfiles/h5clear_missing_file.err b/tools/test/misc/expected/h5clear_missing_file.err similarity index 100% rename from tools/test/misc/testfiles/h5clear_missing_file.err rename to tools/test/misc/expected/h5clear_missing_file.err diff --git a/tools/test/misc/testfiles/h5clear_no_mdc_image.err b/tools/test/misc/expected/h5clear_no_mdc_image.err similarity index 100% rename from tools/test/misc/testfiles/h5clear_no_mdc_image.err rename to tools/test/misc/expected/h5clear_no_mdc_image.err diff --git a/tools/test/misc/testfiles/h5clear_noclose_after_size.ddl b/tools/test/misc/expected/h5clear_noclose_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_noclose_after_size.ddl rename to tools/test/misc/expected/h5clear_noclose_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_noclose_before_size.ddl b/tools/test/misc/expected/h5clear_noclose_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_noclose_before_size.ddl rename to tools/test/misc/expected/h5clear_noclose_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_open_fail.err b/tools/test/misc/expected/h5clear_open_fail.err similarity index 100% rename from tools/test/misc/testfiles/h5clear_open_fail.err rename to tools/test/misc/expected/h5clear_open_fail.err diff --git a/tools/test/misc/testfiles/h5clear_status_noclose_after_size.ddl b/tools/test/misc/expected/h5clear_status_noclose_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_status_noclose_after_size.ddl rename to tools/test/misc/expected/h5clear_status_noclose_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_usage.ddl b/tools/test/misc/expected/h5clear_usage.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_usage.ddl rename to tools/test/misc/expected/h5clear_usage.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_equal_after_size.ddl b/tools/test/misc/expected/h5clear_user_equal_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_equal_after_size.ddl rename to tools/test/misc/expected/h5clear_user_equal_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_equal_before_size.ddl b/tools/test/misc/expected/h5clear_user_equal_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_equal_before_size.ddl rename to tools/test/misc/expected/h5clear_user_equal_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_greater_after_size.ddl b/tools/test/misc/expected/h5clear_user_greater_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_greater_after_size.ddl rename to tools/test/misc/expected/h5clear_user_greater_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_greater_before_size.ddl b/tools/test/misc/expected/h5clear_user_greater_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_greater_before_size.ddl rename to tools/test/misc/expected/h5clear_user_greater_before_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_less_after_size.ddl b/tools/test/misc/expected/h5clear_user_less_after_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_less_after_size.ddl rename to tools/test/misc/expected/h5clear_user_less_after_size.ddl diff --git a/tools/test/misc/testfiles/h5clear_user_less_before_size.ddl b/tools/test/misc/expected/h5clear_user_less_before_size.ddl similarity index 100% rename from tools/test/misc/testfiles/h5clear_user_less_before_size.ddl rename to tools/test/misc/expected/h5clear_user_less_before_size.ddl diff --git a/tools/test/misc/testfiles/h5mkgrp_help.txt b/tools/test/misc/expected/h5mkgrp_help.txt similarity index 100% rename from tools/test/misc/testfiles/h5mkgrp_help.txt rename to tools/test/misc/expected/h5mkgrp_help.txt diff --git a/tools/testfiles/h5mkgrp_nested_lp.ls b/tools/test/misc/expected/h5mkgrp_nested_lp.ls similarity index 100% rename from tools/testfiles/h5mkgrp_nested_lp.ls rename to tools/test/misc/expected/h5mkgrp_nested_lp.ls diff --git a/tools/testfiles/h5mkgrp_nested_mult_lp.ls b/tools/test/misc/expected/h5mkgrp_nested_mult_lp.ls similarity index 100% rename from tools/testfiles/h5mkgrp_nested_mult_lp.ls rename to tools/test/misc/expected/h5mkgrp_nested_mult_lp.ls diff --git a/tools/testfiles/h5mkgrp_nested_mult_p.ls b/tools/test/misc/expected/h5mkgrp_nested_mult_p.ls similarity index 100% rename from tools/testfiles/h5mkgrp_nested_mult_p.ls rename to tools/test/misc/expected/h5mkgrp_nested_mult_p.ls diff --git a/tools/testfiles/h5mkgrp_nested_p.ls b/tools/test/misc/expected/h5mkgrp_nested_p.ls similarity index 100% rename from tools/testfiles/h5mkgrp_nested_p.ls rename to tools/test/misc/expected/h5mkgrp_nested_p.ls diff --git a/tools/testfiles/h5mkgrp_several.ls b/tools/test/misc/expected/h5mkgrp_several.ls similarity index 100% rename from tools/testfiles/h5mkgrp_several.ls rename to tools/test/misc/expected/h5mkgrp_several.ls diff --git a/tools/testfiles/h5mkgrp_several_l.ls b/tools/test/misc/expected/h5mkgrp_several_l.ls similarity index 100% rename from tools/testfiles/h5mkgrp_several_l.ls rename to tools/test/misc/expected/h5mkgrp_several_l.ls diff --git a/tools/testfiles/h5mkgrp_several_p.ls b/tools/test/misc/expected/h5mkgrp_several_p.ls similarity index 100% rename from tools/testfiles/h5mkgrp_several_p.ls rename to tools/test/misc/expected/h5mkgrp_several_p.ls diff --git a/tools/testfiles/h5mkgrp_several_v.ls b/tools/test/misc/expected/h5mkgrp_several_v.ls similarity index 100% rename from tools/testfiles/h5mkgrp_several_v.ls rename to tools/test/misc/expected/h5mkgrp_several_v.ls diff --git a/tools/testfiles/h5mkgrp_single.ls b/tools/test/misc/expected/h5mkgrp_single.ls similarity index 100% rename from tools/testfiles/h5mkgrp_single.ls rename to tools/test/misc/expected/h5mkgrp_single.ls diff --git a/tools/testfiles/h5mkgrp_single_l.ls b/tools/test/misc/expected/h5mkgrp_single_l.ls similarity index 100% rename from tools/testfiles/h5mkgrp_single_l.ls rename to tools/test/misc/expected/h5mkgrp_single_l.ls diff --git a/tools/testfiles/h5mkgrp_single_p.ls b/tools/test/misc/expected/h5mkgrp_single_p.ls similarity index 100% rename from tools/testfiles/h5mkgrp_single_p.ls rename to tools/test/misc/expected/h5mkgrp_single_p.ls diff --git a/tools/testfiles/h5mkgrp_single_v.ls b/tools/test/misc/expected/h5mkgrp_single_v.ls similarity index 100% rename from tools/testfiles/h5mkgrp_single_v.ls rename to tools/test/misc/expected/h5mkgrp_single_v.ls diff --git a/tools/testfiles/family_file00000.h5 b/tools/test/misc/testfiles/family_file00000.h5 similarity index 100% rename from tools/testfiles/family_file00000.h5 rename to tools/test/misc/testfiles/family_file00000.h5 diff --git a/tools/testfiles/family_file00001.h5 b/tools/test/misc/testfiles/family_file00001.h5 similarity index 100% rename from tools/testfiles/family_file00001.h5 rename to tools/test/misc/testfiles/family_file00001.h5 diff --git a/tools/testfiles/family_file00002.h5 b/tools/test/misc/testfiles/family_file00002.h5 similarity index 100% rename from tools/testfiles/family_file00002.h5 rename to tools/test/misc/testfiles/family_file00002.h5 diff --git a/tools/testfiles/family_file00003.h5 b/tools/test/misc/testfiles/family_file00003.h5 similarity index 100% rename from tools/testfiles/family_file00003.h5 rename to tools/test/misc/testfiles/family_file00003.h5 diff --git a/tools/testfiles/family_file00004.h5 b/tools/test/misc/testfiles/family_file00004.h5 similarity index 100% rename from tools/testfiles/family_file00004.h5 rename to tools/test/misc/testfiles/family_file00004.h5 diff --git a/tools/testfiles/family_file00005.h5 b/tools/test/misc/testfiles/family_file00005.h5 similarity index 100% rename from tools/testfiles/family_file00005.h5 rename to tools/test/misc/testfiles/family_file00005.h5 diff --git a/tools/testfiles/family_file00006.h5 b/tools/test/misc/testfiles/family_file00006.h5 similarity index 100% rename from tools/testfiles/family_file00006.h5 rename to tools/test/misc/testfiles/family_file00006.h5 diff --git a/tools/testfiles/family_file00007.h5 b/tools/test/misc/testfiles/family_file00007.h5 similarity index 100% rename from tools/testfiles/family_file00007.h5 rename to tools/test/misc/testfiles/family_file00007.h5 diff --git a/tools/testfiles/family_file00008.h5 b/tools/test/misc/testfiles/family_file00008.h5 similarity index 100% rename from tools/testfiles/family_file00008.h5 rename to tools/test/misc/testfiles/family_file00008.h5 diff --git a/tools/testfiles/family_file00009.h5 b/tools/test/misc/testfiles/family_file00009.h5 similarity index 100% rename from tools/testfiles/family_file00009.h5 rename to tools/test/misc/testfiles/family_file00009.h5 diff --git a/tools/testfiles/family_file00010.h5 b/tools/test/misc/testfiles/family_file00010.h5 similarity index 100% rename from tools/testfiles/family_file00010.h5 rename to tools/test/misc/testfiles/family_file00010.h5 diff --git a/tools/testfiles/family_file00011.h5 b/tools/test/misc/testfiles/family_file00011.h5 similarity index 100% rename from tools/testfiles/family_file00011.h5 rename to tools/test/misc/testfiles/family_file00011.h5 diff --git a/tools/testfiles/family_file00012.h5 b/tools/test/misc/testfiles/family_file00012.h5 similarity index 100% rename from tools/testfiles/family_file00012.h5 rename to tools/test/misc/testfiles/family_file00012.h5 diff --git a/tools/testfiles/family_file00013.h5 b/tools/test/misc/testfiles/family_file00013.h5 similarity index 100% rename from tools/testfiles/family_file00013.h5 rename to tools/test/misc/testfiles/family_file00013.h5 diff --git a/tools/testfiles/family_file00014.h5 b/tools/test/misc/testfiles/family_file00014.h5 similarity index 100% rename from tools/testfiles/family_file00014.h5 rename to tools/test/misc/testfiles/family_file00014.h5 diff --git a/tools/testfiles/family_file00015.h5 b/tools/test/misc/testfiles/family_file00015.h5 similarity index 100% rename from tools/testfiles/family_file00015.h5 rename to tools/test/misc/testfiles/family_file00015.h5 diff --git a/tools/testfiles/family_file00016.h5 b/tools/test/misc/testfiles/family_file00016.h5 similarity index 100% rename from tools/testfiles/family_file00016.h5 rename to tools/test/misc/testfiles/family_file00016.h5 diff --git a/tools/testfiles/family_file00017.h5 b/tools/test/misc/testfiles/family_file00017.h5 similarity index 100% rename from tools/testfiles/family_file00017.h5 rename to tools/test/misc/testfiles/family_file00017.h5 diff --git a/tools/test/misc/testh5clear.sh.in b/tools/test/misc/testh5clear.sh.in index 018d1fd3a48..b5bf5cc3d83 100644 --- a/tools/test/misc/testh5clear.sh.in +++ b/tools/test/misc/testh5clear.sh.in @@ -40,9 +40,9 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools SRC_H5CLEAR_TESTFILES="$SRC_TOOLS/test/misc/testfiles" +SRC_H5CLEAR_OUTFILES="$SRC_TOOLS/test/misc/expected" TESTDIR=./testh5clear test -d $TESTDIR || mkdir -p $TESTDIR @@ -61,25 +61,25 @@ test -d $TESTDIR || mkdir -p $TESTDIR # copy test files and expected output files from source dirs to test dir # COPY_TESTFILES=" -$SRC_H5CLEAR_TESTFILES/h5clear_open_fail.err -$SRC_H5CLEAR_TESTFILES/h5clear_no_mdc_image.err -$SRC_H5CLEAR_TESTFILES/h5clear_usage.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_missing_file.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_status_noclose_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_noclose_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_noclose_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_equal_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_equal_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_greater_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_greater_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_less_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_less_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_equal_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_equal_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_greater_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_greater_after_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_less_before_size.ddl -$SRC_H5CLEAR_TESTFILES/h5clear_user_less_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_open_fail.err +$SRC_H5CLEAR_OUTFILES/h5clear_no_mdc_image.err +$SRC_H5CLEAR_OUTFILES/h5clear_usage.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_missing_file.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_status_noclose_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_noclose_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_noclose_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_equal_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_equal_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_greater_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_greater_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_less_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_less_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_equal_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_equal_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_greater_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_greater_after_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_less_before_size.ddl +$SRC_H5CLEAR_OUTFILES/h5clear_user_less_after_size.ddl $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v0.h5 $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v2.h5 $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v3.h5 diff --git a/tools/test/misc/testh5mkgrp.sh.in b/tools/test/misc/testh5mkgrp.sh.in index d581fe1e12a..676f6b04e55 100644 --- a/tools/test/misc/testh5mkgrp.sh.in +++ b/tools/test/misc/testh5mkgrp.sh.in @@ -39,9 +39,9 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools SRC_H5MKGRP_TESTFILES="$SRC_TOOLS/test/misc/testfiles" +SRC_H5MKGRP_OUTFILES="$SRC_TOOLS/test/misc/expected" TESTDIR=./testgrp test -d $TESTDIR || mkdir -p $TESTDIR @@ -60,19 +60,19 @@ test -d $TESTDIR || mkdir -p $TESTDIR # copy test files and expected output files from source dirs to test dir # COPY_TESTFILES=" -$SRC_H5MKGRP_TESTFILES/h5mkgrp_help.txt -$SRC_TOOLS_TESTFILES/h5mkgrp_single.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_single_v.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_single_p.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_single_l.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_several.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_several_v.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_several_p.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_several_l.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_nested_p.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_nested_lp.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_nested_mult_p.ls -$SRC_TOOLS_TESTFILES/h5mkgrp_nested_mult_lp.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_help.txt +$SRC_H5MKGRP_OUTFILES/h5mkgrp_single.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_v.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_p.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_l.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_several.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_v.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_p.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_l.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_p.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_lp.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_mult_p.ls +$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_mult_lp.ls " COPY_TESTFILES_TO_TESTDIR() diff --git a/tools/test/misc/testh5repart.sh.in b/tools/test/misc/testh5repart.sh.in index b0d52f60b2d..addd0db9e22 100644 --- a/tools/test/misc/testh5repart.sh.in +++ b/tools/test/misc/testh5repart.sh.in @@ -38,7 +38,7 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" +SRC_H5REPART_TESTFILES="$SRC_TOOLS/test/misc/testfiles" TESTDIR=./testrepart test -d $TESTDIR || mkdir -p $TESTDIR @@ -47,24 +47,24 @@ test -d $TESTDIR || mkdir -p $TESTDIR # copy test files and expected output files from source dirs to test dir # COPY_TESTFILES=" -$SRC_TOOLS_TESTFILES/family_file00000.h5 -$SRC_TOOLS_TESTFILES/family_file00001.h5 -$SRC_TOOLS_TESTFILES/family_file00002.h5 -$SRC_TOOLS_TESTFILES/family_file00003.h5 -$SRC_TOOLS_TESTFILES/family_file00004.h5 -$SRC_TOOLS_TESTFILES/family_file00005.h5 -$SRC_TOOLS_TESTFILES/family_file00006.h5 -$SRC_TOOLS_TESTFILES/family_file00007.h5 -$SRC_TOOLS_TESTFILES/family_file00008.h5 -$SRC_TOOLS_TESTFILES/family_file00009.h5 -$SRC_TOOLS_TESTFILES/family_file00010.h5 -$SRC_TOOLS_TESTFILES/family_file00011.h5 -$SRC_TOOLS_TESTFILES/family_file00012.h5 -$SRC_TOOLS_TESTFILES/family_file00013.h5 -$SRC_TOOLS_TESTFILES/family_file00014.h5 -$SRC_TOOLS_TESTFILES/family_file00015.h5 -$SRC_TOOLS_TESTFILES/family_file00016.h5 -$SRC_TOOLS_TESTFILES/family_file00017.h5 +$SRC_H5REPART_TESTFILES/family_file00000.h5 +$SRC_H5REPART_TESTFILES/family_file00001.h5 +$SRC_H5REPART_TESTFILES/family_file00002.h5 +$SRC_H5REPART_TESTFILES/family_file00003.h5 +$SRC_H5REPART_TESTFILES/family_file00004.h5 +$SRC_H5REPART_TESTFILES/family_file00005.h5 +$SRC_H5REPART_TESTFILES/family_file00006.h5 +$SRC_H5REPART_TESTFILES/family_file00007.h5 +$SRC_H5REPART_TESTFILES/family_file00008.h5 +$SRC_H5REPART_TESTFILES/family_file00009.h5 +$SRC_H5REPART_TESTFILES/family_file00010.h5 +$SRC_H5REPART_TESTFILES/family_file00011.h5 +$SRC_H5REPART_TESTFILES/family_file00012.h5 +$SRC_H5REPART_TESTFILES/family_file00013.h5 +$SRC_H5REPART_TESTFILES/family_file00014.h5 +$SRC_H5REPART_TESTFILES/family_file00015.h5 +$SRC_H5REPART_TESTFILES/family_file00016.h5 +$SRC_H5REPART_TESTFILES/family_file00017.h5 " COPY_TESTFILES_TO_TESTDIR() @@ -100,7 +100,7 @@ CLEAN_TESTFILES_AND_TESTDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=$SRC_TOOLS_TESTFILES + SDIR=$SRC_H5REPART_TESTFILES INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake index acfe169fc9e..2dea619438a 100644 --- a/tools/test/perform/CMakeTests.cmake +++ b/tools/test/perform/CMakeTests.cmake @@ -16,7 +16,7 @@ ############################################################################## ############################################################################## -HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfilters.h5" "${PROJECT_BINARY_DIR}/tfilters.h5" "zip_perf_files") +HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfilters.h5" "${PROJECT_BINARY_DIR}/tfilters.h5" "zip_perf_files") add_custom_target(zip_perf_files ALL COMMENT "Copying files needed by zip_perf tests" DEPENDS ${zip_perf_list}) #----------------------------------------------------------------------------- diff --git a/utils/tools/test/h5dwalk/testh5dwalk.sh.in b/utils/tools/test/h5dwalk/testh5dwalk.sh.in index 4f6dbdee3ac..a123f8d98cb 100644 --- a/utils/tools/test/h5dwalk/testh5dwalk.sh.in +++ b/utils/tools/test/h5dwalk/testh5dwalk.sh.in @@ -57,11 +57,10 @@ export LD_LIBRARY_PATH=@LL_PATH@ # source dirs SRC_TOOLS="$TOP_DIR/tools/test" -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/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/h5repack/testfiles"