diff options
Diffstat (limited to 'hl/tools/h5watch')
40 files changed, 292 insertions, 18 deletions
diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake index a7828b3..7c1a7f5 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/h5watch/extend_dset.c b/hl/tools/h5watch/extend_dset.c index 443a759..abba782 100644 --- a/hl/tools/h5watch/extend_dset.c +++ b/hl/tools/h5watch/extend_dset.c @@ -403,8 +403,8 @@ main(int argc, char *argv[]) } /* end if */ /* Get the dataset name to be extended */ - fname = HDstrdup(argv[1]); - dname = HDstrdup(argv[2]); + fname = strdup(argv[1]); + dname = strdup(argv[2]); action1 = atoi(argv[3]); action2 = atoi(argv[4]); diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c index 876b5d5..2e6071c 100644 --- a/hl/tools/h5watch/h5watch.c +++ b/hl/tools/h5watch/h5watch.c @@ -430,7 +430,7 @@ process_cmpd_fields(hid_t fid, char *dsetname) } /* Make a copy of "g_list_of_fields" */ - if ((g_dup_fields = HDstrdup(g_list_of_fields)) == NULL) { + if ((g_dup_fields = strdup(g_list_of_fields)) == NULL) { error_msg("error in duplicating g_list_of_fields\n"); ret_value = FAIL; goto done; @@ -703,7 +703,7 @@ parse_command_line(int argc, const char *const *argv) case 'f': /* --fields=<list_of_fields> */ if (g_list_of_fields == NULL) { - if ((g_list_of_fields = HDstrdup(H5_optarg)) == NULL) { + if ((g_list_of_fields = strdup(H5_optarg)) == NULL) { error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__); leave(EXIT_FAILURE); } @@ -711,7 +711,7 @@ parse_command_line(int argc, const char *const *argv) else { char *str; - if ((str = HDstrdup(H5_optarg)) == NULL) { + if ((str = strdup(H5_optarg)) == NULL) { error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__); leave(EXIT_FAILURE); } @@ -823,7 +823,7 @@ main(int argc, char *argv[]) * then there must have been something wrong with the file (perhaps it * doesn't exist). */ - if ((fname = HDstrdup(argv[H5_optind])) == NULL) { + if ((fname = strdup(argv[H5_optind])) == NULL) { error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__); h5tools_setstatus(EXIT_FAILURE); goto done; @@ -877,7 +877,7 @@ main(int argc, char *argv[]) else { *dname = '/'; x = dname; - if ((dname = HDstrdup(dname)) == NULL) { + if ((dname = strdup(dname)) == NULL) { error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__); h5tools_setstatus(EXIT_FAILURE); goto done; diff --git a/hl/tools/h5watch/testfiles/w-err-cmpd1.err b/hl/tools/h5watch/testfiles/w-err-cmpd1.err new file mode 100644 index 0000000..9c165fb --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-cmpd1.err @@ -0,0 +1 @@ +h5watch error: error in processing <list_of_fields> diff --git a/hl/tools/h5watch/testfiles/w-err-cmpd2.err b/hl/tools/h5watch/testfiles/w-err-cmpd2.err new file mode 100644 index 0000000..9c165fb --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-cmpd2.err @@ -0,0 +1 @@ +h5watch error: error in processing <list_of_fields> diff --git a/hl/tools/h5watch/testfiles/w-err-cmpd3.err b/hl/tools/h5watch/testfiles/w-err-cmpd3.err new file mode 100644 index 0000000..9c165fb --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-cmpd3.err @@ -0,0 +1 @@ +h5watch error: error in processing <list_of_fields> diff --git a/hl/tools/h5watch/testfiles/w-err-cmpd4.err b/hl/tools/h5watch/testfiles/w-err-cmpd4.err new file mode 100644 index 0000000..9c165fb --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-cmpd4.err @@ -0,0 +1 @@ +h5watch error: error in processing <list_of_fields> diff --git a/hl/tools/h5watch/testfiles/w-err-cmpd5.err b/hl/tools/h5watch/testfiles/w-err-cmpd5.err new file mode 100644 index 0000000..9c165fb --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-cmpd5.err @@ -0,0 +1 @@ +h5watch error: error in processing <list_of_fields> diff --git a/hl/tools/h5watch/testfiles/w-err-dset-nomax.err b/hl/tools/h5watch/testfiles/w-err-dset-nomax.err new file mode 100644 index 0000000..fd5ca7e --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-dset-nomax.err @@ -0,0 +1 @@ +h5watch error: "/DSET_NOMAX" should have unlimited or max. dimension setting diff --git a/hl/tools/h5watch/testfiles/w-err-dset-none.err b/hl/tools/h5watch/testfiles/w-err-dset-none.err new file mode 100644 index 0000000..db781c3 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-dset-none.err @@ -0,0 +1 @@ +h5watch error: "/DSET_NONE" should be a chunked or virtual dataset diff --git a/hl/tools/h5watch/testfiles/w-err-dset1.err b/hl/tools/h5watch/testfiles/w-err-dset1.err new file mode 100644 index 0000000..d6b2a6e --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-dset1.err @@ -0,0 +1 @@ +h5watch error: no dataset specified diff --git a/hl/tools/h5watch/testfiles/w-err-dset2.err b/hl/tools/h5watch/testfiles/w-err-dset2.err new file mode 100644 index 0000000..3f77ec8 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-dset2.err @@ -0,0 +1 @@ +h5watch error: unable to open dataset "/group/DSET_CMPD" diff --git a/hl/tools/h5watch/testfiles/w-err-file.err b/hl/tools/h5watch/testfiles/w-err-file.err new file mode 100644 index 0000000..015661f --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-file.err @@ -0,0 +1 @@ +h5watch error: unable to open file "../WATCH.h5/DSET_CMPD" diff --git a/hl/tools/h5watch/testfiles/w-err-poll.ddl b/hl/tools/h5watch/testfiles/w-err-poll.ddl new file mode 100644 index 0000000..e6510f2 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-poll.ddl @@ -0,0 +1,35 @@ +Usage: h5watch [OPTIONS] [OBJECT] + + OPTIONS + --help Print a usage message and exit. + --version Print version number and exit. + --label Label members of compound typed dataset. + --simple Use a machine-readable output format. + --dim Monitor changes in size of dataset dimensions only. + --width=N Set the number of columns to N for output. + A value of 0 sets the number of columns to the + maximum (65535). The default width is 80 columns. + --polling=N Set the polling interval to N (in seconds) when the + dataset will be checked for appended data. The default + polling interval is 1. + --fields=<list_of_fields> + Display data for the fields specified in <list_of_fields> + for a compound data type. <list_of_fields> can be + specified as follows: + 1) A comma-separated list of field names in a + compound data type. "," is the separator + for field names while "." is the separator + for a nested field. + 2) A single field name in a compound data type. + Can use this option multiple times. + Note that backslash is the escape character to avoid + characters in field names that conflict with the tool's + separators. + + OBJECT is specified as [<filename>/<path_to_dataset>/<dsetname>] + <filename> Name of the HDF5 file. It may be preceded by path + separated by slashes to the specified HDF5 file. + <path_to_dataset> Path separated by slashes to the specified dataset + <dsetname> Name of the dataset + + User can end the h5watch process by ctrl-C (SIGINT) or kill the process (SIGTERM). diff --git a/hl/tools/h5watch/testfiles/w-err-poll0.ddl b/hl/tools/h5watch/testfiles/w-err-poll0.ddl new file mode 100644 index 0000000..e6510f2 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-poll0.ddl @@ -0,0 +1,35 @@ +Usage: h5watch [OPTIONS] [OBJECT] + + OPTIONS + --help Print a usage message and exit. + --version Print version number and exit. + --label Label members of compound typed dataset. + --simple Use a machine-readable output format. + --dim Monitor changes in size of dataset dimensions only. + --width=N Set the number of columns to N for output. + A value of 0 sets the number of columns to the + maximum (65535). The default width is 80 columns. + --polling=N Set the polling interval to N (in seconds) when the + dataset will be checked for appended data. The default + polling interval is 1. + --fields=<list_of_fields> + Display data for the fields specified in <list_of_fields> + for a compound data type. <list_of_fields> can be + specified as follows: + 1) A comma-separated list of field names in a + compound data type. "," is the separator + for field names while "." is the separator + for a nested field. + 2) A single field name in a compound data type. + Can use this option multiple times. + Note that backslash is the escape character to avoid + characters in field names that conflict with the tool's + separators. + + OBJECT is specified as [<filename>/<path_to_dataset>/<dsetname>] + <filename> Name of the HDF5 file. It may be preceded by path + separated by slashes to the specified HDF5 file. + <path_to_dataset> Path separated by slashes to the specified dataset + <dsetname> Name of the dataset + + User can end the h5watch process by ctrl-C (SIGINT) or kill the process (SIGTERM). diff --git a/hl/tools/h5watch/testfiles/w-err-std.ddl b/hl/tools/h5watch/testfiles/w-err-std.ddl new file mode 100644 index 0000000..775d6a0 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-std.ddl @@ -0,0 +1,2 @@ +Opened "WATCH.h5" with sec2 driver. +h5watch error: error in processing <list_of_fields> diff --git a/hl/tools/h5watch/testfiles/w-err-width.ddl b/hl/tools/h5watch/testfiles/w-err-width.ddl new file mode 100644 index 0000000..e6510f2 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-err-width.ddl @@ -0,0 +1,35 @@ +Usage: h5watch [OPTIONS] [OBJECT] + + OPTIONS + --help Print a usage message and exit. + --version Print version number and exit. + --label Label members of compound typed dataset. + --simple Use a machine-readable output format. + --dim Monitor changes in size of dataset dimensions only. + --width=N Set the number of columns to N for output. + A value of 0 sets the number of columns to the + maximum (65535). The default width is 80 columns. + --polling=N Set the polling interval to N (in seconds) when the + dataset will be checked for appended data. The default + polling interval is 1. + --fields=<list_of_fields> + Display data for the fields specified in <list_of_fields> + for a compound data type. <list_of_fields> can be + specified as follows: + 1) A comma-separated list of field names in a + compound data type. "," is the separator + for field names while "." is the separator + for a nested field. + 2) A single field name in a compound data type. + Can use this option multiple times. + Note that backslash is the escape character to avoid + characters in field names that conflict with the tool's + separators. + + OBJECT is specified as [<filename>/<path_to_dataset>/<dsetname>] + <filename> Name of the HDF5 file. It may be preceded by path + separated by slashes to the specified HDF5 file. + <path_to_dataset> Path separated by slashes to the specified dataset + <dsetname> Name of the dataset + + User can end the h5watch process by ctrl-C (SIGINT) or kill the process (SIGTERM). diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl new file mode 100644 index 0000000..09255cc --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl @@ -0,0 +1,6 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD_ESC... +dimension 0: 10->13 (increases) + Data: + (10) {1, {2, {2, 2, 2}, 2}}, {2, {3, {3, 3, 3}, 3}}, + (12) {3, {4, {4, 4, 4}, 4}} diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl new file mode 100644 index 0000000..00ed390 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl @@ -0,0 +1,5 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD_ESC... +dimension 0: 10->13 (increases) + Data: + (10) {{{2}}, {2}}, {{{3}}, {3}}, {{{4}}, {4}} diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl new file mode 100644 index 0000000..9b9a971 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl @@ -0,0 +1,3 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD_ESC... +dimension 0: 10->9 (decreases) diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-esc.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc.ddl new file mode 100644 index 0000000..9b9a971 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc.ddl @@ -0,0 +1,3 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD_ESC... +dimension 0: 10->9 (decreases) diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl new file mode 100644 index 0000000..029e4db --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl @@ -0,0 +1,3 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD... +dimension 0: 10->1 (decreases) diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl new file mode 100644 index 0000000..362cc94 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl @@ -0,0 +1,6 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD... +dimension 0: 10->13 (increases) + Data: + (10) {{{2, 2, 2}}, {4, 4}}, {{{3, 3, 3}}, {5, 5}}, {{{4, 4, 4}}, {6, + (12) 6}} diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-ff3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-ff3.ddl new file mode 100644 index 0000000..6a54b97 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-ff3.ddl @@ -0,0 +1,2 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD... diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-label.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-label.ddl new file mode 100644 index 0000000..394d5a6 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-label.ddl @@ -0,0 +1,10 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD... +dimension 0: 10->13 (increases) + Data: + (10) {field1=1, field2={a=2, b={a=2, b=2, c=2}, c=2}, field3=3, + (10) field4={a=4, b=4}}, + (11) {field1=2, field2={a=3, b={a=3, b=3, c=3}, c=3}, field3=4, + (11) field4={a=5, b=5}}, + (12) {field1=3, field2={a=4, b={a=4, b=4, c=4}, c=4}, field3=5, + (12) field4={a=6, b=6}} diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f1.ddl new file mode 100644 index 0000000..9b4c235 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f1.ddl @@ -0,0 +1,15 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD_TWO... +dimension 0: 4->6 (increases) +dimension 1: 10->10 (unchanged) + Data: + (4,0) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}}, + (4,2) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}}, + (4,4) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}}, + (4,6) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}}, + (4,8) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}}, + (5,0) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}}, + (5,2) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}}, + (5,4) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}}, + (5,6) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}}, + (5,8) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}} diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f3.ddl new file mode 100644 index 0000000..94b5c99 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f3.ddl @@ -0,0 +1,4 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD_TWO... +dimension 0: 4->3 (decreases) +dimension 1: 10->7 (decreases) diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-two-ff2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-ff2.ddl new file mode 100644 index 0000000..482da31 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-ff2.ddl @@ -0,0 +1,8 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD_TWO... +dimension 0: 4->3 (decreases) +dimension 1: 10->12 (increases) + Data: + (0,10) {{{-1, -1, -1}}, {-1, -1}}, {{{-1, -1, -1}}, {-1, -1}} + (1,10) {{{-1, -1, -1}}, {-1, -1}}, {{{-1, -1, -1}}, {-1, -1}} + (2,10) {{{-1, -1, -1}}, {-1, -1}}, {{{-1, -1, -1}}, {-1, -1}} diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd-two.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two.ddl new file mode 100644 index 0000000..57ffc2c --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two.ddl @@ -0,0 +1,7 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD_TWO... +dimension 0: 4->6 (increases) +dimension 1: 10->1 (decreases) + Data: + (4,0) {2, {2, {2, 2, 2}, 2}, 2, {2, 2}}, + (5,0) {2, {2, {2, 2, 2}, 2}, 2, {2, 2}} diff --git a/hl/tools/h5watch/testfiles/w-ext-cmpd.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd.ddl new file mode 100644 index 0000000..aac5be3 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-cmpd.ddl @@ -0,0 +1,7 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_CMPD... +dimension 0: 10->13 (increases) + Data: + (10) {1, {2, {2, 2, 2}, 2}, 3, {4, 4}}, + (11) {2, {3, {3, 3, 3}, 3}, 4, {5, 5}}, + (12) {3, {4, {4, 4, 4}, 4}, 5, {6, 6}} diff --git a/hl/tools/h5watch/testfiles/w-ext-early.ddl b/hl/tools/h5watch/testfiles/w-ext-early.ddl new file mode 100644 index 0000000..bb72104 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-early.ddl @@ -0,0 +1,3 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_ALLOC_EARLY... +dimension 0: 10->9 (decreases) diff --git a/hl/tools/h5watch/testfiles/w-ext-late.ddl b/hl/tools/h5watch/testfiles/w-ext-late.ddl new file mode 100644 index 0000000..a6f8265 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-late.ddl @@ -0,0 +1,2 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_ALLOC_LATE... diff --git a/hl/tools/h5watch/testfiles/w-ext-one-d.ddl b/hl/tools/h5watch/testfiles/w-ext-one-d.ddl new file mode 100644 index 0000000..673370a --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-one-d.ddl @@ -0,0 +1,3 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_ONE... +dimension 0: 10->13 (increases) diff --git a/hl/tools/h5watch/testfiles/w-ext-one-simple.ddl b/hl/tools/h5watch/testfiles/w-ext-one-simple.ddl new file mode 100644 index 0000000..5df9dff --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-one-simple.ddl @@ -0,0 +1,6 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_ONE... +dimension 0: 10->12 (increases) + Data: + 0 + 1 diff --git a/hl/tools/h5watch/testfiles/w-ext-one.ddl b/hl/tools/h5watch/testfiles/w-ext-one.ddl new file mode 100644 index 0000000..9604020 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-one.ddl @@ -0,0 +1,5 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_ONE... +dimension 0: 10->13 (increases) + Data: + (10) 0, 1, 2 diff --git a/hl/tools/h5watch/testfiles/w-ext-two-d.ddl b/hl/tools/h5watch/testfiles/w-ext-two-d.ddl new file mode 100644 index 0000000..5c7af0a --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-two-d.ddl @@ -0,0 +1,4 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_TWO... +dimension 0: 4->2 (decreases) +dimension 1: 10->10 (unchanged) diff --git a/hl/tools/h5watch/testfiles/w-ext-two-width.ddl b/hl/tools/h5watch/testfiles/w-ext-two-width.ddl new file mode 100644 index 0000000..9f09fde --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-two-width.ddl @@ -0,0 +1,9 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_TWO... +dimension 0: 4->4 (unchanged) +dimension 1: 10->12 (increases) + Data: + (0,10) 0, 0 + (1,10) 0, 0 + (2,10) 0, 0 + (3,10) 0, 0 diff --git a/hl/tools/h5watch/testfiles/w-ext-two.ddl b/hl/tools/h5watch/testfiles/w-ext-two.ddl new file mode 100644 index 0000000..28ff075 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-ext-two.ddl @@ -0,0 +1,11 @@ +Opened "TEST.h5" with sec2 driver. +Monitoring dataset /DSET_TWO... +dimension 0: 4->6 (increases) +dimension 1: 10->12 (increases) + Data: + (0,10) 2, 2 + (1,10) 2, 2 + (2,10) 2, 2 + (3,10) 2, 2 + (4,0) 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + (5,0) 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 diff --git a/hl/tools/h5watch/testfiles/w-help1.ddl b/hl/tools/h5watch/testfiles/w-help1.ddl new file mode 100644 index 0000000..e6510f2 --- /dev/null +++ b/hl/tools/h5watch/testfiles/w-help1.ddl @@ -0,0 +1,35 @@ +Usage: h5watch [OPTIONS] [OBJECT] + + OPTIONS + --help Print a usage message and exit. + --version Print version number and exit. + --label Label members of compound typed dataset. + --simple Use a machine-readable output format. + --dim Monitor changes in size of dataset dimensions only. + --width=N Set the number of columns to N for output. + A value of 0 sets the number of columns to the + maximum (65535). The default width is 80 columns. + --polling=N Set the polling interval to N (in seconds) when the + dataset will be checked for appended data. The default + polling interval is 1. + --fields=<list_of_fields> + Display data for the fields specified in <list_of_fields> + for a compound data type. <list_of_fields> can be + specified as follows: + 1) A comma-separated list of field names in a + compound data type. "," is the separator + for field names while "." is the separator + for a nested field. + 2) A single field name in a compound data type. + Can use this option multiple times. + Note that backslash is the escape character to avoid + characters in field names that conflict with the tool's + separators. + + OBJECT is specified as [<filename>/<path_to_dataset>/<dsetname>] + <filename> Name of the HDF5 file. It may be preceded by path + separated by slashes to the specified HDF5 file. + <path_to_dataset> Path separated by slashes to the specified dataset + <dsetname> Name of the dataset + + User can end the h5watch process by ctrl-C (SIGINT) or kill the process (SIGTERM). diff --git a/hl/tools/h5watch/testh5watch.sh.in b/hl/tools/h5watch/testh5watch.sh.in index fb047cd..a1daeec 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 |