summaryrefslogtreecommitdiffstats
path: root/tools/test/h5stat
diff options
context:
space:
mode:
Diffstat (limited to 'tools/test/h5stat')
-rw-r--r--tools/test/h5stat/CMakeTests.cmake6
-rw-r--r--tools/test/h5stat/expected/h5stat_dims1.ddl (renamed from tools/test/h5stat/testfiles/h5stat_dims1.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_dims2.ddl (renamed from tools/test/h5stat/testfiles/h5stat_dims2.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_err1_dims.err (renamed from tools/test/h5stat/testfiles/h5stat_err1_dims.err)0
-rw-r--r--tools/test/h5stat/expected/h5stat_err1_links.err (renamed from tools/test/h5stat/testfiles/h5stat_err1_links.err)0
-rw-r--r--tools/test/h5stat/expected/h5stat_err1_numattrs.err (renamed from tools/test/h5stat/testfiles/h5stat_err1_numattrs.err)0
-rw-r--r--tools/test/h5stat/expected/h5stat_err2_numattrs.err (renamed from tools/test/h5stat/testfiles/h5stat_err2_numattrs.err)0
-rw-r--r--tools/test/h5stat/expected/h5stat_err_old_fill.ddl (renamed from tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_err_old_fill.err (renamed from tools/test/h5stat/testfiles/h5stat_err_old_fill.err)0
-rw-r--r--tools/test/h5stat/expected/h5stat_err_old_layout.ddl (renamed from tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_err_old_layout.err (renamed from tools/test/h5stat/testfiles/h5stat_err_old_layout.err)0
-rw-r--r--tools/test/h5stat/expected/h5stat_err_refcount.ddl (renamed from tools/test/h5stat/testfiles/h5stat_err_refcount.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_err_refcount.err (renamed from tools/test/h5stat/testfiles/h5stat_err_refcount.err)0
-rw-r--r--tools/test/h5stat/expected/h5stat_filters-F.ddl (renamed from tools/test/h5stat/testfiles/h5stat_filters-F.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_filters-UD.ddl (renamed from tools/test/h5stat/testfiles/h5stat_filters-UD.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_filters-UT.ddl (renamed from tools/test/h5stat/testfiles/h5stat_filters-UT.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_filters-d.ddl (renamed from tools/test/h5stat/testfiles/h5stat_filters-d.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_filters-dT.ddl (renamed from tools/test/h5stat/testfiles/h5stat_filters-dT.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_filters-file.ddl (renamed from tools/test/h5stat/testfiles/h5stat_filters-file.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_filters-g.ddl (renamed from tools/test/h5stat/testfiles/h5stat_filters-g.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_filters.ddl (renamed from tools/test/h5stat/testfiles/h5stat_filters.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_help1.ddl (renamed from tools/test/h5stat/testfiles/h5stat_help1.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_help2.ddl (renamed from tools/test/h5stat/testfiles/h5stat_help2.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_idx.ddl (renamed from tools/test/h5stat/testfiles/h5stat_idx.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_links1.ddl (renamed from tools/test/h5stat/testfiles/h5stat_links1.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_links2.ddl (renamed from tools/test/h5stat/testfiles/h5stat_links2.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_links3.ddl (renamed from tools/test/h5stat/testfiles/h5stat_links3.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_links4.ddl (renamed from tools/test/h5stat/testfiles/h5stat_links4.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_links5.ddl (renamed from tools/test/h5stat/testfiles/h5stat_links5.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_newgrat-UA.ddl (renamed from tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_newgrat-UG.ddl (renamed from tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_newgrat.ddl (renamed from tools/test/h5stat/testfiles/h5stat_newgrat.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_nofile.ddl (renamed from tools/test/h5stat/testfiles/h5stat_nofile.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_nofile.err (renamed from tools/test/h5stat/testfiles/h5stat_nofile.err)0
-rw-r--r--tools/test/h5stat/expected/h5stat_notexist.ddl (renamed from tools/test/h5stat/testfiles/h5stat_notexist.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_notexist.err (renamed from tools/test/h5stat/testfiles/h5stat_notexist.err)0
-rw-r--r--tools/test/h5stat/expected/h5stat_numattrs1.ddl (renamed from tools/test/h5stat/testfiles/h5stat_numattrs1.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_numattrs2.ddl (renamed from tools/test/h5stat/testfiles/h5stat_numattrs2.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_numattrs3.ddl (renamed from tools/test/h5stat/testfiles/h5stat_numattrs3.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_numattrs4.ddl (renamed from tools/test/h5stat/testfiles/h5stat_numattrs4.ddl)0
-rw-r--r--tools/test/h5stat/expected/h5stat_tsohm.ddl (renamed from tools/test/h5stat/testfiles/h5stat_tsohm.ddl)0
-rw-r--r--tools/test/h5stat/h5stat_gentest.c14
-rw-r--r--tools/test/h5stat/testh5stat.sh.in86
43 files changed, 53 insertions, 53 deletions
diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake
index 8802d0d..9035eaf 100644
--- a/tools/test/h5stat/CMakeTests.cmake
+++ b/tools/test/h5stat/CMakeTests.cmake
@@ -75,15 +75,15 @@
)
foreach (ddl_file ${HDF5_REFERENCE_FILES})
- HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files")
+ HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files")
endforeach ()
foreach (h5_file ${HDF5_REFERENCE_ERR_FILES})
- HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${h5_file}.err" "${PROJECT_BINARY_DIR}/${h5_file}.err" "h5stat_files")
+ HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}.err" "${PROJECT_BINARY_DIR}/${h5_file}.err" "h5stat_files")
endforeach ()
foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
- HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5stat_files")
+ HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5stat_files")
endforeach ()
add_custom_target(h5stat_files ALL COMMENT "Copying files needed by h5stat tests" DEPENDS ${h5stat_files_list})
diff --git a/tools/test/h5stat/testfiles/h5stat_dims1.ddl b/tools/test/h5stat/expected/h5stat_dims1.ddl
index 07b2900..07b2900 100644
--- a/tools/test/h5stat/testfiles/h5stat_dims1.ddl
+++ b/tools/test/h5stat/expected/h5stat_dims1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_dims2.ddl b/tools/test/h5stat/expected/h5stat_dims2.ddl
index dbccd05..dbccd05 100644
--- a/tools/test/h5stat/testfiles/h5stat_dims2.ddl
+++ b/tools/test/h5stat/expected/h5stat_dims2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err1_dims.err b/tools/test/h5stat/expected/h5stat_err1_dims.err
index 86d375b..86d375b 100644
--- a/tools/test/h5stat/testfiles/h5stat_err1_dims.err
+++ b/tools/test/h5stat/expected/h5stat_err1_dims.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err1_links.err b/tools/test/h5stat/expected/h5stat_err1_links.err
index d43207c..d43207c 100644
--- a/tools/test/h5stat/testfiles/h5stat_err1_links.err
+++ b/tools/test/h5stat/expected/h5stat_err1_links.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err1_numattrs.err b/tools/test/h5stat/expected/h5stat_err1_numattrs.err
index 01b6c18..01b6c18 100644
--- a/tools/test/h5stat/testfiles/h5stat_err1_numattrs.err
+++ b/tools/test/h5stat/expected/h5stat_err1_numattrs.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err2_numattrs.err b/tools/test/h5stat/expected/h5stat_err2_numattrs.err
index 01b6c18..01b6c18 100644
--- a/tools/test/h5stat/testfiles/h5stat_err2_numattrs.err
+++ b/tools/test/h5stat/expected/h5stat_err2_numattrs.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl b/tools/test/h5stat/expected/h5stat_err_old_fill.ddl
index 5cc1e32..5cc1e32 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl
+++ b/tools/test/h5stat/expected/h5stat_err_old_fill.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_fill.err b/tools/test/h5stat/expected/h5stat_err_old_fill.err
index 8b886d2..8b886d2 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_fill.err
+++ b/tools/test/h5stat/expected/h5stat_err_old_fill.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl b/tools/test/h5stat/expected/h5stat_err_old_layout.ddl
index 112190c..112190c 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl
+++ b/tools/test/h5stat/expected/h5stat_err_old_layout.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_layout.err b/tools/test/h5stat/expected/h5stat_err_old_layout.err
index 7aa2fa7..7aa2fa7 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_layout.err
+++ b/tools/test/h5stat/expected/h5stat_err_old_layout.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err_refcount.ddl b/tools/test/h5stat/expected/h5stat_err_refcount.ddl
index 41e533e..41e533e 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_refcount.ddl
+++ b/tools/test/h5stat/expected/h5stat_err_refcount.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err_refcount.err b/tools/test/h5stat/expected/h5stat_err_refcount.err
index d176996..d176996 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_refcount.err
+++ b/tools/test/h5stat/expected/h5stat_err_refcount.err
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-F.ddl b/tools/test/h5stat/expected/h5stat_filters-F.ddl
index d44445b..d44445b 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-F.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-F.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-UD.ddl b/tools/test/h5stat/expected/h5stat_filters-UD.ddl
index 4efafd1..4efafd1 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-UD.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-UD.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-UT.ddl b/tools/test/h5stat/expected/h5stat_filters-UT.ddl
index d8de31f..d8de31f 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-UT.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-UT.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-d.ddl b/tools/test/h5stat/expected/h5stat_filters-d.ddl
index 6e6dd61..6e6dd61 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-d.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-d.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-dT.ddl b/tools/test/h5stat/expected/h5stat_filters-dT.ddl
index b14ca9f..b14ca9f 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-dT.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-dT.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-file.ddl b/tools/test/h5stat/expected/h5stat_filters-file.ddl
index 5f7eff9..5f7eff9 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-file.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-file.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-g.ddl b/tools/test/h5stat/expected/h5stat_filters-g.ddl
index 290c82a..290c82a 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-g.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-g.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters.ddl b/tools/test/h5stat/expected/h5stat_filters.ddl
index 9f9e146..9f9e146 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_help1.ddl b/tools/test/h5stat/expected/h5stat_help1.ddl
index 54d6a31..54d6a31 100644
--- a/tools/test/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/test/h5stat/expected/h5stat_help1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_help2.ddl b/tools/test/h5stat/expected/h5stat_help2.ddl
index 54d6a31..54d6a31 100644
--- a/tools/test/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/test/h5stat/expected/h5stat_help2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_idx.ddl b/tools/test/h5stat/expected/h5stat_idx.ddl
index 1b6ae0c..1b6ae0c 100644
--- a/tools/test/h5stat/testfiles/h5stat_idx.ddl
+++ b/tools/test/h5stat/expected/h5stat_idx.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links1.ddl b/tools/test/h5stat/expected/h5stat_links1.ddl
index c650f15..c650f15 100644
--- a/tools/test/h5stat/testfiles/h5stat_links1.ddl
+++ b/tools/test/h5stat/expected/h5stat_links1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links2.ddl b/tools/test/h5stat/expected/h5stat_links2.ddl
index 9fc82cd..9fc82cd 100644
--- a/tools/test/h5stat/testfiles/h5stat_links2.ddl
+++ b/tools/test/h5stat/expected/h5stat_links2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links3.ddl b/tools/test/h5stat/expected/h5stat_links3.ddl
index f80471a..f80471a 100644
--- a/tools/test/h5stat/testfiles/h5stat_links3.ddl
+++ b/tools/test/h5stat/expected/h5stat_links3.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links4.ddl b/tools/test/h5stat/expected/h5stat_links4.ddl
index 94feffd..94feffd 100644
--- a/tools/test/h5stat/testfiles/h5stat_links4.ddl
+++ b/tools/test/h5stat/expected/h5stat_links4.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links5.ddl b/tools/test/h5stat/expected/h5stat_links5.ddl
index 6f33bed..6f33bed 100644
--- a/tools/test/h5stat/testfiles/h5stat_links5.ddl
+++ b/tools/test/h5stat/expected/h5stat_links5.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl b/tools/test/h5stat/expected/h5stat_newgrat-UA.ddl
index a5ee7e8..a5ee7e8 100644
--- a/tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl
+++ b/tools/test/h5stat/expected/h5stat_newgrat-UA.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl b/tools/test/h5stat/expected/h5stat_newgrat-UG.ddl
index 41195ac..41195ac 100644
--- a/tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl
+++ b/tools/test/h5stat/expected/h5stat_newgrat-UG.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat.ddl b/tools/test/h5stat/expected/h5stat_newgrat.ddl
index 130fe2f..130fe2f 100644
--- a/tools/test/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/test/h5stat/expected/h5stat_newgrat.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_nofile.ddl b/tools/test/h5stat/expected/h5stat_nofile.ddl
index 54d6a31..54d6a31 100644
--- a/tools/test/h5stat/testfiles/h5stat_nofile.ddl
+++ b/tools/test/h5stat/expected/h5stat_nofile.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_nofile.err b/tools/test/h5stat/expected/h5stat_nofile.err
index 3b7e979..3b7e979 100644
--- a/tools/test/h5stat/testfiles/h5stat_nofile.err
+++ b/tools/test/h5stat/expected/h5stat_nofile.err
diff --git a/tools/test/h5stat/testfiles/h5stat_notexist.ddl b/tools/test/h5stat/expected/h5stat_notexist.ddl
index 7f71941..7f71941 100644
--- a/tools/test/h5stat/testfiles/h5stat_notexist.ddl
+++ b/tools/test/h5stat/expected/h5stat_notexist.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_notexist.err b/tools/test/h5stat/expected/h5stat_notexist.err
index c1d9e54..c1d9e54 100644
--- a/tools/test/h5stat/testfiles/h5stat_notexist.err
+++ b/tools/test/h5stat/expected/h5stat_notexist.err
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs1.ddl b/tools/test/h5stat/expected/h5stat_numattrs1.ddl
index af53776..af53776 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs1.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs2.ddl b/tools/test/h5stat/expected/h5stat_numattrs2.ddl
index 638781b..638781b 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs2.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs3.ddl b/tools/test/h5stat/expected/h5stat_numattrs3.ddl
index de8d6a3..de8d6a3 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs3.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs3.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs4.ddl b/tools/test/h5stat/expected/h5stat_numattrs4.ddl
index 2b0122a..2b0122a 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs4.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs4.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_tsohm.ddl b/tools/test/h5stat/expected/h5stat_tsohm.ddl
index 9369950..9369950 100644
--- a/tools/test/h5stat/testfiles/h5stat_tsohm.ddl
+++ b/tools/test/h5stat/expected/h5stat_tsohm.ddl
diff --git a/tools/test/h5stat/h5stat_gentest.c b/tools/test/h5stat/h5stat_gentest.c
index 44428fe..787c2e1 100644
--- a/tools/test/h5stat/h5stat_gentest.c
+++ b/tools/test/h5stat/h5stat_gentest.c
@@ -87,7 +87,7 @@ gen_newgrat_file(const char *fname)
/* Create NUM_GRPS groups in the root group */
for (i = 1; i <= NUM_GRPS; i++) {
- HDsnprintf(name, sizeof(name), "%s%d", GROUP_NAME, i);
+ snprintf(name, sizeof(name), "%s%d", GROUP_NAME, i);
if ((gid = H5Gcreate2(fid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto error;
if (H5Gclose(gid) < 0)
@@ -108,7 +108,7 @@ gen_newgrat_file(const char *fname)
/* Create NUM_ATTRS for the dataset */
for (i = 1; i <= NUM_ATTRS; i++) {
- HDsnprintf(attrname, sizeof(attrname), "%s%d", ATTR_NAME, i);
+ snprintf(attrname, sizeof(attrname), "%s%d", ATTR_NAME, i);
if ((attr_id = H5Acreate2(did, attrname, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto error;
if (H5Aclose(attr_id) < 0)
@@ -210,7 +210,7 @@ gen_threshold_file(const char *fname)
/* Create 11 attributes for the dataset */
for (i = 1; i <= (THRES_NUM + 1); i++) {
- HDsnprintf(name, sizeof(name), "%s%d", THRES_ATTR_NAME, i);
+ snprintf(name, sizeof(name), "%s%d", THRES_ATTR_NAME, i);
if ((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto error;
if (H5Aclose(attr_id) < 0)
@@ -239,7 +239,7 @@ gen_threshold_file(const char *fname)
/* Create 10 attributes for the 2-D dataset */
for (i = 1; i <= THRES_NUM; i++) {
- HDsnprintf(name, sizeof(name), "%s%d", THRES_ATTR_NAME, i);
+ snprintf(name, sizeof(name), "%s%d", THRES_ATTR_NAME, i);
if ((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto error;
if (H5Aclose(attr_id) < 0)
@@ -263,7 +263,7 @@ gen_threshold_file(const char *fname)
/* Create 10 1-D datasets with non-zero dimension size for the group */
for (i = 1; i <= THRES_NUM; i++) {
/* set up dataset name */
- HDsnprintf(name, sizeof(name), "%s%d", THRES_DSET_NAME, i);
+ snprintf(name, sizeof(name), "%s%d", THRES_DSET_NAME, i);
/* Create the dataset */
if ((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -285,7 +285,7 @@ gen_threshold_file(const char *fname)
/* Create 25 attributes for the group */
for (i = 1; i <= THRES_NUM_25; i++) {
/* Set up attribute name */
- HDsnprintf(name, sizeof(name), "%s%d", THRES_ATTR_GRP_NAME, i);
+ snprintf(name, sizeof(name), "%s%d", THRES_ATTR_GRP_NAME, i);
/* Create the attribute */
if ((attr_id = H5Acreate2(gid, name, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -307,7 +307,7 @@ gen_threshold_file(const char *fname)
/* Create 9 1-D datasets with non-zero dimension size for the group */
for (i = 1; i < THRES_NUM; i++) {
/* set up dataset name */
- HDsnprintf(name, sizeof(name), "%s%d", THRES_DSET_NAME, i);
+ snprintf(name, sizeof(name), "%s%d", THRES_DSET_NAME, i);
/* Create the dataset */
if ((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
diff --git a/tools/test/h5stat/testh5stat.sh.in b/tools/test/h5stat/testh5stat.sh.in
index 9ea6adc..7ce0ad4 100644
--- a/tools/test/h5stat/testh5stat.sh.in
+++ b/tools/test/h5stat/testh5stat.sh.in
@@ -39,17 +39,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_H5STAT_OUTFILES="$SRC_TOOLS/test/h5stat/expected"
TESTDIR=./testfiles
test -d $TESTDIR || mkdir $TESTDIR
@@ -75,49 +75,49 @@ $SRC_H5STAT_TESTFILES/h5stat_threshold.h5
"
LIST_ERR_TEST_FILES="
-$SRC_H5STAT_TESTFILES/h5stat_err_refcount.err
-$SRC_H5STAT_TESTFILES/h5stat_err_old_layout.err
-$SRC_H5STAT_TESTFILES/h5stat_err_old_fill.err
-$SRC_H5STAT_TESTFILES/h5stat_err1_links.err
-$SRC_H5STAT_TESTFILES/h5stat_err1_dims.err
-$SRC_H5STAT_TESTFILES/h5stat_err1_numattrs.err
-$SRC_H5STAT_TESTFILES/h5stat_err2_numattrs.err
-$SRC_H5STAT_TESTFILES/h5stat_notexist.err
-$SRC_H5STAT_TESTFILES/h5stat_nofile.err
+$SRC_H5STAT_OUTFILES/h5stat_err_refcount.err
+$SRC_H5STAT_OUTFILES/h5stat_err_old_layout.err
+$SRC_H5STAT_OUTFILES/h5stat_err_old_fill.err
+$SRC_H5STAT_OUTFILES/h5stat_err1_links.err
+$SRC_H5STAT_OUTFILES/h5stat_err1_dims.err
+$SRC_H5STAT_OUTFILES/h5stat_err1_numattrs.err
+$SRC_H5STAT_OUTFILES/h5stat_err2_numattrs.err
+$SRC_H5STAT_OUTFILES/h5stat_notexist.err
+$SRC_H5STAT_OUTFILES/h5stat_nofile.err
"
LIST_OTHER_TEST_FILES="
-$SRC_H5STAT_TESTFILES/h5stat_err_refcount.ddl
-$SRC_H5STAT_TESTFILES/h5stat_err_old_layout.ddl
-$SRC_H5STAT_TESTFILES/h5stat_err_old_fill.ddl
-$SRC_H5STAT_TESTFILES/h5stat_help1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_help2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_notexist.ddl
-$SRC_H5STAT_TESTFILES/h5stat_nofile.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-file.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-F.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-d.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-g.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-dT.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-UD.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-UT.ddl
-$SRC_H5STAT_TESTFILES/h5stat_tsohm.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat-UG.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat-UA.ddl
-$SRC_H5STAT_TESTFILES/h5stat_idx.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links3.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links4.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links5.ddl
-$SRC_H5STAT_TESTFILES/h5stat_dims1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_dims2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs3.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs4.ddl
+$SRC_H5STAT_OUTFILES/h5stat_err_refcount.ddl
+$SRC_H5STAT_OUTFILES/h5stat_err_old_layout.ddl
+$SRC_H5STAT_OUTFILES/h5stat_err_old_fill.ddl
+$SRC_H5STAT_OUTFILES/h5stat_help1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_help2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_notexist.ddl
+$SRC_H5STAT_OUTFILES/h5stat_nofile.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-file.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-F.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-d.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-g.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-dT.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-UD.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-UT.ddl
+$SRC_H5STAT_OUTFILES/h5stat_tsohm.ddl
+$SRC_H5STAT_OUTFILES/h5stat_newgrat.ddl
+$SRC_H5STAT_OUTFILES/h5stat_newgrat-UG.ddl
+$SRC_H5STAT_OUTFILES/h5stat_newgrat-UA.ddl
+$SRC_H5STAT_OUTFILES/h5stat_idx.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links3.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links4.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links5.ddl
+$SRC_H5STAT_OUTFILES/h5stat_dims1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_dims2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs3.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs4.ddl
"
#