summaryrefslogtreecommitdiffstats
path: root/tools/test/h5repack
diff options
context:
space:
mode:
authorJacob Smith <jake.smith@hdfgroup.org>2019-05-31 22:24:26 (GMT)
committerJacob Smith <jake.smith@hdfgroup.org>2019-05-31 22:24:26 (GMT)
commitad2a7f47896cf636b42fbc73b96781b2d5200f56 (patch)
treeaa26349968b764368cf1976608f1da1d88752767 /tools/test/h5repack
parentcb6029196af9a960872c627db53fcbc4cf89d923 (diff)
downloadhdf5-ad2a7f47896cf636b42fbc73b96781b2d5200f56.zip
hdf5-ad2a7f47896cf636b42fbc73b96781b2d5200f56.tar.gz
hdf5-ad2a7f47896cf636b42fbc73b96781b2d5200f56.tar.bz2
First pass at repack consolidating external storage if layout given.
Checks out manually, tests still complain.
Diffstat (limited to 'tools/test/h5repack')
-rw-r--r--tools/test/h5repack/Makefile.am3
-rw-r--r--tools/test/h5repack/h5repack.sh.in3
-rw-r--r--tools/test/h5repack/h5repackgentest.c8
3 files changed, 8 insertions, 6 deletions
diff --git a/tools/test/h5repack/Makefile.am b/tools/test/h5repack/Makefile.am
index ff950e4..38f7b2f 100644
--- a/tools/test/h5repack/Makefile.am
+++ b/tools/test/h5repack/Makefile.am
@@ -59,7 +59,8 @@ endif
# Temporary files. *.h5 are generated by h5repack. They should
# copied to the testfiles/ directory if update is required.
-CHECK_CLEANFILES+=*.h5 *.bin testfiles/h5diff_attr1.h5 testfiles/tfamily*.h5
+# *.dat files may be created by h5repackgentest.
+CHECK_CLEANFILES+=*.h5 *.dat *.bin testfiles/h5diff_attr1.h5 testfiles/tfamily*.h5
DISTCLEANFILES=h5repack.sh h5repack_plugin.sh
include $(top_srcdir)/config/conclude.am
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
index 9851e89..56df3c8 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -675,7 +675,8 @@ VERIFY_EXTERNAL_CONSOLIDATION()
)
# flag if any of the above checks failed
- if [ $prev_nerrors != $nerrors ]; then
+ if [ $prev_nerrors != $nerrors ]
+ then
echo ". . . *FAILED*"
nerrors="`expr $prev_nerrors + 1`"
else
diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c
index 8076b42..0eec88c 100644
--- a/tools/test/h5repack/h5repackgentest.c
+++ b/tools/test/h5repack/h5repackgentest.c
@@ -8,7 +8,7 @@
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*/
static void
-generate_external_int32le(hbool_t external)
+generate_int32le(hbool_t external)
{
char filename[MAX_NAME_SIZE];
hid_t file;
@@ -67,7 +67,7 @@ generate_external_int32le(hbool_t external)
HDassert(H5Dclose(dset) >= 0);
HDassert(H5Sclose(dspace) >= 0);
HDassert(H5Fclose(file) >= 0);
-} /* end generate_external_int32le() */
+} /* end generate_int32le() */
/* ----------------------------------------------------------------------------
@@ -75,8 +75,8 @@ generate_external_int32le(hbool_t external)
int
main(void)
{
- generate_external_int32le(FALSE);
- generate_external_int32le(TRUE);
+ generate_int32le(FALSE);
+ generate_int32le(TRUE);
return 0;
} /* end main() */