Skip to content

Commit 6beb047

Browse files
mattjalamattjala
authored
Move tool testfiles to shared folder (#5597)
* Maintain tool testfile division in build folders * Add h5dump reference files to shared folder * Fix testfile path for java * Remove unused filter
1 parent f2d2d45 commit 6beb047

File tree

387 files changed

+74
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

387 files changed

+74
-66
lines changed

‎java/test/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_
104104
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateL2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
105105
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateO1.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
106106
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateO2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
107-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
108-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
109-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
110-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
111-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
112-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
107+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
108+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
109+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
110+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
111+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
112+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
113113

114114
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})
115115

‎tools/test/h5copy/CMakeTests.cmake

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
# Copy all the HDF5 files from the source directory into the test directory
2121
# --------------------------------------------------------------------
2222
set (LIST_HDF5_TEST_FILES
23-
h5copy_extlinks_src.h5
24-
h5copy_extlinks_trg.h5
25-
h5copy_ref.h5
26-
h5copytst.h5
27-
tudfilter.h5
28-
tudfilter2.h5
23+
h5copy_extlinks_src.h5
24+
h5copy_extlinks_trg.h5
25+
h5copy_ref.h5
26+
h5copytst.h5
27+
tudfilter.h5
28+
tudfilter2.h5
2929
)
3030

3131
set (LIST_OTHER_TEST_FILES
@@ -40,14 +40,15 @@
4040

4141
file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
4242

43+
4344
foreach (listfiles ${LIST_HDF5_TEST_FILES})
44-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5copy_files")
45+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5copy_files")
4546
endforeach ()
4647

4748
foreach (listothers ${LIST_OTHER_TEST_FILES})
4849
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/${listothers}" "h5copy_files")
4950
endforeach ()
50-
add_custom_target(h5copy_files ALL COMMENT "Copying files needed by h5copy tests" DEPENDS ${h5copy_files_list})
51+
add_custom_target(h5copy_files ALL COMMENT "Copying files needed by h5copy tests" DEPENDS ${h5copy_files_list})
5152

5253
##############################################################################
5354
##############################################################################

‎tools/test/h5diff/CMakeTests.cmake

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -336,21 +336,21 @@
336336
# copy test files from source to build dir
337337
#
338338
foreach (h5_tstfiles ${LIST_DIFF_TEST_FILES})
339-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
339+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
340340
if (H5_HAVE_PARALLEL)
341-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
341+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
342342
endif ()
343343
endforeach ()
344344
foreach (h5_tstfiles ${LIST_VDS_TEST_FILES})
345-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
345+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
346346
if (H5_HAVE_PARALLEL)
347-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
347+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
348348
endif ()
349349
endforeach ()
350350
foreach (h5_tstfiles ${LIST_HDF5_TEST_FILES})
351-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
351+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
352352
if (H5_HAVE_PARALLEL)
353-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
353+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
354354
endif ()
355355
endforeach ()
356356
foreach (h5_tstfiles ${LIST_OTHER_TEST_FILES})
@@ -360,9 +360,9 @@
360360
endif ()
361361
endforeach ()
362362
# copy second version of tvlstr.h5
363-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files")
363+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files")
364364
if (H5_HAVE_PARALLEL)
365-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files")
365+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files")
366366
endif ()
367367

368368

‎tools/test/h5diff/testfiles/tudfilter.h5

-4.7 KB
Binary file not shown.

‎tools/test/h5diff/testfiles/tudfilter2.h5

-4.7 KB
Binary file not shown.

‎tools/test/h5dump/CMakeTests.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384
# copy test files from source dir to test dir
385385
#
386386
foreach (tst_h5_file ${HDF5_REFERENCE_TEST_FILES})
387-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${tst_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5_file}" "h5dump_std_files")
387+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${tst_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5_file}" "h5dump_std_files")
388388
endforeach ()
389389

390390
foreach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES})

‎tools/test/h5dump/CMakeTestsPBITS.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
)
8383

8484
foreach (pbits_h5_file ${HDF5_REFERENCE_TEST_PBITS})
85-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${pbits_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${pbits_h5_file}" "h5dump_pbits_files")
85+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${pbits_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${pbits_h5_file}" "h5dump_pbits_files")
8686
endforeach ()
8787

8888
foreach (ddl_pbits ${HDF5_REFERENCE_PBITS})

‎tools/test/h5dump/CMakeTestsVDS.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@
8282
)
8383

8484
foreach (vds_h5_file ${HDF5_REFERENCE_TEST_VDS})
85-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/${vds_h5_file}" "h5dump_vds_files")
85+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/${vds_h5_file}" "h5dump_vds_files")
8686
endforeach ()
8787

8888
foreach (vds_h5_file ${HDF5_REFERENCE_PREFIX_VDS})
89-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${vds_h5_file}" "h5dump_vds_files")
89+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${vds_h5_file}" "h5dump_vds_files")
9090
endforeach ()
9191

9292
foreach (ddl_vds ${HDF5_REFERENCE_VDS})

‎tools/test/h5dump/CMakeTestsXML.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@
151151
)
152152

