Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop tools move #3580

Merged
merged 15 commits into from
Sep 26, 2023
Merged

Develop tools move #3580

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
71bf84d
Refactor the testfiles for tools
byrnHDF Sep 21, 2023
3ef389e
Adjust autotools paths for testing
byrnHDF Sep 21, 2023
9538a0f
Add the "testfiles" dir to the path to append test names
byrnHDF Sep 21, 2023
5a6bc60
Adjust strlen
byrnHDF Sep 21, 2023
bcb46fb
Fix some more autotools test paths
byrnHDF Sep 21, 2023
8abea98
Update autotools paths
byrnHDF Sep 22, 2023
feb38fe
Correct paths in two more scripts
byrnHDF Sep 22, 2023
ed524a7
Add missing VOL testfiles in copy path
byrnHDF Sep 22, 2023
c7dd68a
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Sep 22, 2023
bf79203
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Sep 22, 2023
c73a65f
Correct folder var name
byrnHDF Sep 25, 2023
f722f6d
Use last_test depends logic because of identical ref files
byrnHDF Sep 25, 2023
af6c57a
Spelling
byrnHDF Sep 25, 2023
4d78d92
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Sep 26, 2023
79e0f2f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion CMakeInstallation.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion hl/test/CMakeTests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
0 hl/test/dsdata.txt → hl/test/testfiles/dsdata.txt
View file
Open in desktop
File renamed without changes.
0 hl/test/dslat.txt → hl/test/testfiles/dslat.txt
View file
Open in desktop
File renamed without changes.
0 hl/test/dslon.txt → hl/test/testfiles/dslon.txt
View file
Open in desktop
File renamed without changes.
0 hl/test/dtype_file.txt → hl/test/testfiles/dtype_file.txt
View file
Open in desktop
File renamed without changes.
0 hl/test/dtype_file_readable.txt → hl/test/testfiles/dtype_file_readable.txt
View file
Open in desktop
File renamed without changes.
0 hl/test/earth.pal → hl/test/testfiles/earth.pal
View file
Open in desktop
File renamed without changes.
0 hl/test/image24pixel.txt → hl/test/testfiles/image24pixel.txt
View file
Open in desktop
File renamed without changes.
0 hl/test/image24plane.txt → hl/test/testfiles/image24plane.txt
View file
Open in desktop
File renamed without changes.
0 hl/test/image8.txt → hl/test/testfiles/image8.txt
View file
Open in desktop
File renamed without changes.
0 hl/test/sepia.pal → hl/test/testfiles/sepia.pal
View file
Open in desktop
File renamed without changes.
0 hl/test/test_ds_be.h5 → hl/test/testfiles/test_ds_be.h5
View file
Open in desktop
File renamed without changes.
0 hl/test/test_ds_be_new_ref-32bit.h5 → ...est/testfiles/test_ds_be_new_ref-32bit.h5
View file
Open in desktop
File renamed without changes.
0 hl/test/test_ds_be_new_ref.h5 → hl/test/testfiles/test_ds_be_new_ref.h5
View file
Open in desktop
File renamed without changes.
0 hl/test/test_ds_le.h5 → hl/test/testfiles/test_ds_le.h5
View file
Open in desktop
File renamed without changes.
0 hl/test/test_ds_le_new_ref.h5 → hl/test/testfiles/test_ds_le_new_ref.h5
View file
Open in desktop
File renamed without changes.
0 hl/test/test_ld.h5 → hl/test/testfiles/test_ld.h5
View file
Open in desktop
File renamed without changes.
0 hl/test/test_table_be.h5 → hl/test/testfiles/test_table_be.h5
View file
Open in desktop
File renamed without changes.
0 hl/test/test_table_cray.h5 → hl/test/testfiles/test_table_cray.h5
View file
Open in desktop
File renamed without changes.
0 hl/test/test_table_le.h5 → hl/test/testfiles/test_table_le.h5
View file
Open in desktop
File renamed without changes.
0 hl/test/usa.wri → hl/test/testfiles/usa.wri
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions hl/tools/gif2h5/CMakeTests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hl/tools/h5watch/CMakeTests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
0 hl/tools/testfiles/w-err-cmpd1.err → hl/tools/h5watch/testfiles/w-err-cmpd1.err
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-cmpd2.err → hl/tools/h5watch/testfiles/w-err-cmpd2.err
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-cmpd3.err → hl/tools/h5watch/testfiles/w-err-cmpd3.err
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-cmpd4.err → hl/tools/h5watch/testfiles/w-err-cmpd4.err
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-cmpd5.err → hl/tools/h5watch/testfiles/w-err-cmpd5.err
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-dset-nomax.err → ...ls/h5watch/testfiles/w-err-dset-nomax.err
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-dset-none.err → ...ols/h5watch/testfiles/w-err-dset-none.err
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-dset1.err → hl/tools/h5watch/testfiles/w-err-dset1.err
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-dset2.err → hl/tools/h5watch/testfiles/w-err-dset2.err
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-file.err → hl/tools/h5watch/testfiles/w-err-file.err
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-poll.ddl → hl/tools/h5watch/testfiles/w-err-poll.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-poll0.ddl → hl/tools/h5watch/testfiles/w-err-poll0.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-std.ddl → hl/tools/h5watch/testfiles/w-err-std.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-err-width.ddl → hl/tools/h5watch/testfiles/w-err-width.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl → ...s/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl → ...s/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl → .../h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-esc.ddl → ...ools/h5watch/testfiles/w-ext-cmpd-esc.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-f1.ddl → hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-f2.ddl → hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-ff3.ddl → ...ools/h5watch/testfiles/w-ext-cmpd-ff3.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-label.ddl → ...ls/h5watch/testfiles/w-ext-cmpd-label.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-two-f1.ddl → ...s/h5watch/testfiles/w-ext-cmpd-two-f1.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-two-f3.ddl → ...s/h5watch/testfiles/w-ext-cmpd-two-f3.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl → .../h5watch/testfiles/w-ext-cmpd-two-ff2.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd-two.ddl → ...ools/h5watch/testfiles/w-ext-cmpd-two.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-cmpd.ddl → hl/tools/h5watch/testfiles/w-ext-cmpd.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-early.ddl → hl/tools/h5watch/testfiles/w-ext-early.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-late.ddl → hl/tools/h5watch/testfiles/w-ext-late.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-one-d.ddl → hl/tools/h5watch/testfiles/w-ext-one-d.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-one-simple.ddl → ...ls/h5watch/testfiles/w-ext-one-simple.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-one.ddl → hl/tools/h5watch/testfiles/w-ext-one.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-two-d.ddl → hl/tools/h5watch/testfiles/w-ext-two-d.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-two-width.ddl → ...ols/h5watch/testfiles/w-ext-two-width.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-ext-two.ddl → hl/tools/h5watch/testfiles/w-ext-two.ddl
View file
Open in desktop
File renamed without changes.
0 hl/tools/testfiles/w-help1.ddl → hl/tools/h5watch/testfiles/w-help1.ddl
View file
Open in desktop
File renamed without changes.
20 changes: 10 additions & 10 deletions hl/tools/h5watch/testh5watch.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions java/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down Expand Up @@ -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})

Expand Down
14 changes: 7 additions & 7 deletions java/test/junit.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
10 changes: 5 additions & 5 deletions test/CMakePassthroughVOLTests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" "${HDF5_TEST_BINARY_DIR}/${voltest}/${h5_file}" "HDF5_VOLTEST_LIB_files")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be PROJECT_BINARY_DIR instead of HDF5_TEST_BINARY_DIR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it, since all the others use PROJECT_BINARY_DIR.

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 ()

Expand Down
13 changes: 5 additions & 8 deletions test/CMakeTests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ()

# --------------------------------------------------------------------
Expand Down Expand Up @@ -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 ()

# --------------------------------------------------------------------
Expand Down Expand Up @@ -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})
Expand Down
10 changes: 5 additions & 5 deletions test/CMakeVFDTests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()

Expand Down
Loading