diff options
Diffstat (limited to 'tools/test/misc')
57 files changed, 203 insertions, 59 deletions
diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake index 5e307aa..2f3c62f 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 b4d1a56..9e4f739 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 04c74ec..764778e 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 index 1b9a4e4..1b9a4e4 100644 --- a/tools/test/misc/testfiles/h5clear_equal_after_size.ddl +++ b/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 index 9beed42..9beed42 100644 --- a/tools/test/misc/testfiles/h5clear_equal_before_size.ddl +++ b/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 index 74c8f19..74c8f19 100644 --- a/tools/test/misc/testfiles/h5clear_greater_after_size.ddl +++ b/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 index 03b22fb..03b22fb 100644 --- a/tools/test/misc/testfiles/h5clear_greater_before_size.ddl +++ b/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 index bedf0d2..bedf0d2 100644 --- a/tools/test/misc/testfiles/h5clear_less_after_size.ddl +++ b/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 index 50ba4c4..50ba4c4 100644 --- a/tools/test/misc/testfiles/h5clear_less_before_size.ddl +++ b/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 index c7a2118..c7a2118 100644 --- a/tools/test/misc/testfiles/h5clear_missing_file.ddl +++ b/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 index ea21b76..ea21b76 100644 --- a/tools/test/misc/testfiles/h5clear_missing_file.err +++ b/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 index f5acd71..f5acd71 100644 --- a/tools/test/misc/testfiles/h5clear_no_mdc_image.err +++ b/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 index 7846b47..7846b47 100644 --- a/tools/test/misc/testfiles/h5clear_noclose_after_size.ddl +++ b/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 index f294a6d..f294a6d 100644 --- a/tools/test/misc/testfiles/h5clear_noclose_before_size.ddl +++ b/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 index 895ecd4..895ecd4 100644 --- a/tools/test/misc/testfiles/h5clear_open_fail.err +++ b/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 index 7846b47..7846b47 100644 --- a/tools/test/misc/testfiles/h5clear_status_noclose_after_size.ddl +++ b/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 index c7a2118..c7a2118 100644 --- a/tools/test/misc/testfiles/h5clear_usage.ddl +++ b/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 index 028e134..028e134 100644 --- a/tools/test/misc/testfiles/h5clear_user_equal_after_size.ddl +++ b/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 index ef7c391..ef7c391 100644 --- a/tools/test/misc/testfiles/h5clear_user_equal_before_size.ddl +++ b/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 index 9d7de6f..9d7de6f 100644 --- a/tools/test/misc/testfiles/h5clear_user_greater_after_size.ddl +++ b/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 index c3fe625..c3fe625 100644 --- a/tools/test/misc/testfiles/h5clear_user_greater_before_size.ddl +++ b/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 index 02c0d2a..02c0d2a 100644 --- a/tools/test/misc/testfiles/h5clear_user_less_after_size.ddl +++ b/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 index 0651c2b..0651c2b 100644 --- a/tools/test/misc/testfiles/h5clear_user_less_before_size.ddl +++ b/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 index d01fbee..d01fbee 100644 --- a/tools/test/misc/testfiles/h5mkgrp_help.txt +++ b/tools/test/misc/expected/h5mkgrp_help.txt diff --git a/tools/test/misc/expected/h5mkgrp_nested_lp.ls b/tools/test/misc/expected/h5mkgrp_nested_lp.ls new file mode 100644 index 0000000..1fe8ce8 --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_nested_lp.ls @@ -0,0 +1,13 @@ +Opened "h5mkgrp_nested_lp.h5" with sec2 driver. +/ Group + Location: 1:48 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX +/one Group + Location: 1:195 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX +/one/two Group + Location: 1:342 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX diff --git a/tools/test/misc/expected/h5mkgrp_nested_mult_lp.ls b/tools/test/misc/expected/h5mkgrp_nested_mult_lp.ls new file mode 100644 index 0000000..50380ec --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_nested_mult_lp.ls @@ -0,0 +1,21 @@ +Opened "h5mkgrp_nested_mult_lp.h5" with sec2 driver. +/ Group + Location: 1:48 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX +/one Group + Location: 1:195 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX +/one/two Group + Location: 1:342 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX +/three Group + Location: 1:489 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX +/three/four Group + Location: 1:636 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX diff --git a/tools/test/misc/expected/h5mkgrp_nested_mult_p.ls b/tools/test/misc/expected/h5mkgrp_nested_mult_p.ls new file mode 100644 index 0000000..f2b3b4b --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_nested_mult_p.ls @@ -0,0 +1,16 @@ +Opened "h5mkgrp_nested_mult_p.h5" with sec2 driver. +/ Group + Location: 1:96 + Links: 1 +/one Group + Location: 1:800 + Links: 1 +/one/two Group + Location: 1:1832 + Links: 1 +/three Group + Location: 1:2864 + Links: 1 +/three/four Group + Location: 1:3568 + Links: 1 diff --git a/tools/test/misc/expected/h5mkgrp_nested_p.ls b/tools/test/misc/expected/h5mkgrp_nested_p.ls new file mode 100644 index 0000000..3034dbb --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_nested_p.ls @@ -0,0 +1,10 @@ +Opened "h5mkgrp_nested_p.h5" with sec2 driver. +/ Group + Location: 1:96 + Links: 1 +/one Group + Location: 1:800 + Links: 1 +/one/two Group + Location: 1:1832 + Links: 1 diff --git a/tools/test/misc/expected/h5mkgrp_several.ls b/tools/test/misc/expected/h5mkgrp_several.ls new file mode 100644 index 0000000..68a3f9c --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_several.ls @@ -0,0 +1,10 @@ +Opened "h5mkgrp_several.h5" with sec2 driver. +/ Group + Location: 1:96 + Links: 1 +/one Group + Location: 1:800 + Links: 1 +/two Group + Location: 1:1832 + Links: 1 diff --git a/tools/test/misc/expected/h5mkgrp_several_l.ls b/tools/test/misc/expected/h5mkgrp_several_l.ls new file mode 100644 index 0000000..5e1b4be --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_several_l.ls @@ -0,0 +1,13 @@ +Opened "h5mkgrp_several_l.h5" with sec2 driver. +/ Group + Location: 1:48 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX +/one Group + Location: 1:195 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX +/two Group + Location: 1:342 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX diff --git a/tools/test/misc/expected/h5mkgrp_several_p.ls b/tools/test/misc/expected/h5mkgrp_several_p.ls new file mode 100644 index 0000000..43f1ce5 --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_several_p.ls @@ -0,0 +1,10 @@ +Opened "h5mkgrp_several_p.h5" with sec2 driver. +/ Group + Location: 1:96 + Links: 1 +/one Group + Location: 1:800 + Links: 1 +/two Group + Location: 1:1832 + Links: 1 diff --git a/tools/test/misc/expected/h5mkgrp_several_v.ls b/tools/test/misc/expected/h5mkgrp_several_v.ls new file mode 100644 index 0000000..a6df87b --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_several_v.ls @@ -0,0 +1,10 @@ +Opened "h5mkgrp_several_v.h5" with sec2 driver. +/ Group + Location: 1:96 + Links: 1 +/one Group + Location: 1:800 + Links: 1 +/two Group + Location: 1:1832 + Links: 1 diff --git a/tools/test/misc/expected/h5mkgrp_single.ls b/tools/test/misc/expected/h5mkgrp_single.ls new file mode 100644 index 0000000..f2bd01c --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_single.ls @@ -0,0 +1,7 @@ +Opened "h5mkgrp_single.h5" with sec2 driver. +/ Group + Location: 1:96 + Links: 1 +/single Group + Location: 1:800 + Links: 1 diff --git a/tools/test/misc/expected/h5mkgrp_single_l.ls b/tools/test/misc/expected/h5mkgrp_single_l.ls new file mode 100644 index 0000000..1763a61 --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_single_l.ls @@ -0,0 +1,9 @@ +Opened "h5mkgrp_single_l.h5" with sec2 driver. +/ Group + Location: 1:48 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX +/latest Group + Location: 1:195 + Links: 1 + Modified: XXXX-XX-XX XX:XX:XX XXX diff --git a/tools/test/misc/expected/h5mkgrp_single_p.ls b/tools/test/misc/expected/h5mkgrp_single_p.ls new file mode 100644 index 0000000..e82dc31 --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_single_p.ls @@ -0,0 +1,7 @@ +Opened "h5mkgrp_single_p.h5" with sec2 driver. +/ Group + Location: 1:96 + Links: 1 +/single Group + Location: 1:800 + Links: 1 diff --git a/tools/test/misc/expected/h5mkgrp_single_v.ls b/tools/test/misc/expected/h5mkgrp_single_v.ls new file mode 100644 index 0000000..7360865 --- /dev/null +++ b/tools/test/misc/expected/h5mkgrp_single_v.ls @@ -0,0 +1,7 @@ +Opened "h5mkgrp_single_v.h5" with sec2 driver. +/ Group + Location: 1:96 + Links: 1 +/single Group + Location: 1:800 + Links: 1 diff --git a/tools/test/misc/testfiles/family_file00000.h5 b/tools/test/misc/testfiles/family_file00000.h5 Binary files differnew file mode 100644 index 0000000..88f75ca --- /dev/null +++ b/tools/test/misc/testfiles/family_file00000.h5 diff --git a/tools/test/misc/testfiles/family_file00001.h5 b/tools/test/misc/testfiles/family_file00001.h5 Binary files differnew file mode 100644 index 0000000..0da088e --- /dev/null +++ b/tools/test/misc/testfiles/family_file00001.h5 diff --git a/tools/test/misc/testfiles/family_file00002.h5 b/tools/test/misc/testfiles/family_file00002.h5 Binary files differnew file mode 100644 index 0000000..c458a23 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00002.h5 diff --git a/tools/test/misc/testfiles/family_file00003.h5 b/tools/test/misc/testfiles/family_file00003.h5 Binary files differnew file mode 100644 index 0000000..7e98035 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00003.h5 diff --git a/tools/test/misc/testfiles/family_file00004.h5 b/tools/test/misc/testfiles/family_file00004.h5 Binary files differnew file mode 100644 index 0000000..cf6f4905 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00004.h5 diff --git a/tools/test/misc/testfiles/family_file00005.h5 b/tools/test/misc/testfiles/family_file00005.h5 Binary files differnew file mode 100644 index 0000000..864564a --- /dev/null +++ b/tools/test/misc/testfiles/family_file00005.h5 diff --git a/tools/test/misc/testfiles/family_file00006.h5 b/tools/test/misc/testfiles/family_file00006.h5 Binary files differnew file mode 100644 index 0000000..9cc2693 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00006.h5 diff --git a/tools/test/misc/testfiles/family_file00007.h5 b/tools/test/misc/testfiles/family_file00007.h5 Binary files differnew file mode 100644 index 0000000..a0f0043 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00007.h5 diff --git a/tools/test/misc/testfiles/family_file00008.h5 b/tools/test/misc/testfiles/family_file00008.h5 Binary files differnew file mode 100644 index 0000000..eec73e0 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00008.h5 diff --git a/tools/test/misc/testfiles/family_file00009.h5 b/tools/test/misc/testfiles/family_file00009.h5 Binary files differnew file mode 100644 index 0000000..b28cf90 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00009.h5 diff --git a/tools/test/misc/testfiles/family_file00010.h5 b/tools/test/misc/testfiles/family_file00010.h5 Binary files differnew file mode 100644 index 0000000..fe1a620 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00010.h5 diff --git a/tools/test/misc/testfiles/family_file00011.h5 b/tools/test/misc/testfiles/family_file00011.h5 Binary files differnew file mode 100644 index 0000000..4e5d9e4 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00011.h5 diff --git a/tools/test/misc/testfiles/family_file00012.h5 b/tools/test/misc/testfiles/family_file00012.h5 Binary files differnew file mode 100644 index 0000000..c70b87e --- /dev/null +++ b/tools/test/misc/testfiles/family_file00012.h5 diff --git a/tools/test/misc/testfiles/family_file00013.h5 b/tools/test/misc/testfiles/family_file00013.h5 Binary files differnew file mode 100644 index 0000000..b181df8 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00013.h5 diff --git a/tools/test/misc/testfiles/family_file00014.h5 b/tools/test/misc/testfiles/family_file00014.h5 Binary files differnew file mode 100644 index 0000000..74867f1 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00014.h5 diff --git a/tools/test/misc/testfiles/family_file00015.h5 b/tools/test/misc/testfiles/family_file00015.h5 Binary files differnew file mode 100644 index 0000000..de984c2 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00015.h5 diff --git a/tools/test/misc/testfiles/family_file00016.h5 b/tools/test/misc/testfiles/family_file00016.h5 Binary files differnew file mode 100644 index 0000000..810cf34 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00016.h5 diff --git a/tools/test/misc/testfiles/family_file00017.h5 b/tools/test/misc/testfiles/family_file00017.h5 Binary files differnew file mode 100644 index 0000000..9171ab9 --- /dev/null +++ b/tools/test/misc/testfiles/family_file00017.h5 diff --git a/tools/test/misc/testh5clear.sh.in b/tools/test/misc/testh5clear.sh.in index 018d1fd..b5bf5cc 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 d581fe1..676f6b0 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 b0d52f6..addd0db 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 |