153153
foreach (tst_xml_h5_file ${HDF5_XML_REFERENCE_TEST_FILES})
154-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${tst_xml_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xml_h5_file}" "h5dump_xml_files")
154+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${tst_xml_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xml_h5_file}" "h5dump_xml_files")
155155
endforeach ()
156156

157157
foreach (tst_xmlonly_h5_file ${HDF5_XML_REFERENCE_ONLY_FILES})
158-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "h5dump_xml_files")
158+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "h5dump_xml_files")
159159
endforeach ()
160160

161161
foreach (tst_xml_other_file ${HDF5_XML_REFERENCE_FILES})

‎tools/test/h5dump/testfiles/tudfilter.h5

-4.7 KB
Binary file not shown.

‎tools/test/h5format_convert/CMakeTests.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
endforeach ()
8585

8686
foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
87-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
87+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
8888
endforeach ()
8989
add_custom_target(h5fc_files ALL COMMENT "Copying files needed by h5fc tests" DEPENDS ${h5fc_files_list})
9090

@@ -104,7 +104,7 @@
104104
if (${testfile})
105105
add_test (
106106
NAME H5FC-${testname}-${testfile}-tmpfile
107-
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5
107+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TST_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5
108108
)
109109
set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES
110110
DEPENDS H5FC-${testname}-${testfile}-clear-objects
@@ -168,7 +168,7 @@
168168
)
169169
add_test (
170170
NAME H5FC-${testname}-${testfile}-tmpfile
171-
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5
171+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TST_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5
172172
)
173173
set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES
174174
DEPENDS H5FC-${testname}-${testfile}-clear-object
@@ -210,7 +210,7 @@
210210
)
211211
add_test (
212212
NAME H5FC-${testname}-${testfile}-tmpfile
213-
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5
213+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TST_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5
214214
)
215215
set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES
216216
DEPENDS H5FC-${testname}-${testfile}-clear-objects
@@ -265,7 +265,7 @@
265265
)
266266
add_test (
267267
NAME H5FC-${testname}-tmpfile
268-
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5
268+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TST_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5
269269
)
270270
set_tests_properties (H5FC-${testname}-tmpfile PROPERTIES
271271
FIXTURES_REQUIRED clear_H5FC-${testname}
@@ -319,7 +319,7 @@
319319
)
320320
add_test (
321321
NAME H5FC_TEST_CHECK_IDX-${testname}-tmpfile
322-
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5
322+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TST_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5
323323
)
324324
set_tests_properties (H5FC_TEST_CHECK_IDX-${testname}-tmpfile PROPERTIES
325325
DEPENDS "H5FC_TEST_CHECK_IDX-${testname}-clear-objects"
@@ -373,7 +373,7 @@
373373
)
374374
add_test (
375375
NAME H5FC_H5DUMP_CHECK-${testname}-tmpfile
376-
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testname}.h5 ./testfiles/${testname}-tmp.h5
376+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TST_DIR}/testfiles/${testname}.h5 ./testfiles/${testname}-tmp.h5
377377
)
378378
set_tests_properties (H5FC_H5DUMP_CHECK-${testname}-tmpfile PROPERTIES
379379
DEPENDS "H5FC_H5DUMP_CHECK-${testname}-clear-objects"

‎tools/test/h5import/CMakeTests.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@
8888
endforeach ()
8989

9090
foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
91-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
91+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
9292
endforeach ()
9393

9494
foreach (h5_file ${HDF5_TOOLS_TEST_FILES})
95-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
95+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
9696
endforeach ()
9797
add_custom_target(h5import_files ALL COMMENT "Copying files needed by h5import tests" DEPENDS ${h5import_files_list})
9898

‎tools/test/h5jam/CMakeTests.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
3535
foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
36-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files")
36+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files")
3737
endforeach ()
3838

3939
foreach (txt_file ${HDF5_REFERENCE_TXT_FILES})
@@ -157,7 +157,7 @@
157157
)
158158
add_test (
159159
NAME H5JAM-${testname}-UNJAM-SETUP
160-
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/testfiles/${setfile} ${PROJECT_BINARY_DIR}/${infile}
160+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TST_DIR}/testfiles/${setfile} ${PROJECT_BINARY_DIR}/${infile}
161161
)
162162
set_tests_properties (H5JAM-${testname}-UNJAM-SETUP PROPERTIES DEPENDS H5JAM-${testname}-UNJAM-SETUP-clear-objects)
163163
add_test (

‎tools/test/h5jam/testfiles/tall.h5

-9.73 KB
Binary file not shown.

‎tools/test/h5ls/CMakeTests.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@
132132

133133
# copy the list of test files
134134
foreach (listlsfiles ${LIST_HDF5_TESTLS_FILES})
135-
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${listlsfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listlsfiles}" "h5ls_files")
135+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${listlsfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listlsfiles}" "h5ls_files")
136136
endforeach ()
137137
foreach (listfiles ${LIST_HDF5_TEST_FILES})
138-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5ls_files")
138+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5ls_files")
139139
endforeach ()
140140
foreach (listothers ${LIST_OTHER_TEST_FILES})
141141
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/${listothers}" "h5ls_files")

‎tools/test/h5ls/CMakeTestsVDS.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@
5858

5959
# copy the list of test files
6060
foreach (listfiles ${LIST_HDF5_TEST_FILES})
61-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/${listfiles}" "h5ls_vds_files")
61+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/${listfiles}" "h5ls_vds_files")
6262
endforeach ()
6363

6464
foreach (listothers ${LIST_OTHER_TEST_FILES})
6565
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/vds/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/vds/${listothers}" "h5ls_vds_files")
6666
endforeach ()
6767

6868
foreach (listfiles ${LIST_HDF5_TEST_FILES})
69-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${listfiles}" "h5ls_vds_files")
69+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${listfiles}" "h5ls_vds_files")
7070
endforeach ()
7171

7272
foreach (listothers ${LIST_OTHER_TEST_FILES})

‎tools/test/h5repack/CMakeTests.cmake

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,36 @@
1919
# --------------------------------------------------------------------
2020
# Copy all the HDF5 files from the source directory into the test directory
2121
# --------------------------------------------------------------------
22-
set (LIST_REPACK_TEST_FILES
22+
set(LIST_REPACK_TEST_FILES
23+
h5repack_f32le_ex-0.dat
24+
h5repack_int32le_1d_ex-0.dat
25+
h5repack_int32le_1d_ex-1.dat
26+
h5repack_int32le_2d_ex-0.dat
27+
h5repack_int32le_3d_ex-0.dat
28+
h5repack_uint8be_ex-0.dat
29+
h5repack_uint8be_ex-1.dat
30+
h5repack_uint8be_ex-2.dat
31+
h5repack_uint8be_ex-3.dat
32+
)
33+
34+
set (LIST_REPACK_HDF5_TEST_FILES
2335
bounds_latest_latest.h5
2436
h5repack_attr.h5
2537
h5repack_attr_refs.h5
2638
h5repack_deflate.h5
2739
h5repack_early.h5
2840
h5repack_ext.h5
2941
h5repack_f32le.h5
30-
h5repack_f32le_ex-0.dat
3142
h5repack_f32le_ex.h5
3243
h5repack_fill.h5
3344
h5repack_filters.h5
3445
h5repack_fletcher.h5
3546
h5repack_hlink.h5
3647
h5repack_int32le_1d.h5
37-
h5repack_int32le_1d_ex-0.dat
38-
h5repack_int32le_1d_ex-1.dat
3948
h5repack_int32le_1d_ex.h5
4049
h5repack_int32le_2d.h5
41-
h5repack_int32le_2d_ex-0.dat
4250
h5repack_int32le_2d_ex.h5
4351
h5repack_int32le_3d.h5
44-
h5repack_int32le_3d_ex-0.dat
4552
h5repack_int32le_3d_ex.h5
4653
h5repack_layout.h5
4754
h5repack_layouto.h5
@@ -60,10 +67,6 @@
6067
h5repack_soffset.h5
6168
h5repack_szip.h5
6269
h5repack_uint8be.h5
63-
h5repack_uint8be_ex-0.dat
64-
h5repack_uint8be_ex-1.dat
65-
h5repack_uint8be_ex-2.dat
66-
h5repack_uint8be_ex-3.dat
6770
h5repack_uint8be_ex.h5
6871
# fsm
6972
h5repack_aggr.h5
@@ -207,24 +210,28 @@
207210
h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
208211
)
209212

210-
foreach (h5_file ${LIST_REPACK_TEST_FILES})
213+
foreach (h5_file ${LIST_REPACK_HDF5_TEST_FILES})
214+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
215+
endforeach ()
216+
217+
foreach(h5_file ${LIST_REPACK_TEST_FILES})
211218
HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
212219
endforeach ()
213220

214221
foreach (h5_file ${LIST_COPY_TEST_FILES})
215-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5copy/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
222+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
216223
endforeach ()
217224

218225
foreach (h5_file ${LIST_DIFF_TEST_FILES})
219-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5diff/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
226+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
220227
endforeach ()
221228

222229
foreach (h5_file ${LIST_VDS_TEST_FILES})
223-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
230+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/vds/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
224231
endforeach ()
225232

226233
foreach (h5_file ${LIST_HDF5_TEST_FILES})
227-
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
234+
HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
228235
endforeach ()
229236

230237
foreach (h5_file ${LIST_OTHER_TEST_FILES})

0 commit comments

Comments
 (0)