summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2004-01-29 15:04:32 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2004-01-29 15:04:32 (GMT)
commit203799486de690f5ee5911ecdc2b4aaff6681b33 (patch)
treed13d995d452f898752ada7520e598ae9e8fb0437 /tools
parent796fe1c4025f83b4060157d04d3873ca9f3fa9e7 (diff)
downloadhdf5-203799486de690f5ee5911ecdc2b4aaff6681b33.zip
hdf5-203799486de690f5ee5911ecdc2b4aaff6681b33.tar.gz
hdf5-203799486de690f5ee5911ecdc2b4aaff6681b33.tar.bz2
[svn-r8123] Purpose:
added more tests for szip and more verbose output Description: Solution: Platforms tested: linux solaris AIX Misc. update:
Diffstat (limited to 'tools')
-rw-r--r--tools/h5repack/h5repack_filters.c11
-rw-r--r--tools/h5repack/h5repack_verify.c9
-rw-r--r--tools/h5repack/testh5repack_main.c19
3 files changed, 38 insertions, 1 deletions
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 0a0de02..aead698 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -199,6 +199,17 @@ int apply_filters(hid_t dcpl_id,
}
/*-------------------------------------------------------------------------
+ * check if we have filters in the pipeline
+ * we want to replace them with the input filters
+ *-------------------------------------------------------------------------
+ */
+
+ if (nfilters) {
+ if (H5Pdelete_filter(dcpl_id,H5Z_FILTER_NONE)<0)
+ return -1;
+ }
+
+/*-------------------------------------------------------------------------
* the type of filter and additional parameter
* type can be one of the filters
* H5Z_FILTER_NONE 0, uncompress if compressed
diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
index bbf0492..61529e3 100644
--- a/tools/h5repack/h5repack_verify.c
+++ b/tools/h5repack/h5repack_verify.c
@@ -183,6 +183,11 @@ int h5repack_verify(const char *fname,
if ((dcpl_id=H5Dget_create_plist(dset_id))<0)
goto error;
+ if (options->verbose) {
+ printf(" %-10s %s\n", "dataset",name );
+ print_filters(dcpl_id);
+ }
+
/*-------------------------------------------------------------------------
* filter check
*-------------------------------------------------------------------------
@@ -251,6 +256,10 @@ int h5repack_verify(const char *fname,
if ((dcpl_id=H5Dget_create_plist(dset_id))<0)
goto error;
+ if (options->verbose) {
+ printf(" %-10s %s\n", "dataset",name );
+ print_filters(dcpl_id);
+ }
/*-------------------------------------------------------------------------
* filter check
*-------------------------------------------------------------------------
diff --git a/tools/h5repack/testh5repack_main.c b/tools/h5repack/testh5repack_main.c
index fc7d571..6b829ee 100644
--- a/tools/h5repack/testh5repack_main.c
+++ b/tools/h5repack/testh5repack_main.c
@@ -322,7 +322,24 @@ test_filter_szip(void)
TEST_ERROR;
if (h5repack_end (&pack_options)<0)
TEST_ERROR;
-
+
+/*-------------------------------------------------------------------------
+ * test all objects option
+ *-------------------------------------------------------------------------
+ */
+
+ if (h5repack_init (&pack_options, 0)<0)
+ TEST_ERROR;
+ if (h5repack_addfilter("SZIP 8",&pack_options)<0)
+ TEST_ERROR;
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ TEST_ERROR;
+ if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
+ TEST_ERROR;
+ if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+ TEST_ERROR;
+ if (h5repack_end (&pack_options)<0)
+ TEST_ERROR;
PASSED();
#else