diff options
Diffstat (limited to 'tools/test/h5jam')
-rw-r--r-- | tools/test/h5jam/CMakeTests.cmake | 4 | ||||
-rw-r--r-- | tools/test/h5jam/expected/h5jam-help.txt (renamed from tools/test/h5jam/testfiles/h5jam-help.txt) | 0 | ||||
-rw-r--r-- | tools/test/h5jam/expected/h5jam-ub-nohdf5.txt (renamed from tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt) | 0 | ||||
-rw-r--r-- | tools/test/h5jam/expected/h5unjam-help.txt (renamed from tools/test/h5jam/testfiles/h5unjam-help.txt) | 0 | ||||
-rw-r--r-- | tools/test/h5jam/expected/u10.txt (renamed from tools/test/h5jam/testfiles/u10.txt) | 0 | ||||
-rw-r--r-- | tools/test/h5jam/expected/u511.txt (renamed from tools/test/h5jam/testfiles/u511.txt) | 0 | ||||
-rw-r--r-- | tools/test/h5jam/expected/u512.txt (renamed from tools/test/h5jam/testfiles/u512.txt) | 0 | ||||
-rw-r--r-- | tools/test/h5jam/expected/u513.txt (renamed from tools/test/h5jam/testfiles/u513.txt) | 0 | ||||
-rw-r--r-- | tools/test/h5jam/getub.c | 6 | ||||
-rw-r--r-- | tools/test/h5jam/h5jamgentest.c | 8 | ||||
-rw-r--r-- | tools/test/h5jam/tellub.c | 2 | ||||
-rw-r--r-- | tools/test/h5jam/testh5jam.sh.in | 20 |
12 files changed, 20 insertions, 20 deletions
diff --git a/tools/test/h5jam/CMakeTests.cmake b/tools/test/h5jam/CMakeTests.cmake index e19ec86..eb6070e 100644 --- a/tools/test/h5jam/CMakeTests.cmake +++ b/tools/test/h5jam/CMakeTests.cmake @@ -33,11 +33,11 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") foreach (h5_file ${HDF5_REFERENCE_TEST_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files") endforeach () foreach (txt_file ${HDF5_REFERENCE_TXT_FILES}) - HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5jam_files") + HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5jam_files") endforeach () add_custom_target(h5jam_files ALL COMMENT "Copying files needed by h5jam tests" DEPENDS ${h5jam_files_list}) diff --git a/tools/test/h5jam/testfiles/h5jam-help.txt b/tools/test/h5jam/expected/h5jam-help.txt index ce97c22..ce97c22 100644 --- a/tools/test/h5jam/testfiles/h5jam-help.txt +++ b/tools/test/h5jam/expected/h5jam-help.txt diff --git a/tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt b/tools/test/h5jam/expected/h5jam-ub-nohdf5.txt index 72c0b17..72c0b17 100644 --- a/tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt +++ b/tools/test/h5jam/expected/h5jam-ub-nohdf5.txt diff --git a/tools/test/h5jam/testfiles/h5unjam-help.txt b/tools/test/h5jam/expected/h5unjam-help.txt index f0d92e9..f0d92e9 100644 --- a/tools/test/h5jam/testfiles/h5unjam-help.txt +++ b/tools/test/h5jam/expected/h5unjam-help.txt diff --git a/tools/test/h5jam/testfiles/u10.txt b/tools/test/h5jam/expected/u10.txt index c76a964..c76a964 100644 --- a/tools/test/h5jam/testfiles/u10.txt +++ b/tools/test/h5jam/expected/u10.txt diff --git a/tools/test/h5jam/testfiles/u511.txt b/tools/test/h5jam/expected/u511.txt index bff1736..bff1736 100644 --- a/tools/test/h5jam/testfiles/u511.txt +++ b/tools/test/h5jam/expected/u511.txt diff --git a/tools/test/h5jam/testfiles/u512.txt b/tools/test/h5jam/expected/u512.txt index 33a36c9..33a36c9 100644 --- a/tools/test/h5jam/testfiles/u512.txt +++ b/tools/test/h5jam/expected/u512.txt diff --git a/tools/test/h5jam/testfiles/u513.txt b/tools/test/h5jam/expected/u513.txt index 6b46ebf..6b46ebf 100644 --- a/tools/test/h5jam/testfiles/u513.txt +++ b/tools/test/h5jam/expected/u513.txt diff --git a/tools/test/h5jam/getub.c b/tools/test/h5jam/getub.c index b90ddeb..8878a69 100644 --- a/tools/test/h5jam/getub.c +++ b/tools/test/h5jam/getub.c @@ -59,7 +59,7 @@ parse_command_line(int argc, const char *const *argv) while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) { switch ((char)opt) { case 'c': - nbytes = HDstrdup(H5_optarg); + nbytes = strdup(H5_optarg); break; case '?': default: @@ -105,10 +105,10 @@ main(int argc, char *argv[]) goto error; } /* end if */ - filename = HDstrdup(argv[H5_optind]); + filename = strdup(argv[H5_optind]); size = 0; - if (EOF == (res = HDsscanf(nbytes, "%u", &size))) { + if (EOF == (res = sscanf(nbytes, "%u", &size))) { /* fail */ error_msg("missing file name\n"); usage(h5tools_getprogname()); diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c index d3b7388..0ab29c3 100644 --- a/tools/test/h5jam/h5jamgentest.c +++ b/tools/test/h5jam/h5jamgentest.c @@ -151,7 +151,7 @@ gent_ub(const char *filename, size_t ub_size, size_t ub_fill) goto error; if ((attr = H5Acreate2(group, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; - if (HDsnprintf(buf, sizeof(buf), "abcdefghi") < 0) + if (snprintf(buf, sizeof(buf), "abcdefghi") < 0) goto error; if (H5Awrite(attr, H5T_NATIVE_SCHAR, buf) < 0) goto error; @@ -205,7 +205,7 @@ gent_ub(const char *filename, size_t ub_size, size_t ub_fill) goto error; if ((attr = H5Acreate2(dataset, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; - if (HDsnprintf(buf, sizeof(buf), "1st attribute of dset1.1.1") < 0) + if (snprintf(buf, sizeof(buf), "1st attribute of dset1.1.1") < 0) goto error; if (H5Awrite(attr, H5T_NATIVE_SCHAR, buf) < 0) goto error; @@ -219,7 +219,7 @@ gent_ub(const char *filename, size_t ub_size, size_t ub_fill) goto error; if ((attr = H5Acreate2(dataset, "attr2", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; - if (HDsnprintf(buf, sizeof(buf), "2nd attribute of dset1.1.1") < 0) + if (snprintf(buf, sizeof(buf), "2nd attribute of dset1.1.1") < 0) goto error; if (H5Awrite(attr, H5T_NATIVE_SCHAR, buf) < 0) goto error; @@ -412,7 +412,7 @@ main(void) if (gent_ub(FILE7, 0, 0) < 0) goto error; - if (gent_ub(FILE8, 512, HDstrlen(pattern)) < 0) + if (gent_ub(FILE8, 512, strlen(pattern)) < 0) goto error; if (gent_ub(FILE9, 1024, 513) < 0) goto error; diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c index 501ecc5..61ea896 100644 --- a/tools/test/h5jam/tellub.c +++ b/tools/test/h5jam/tellub.c @@ -124,7 +124,7 @@ main(int argc, char *argv[]) goto done; } - ifname = HDstrdup(argv[H5_optind]); + ifname = strdup(argv[H5_optind]); testval = H5Fis_accessible(ifname, H5P_DEFAULT); diff --git a/tools/test/h5jam/testh5jam.sh.in b/tools/test/h5jam/testh5jam.sh.in index 805ce11..49598da 100644 --- a/tools/test/h5jam/testh5jam.sh.in +++ b/tools/test/h5jam/testh5jam.sh.in @@ -43,17 +43,17 @@ verbose=yes # source dirs SRC_TOOLS="$srcdir/../.." -SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles" # testfiles source dirs for tools -SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES" -SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES" +SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles" +SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles" SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles" SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles" SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5JAM_OUTFILES="$SRC_TOOLS/test/h5jam/expected" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -73,13 +73,13 @@ $SRC_H5JAM_TESTFILES/twithub.h5 $SRC_H5JAM_TESTFILES/twithub513.h5 " LIST_OTHER_TEST_FILES=" -$SRC_H5JAM_TESTFILES/u10.txt -$SRC_H5JAM_TESTFILES/u511.txt -$SRC_H5JAM_TESTFILES/u512.txt -$SRC_H5JAM_TESTFILES/u513.txt -$SRC_H5JAM_TESTFILES/h5jam-help.txt -$SRC_H5JAM_TESTFILES/h5unjam-help.txt -$SRC_H5JAM_TESTFILES/h5jam-ub-nohdf5.txt +$SRC_H5JAM_OUTFILES/u10.txt +$SRC_H5JAM_OUTFILES/u511.txt +$SRC_H5JAM_OUTFILES/u512.txt +$SRC_H5JAM_OUTFILES/u513.txt +$SRC_H5JAM_OUTFILES/h5jam-help.txt +$SRC_H5JAM_OUTFILES/h5unjam-help.txt +$SRC_H5JAM_OUTFILES/h5jam-ub-nohdf5.txt " # Source in the output filter function definitions. |