summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2004-01-06 18:18:05 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2004-01-06 18:18:05 (GMT)
commite59b3d3bcf0f95e1c2d90997280135a3ae8cdfee (patch)
tree624994d058b80e7c18e332705119ee4076cca84c
parentce2b03097bbf2fb80db60673610e707a028645d0 (diff)
downloadhdf5-e59b3d3bcf0f95e1c2d90997280135a3ae8cdfee.zip
hdf5-e59b3d3bcf0f95e1c2d90997280135a3ae8cdfee.tar.gz
hdf5-e59b3d3bcf0f95e1c2d90997280135a3ae8cdfee.tar.bz2
[svn-r8025] Purpose:
small fix Description: the main prog had some repeated code Solution: Platforms tested: linux solaris AIX Misc. update:
-rw-r--r--tools/h5repack/testh5repack_main.c27
1 files changed, 4 insertions, 23 deletions
diff --git a/tools/h5repack/testh5repack_main.c b/tools/h5repack/testh5repack_main.c
index d18bd5b..0ab5f1c 100644
--- a/tools/h5repack/testh5repack_main.c
+++ b/tools/h5repack/testh5repack_main.c
@@ -713,12 +713,10 @@ test_filterqueue(void)
TEST_ERROR;
if (h5repack_addfilter("dset1:SHUF",&pack_options)<0)
TEST_ERROR;
- if (h5repack_addfilter("dset1:GZIP 1",&pack_options)<0)
- TEST_ERROR;
-#if 0
if (h5repack_addfilter("dset1:SZIP 8",&pack_options)<0)
TEST_ERROR;
-#endif
+ if (h5repack_addfilter("dset1:GZIP 1",&pack_options)<0)
+ TEST_ERROR;
if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
@@ -745,7 +743,7 @@ error:
* Failure: non-zero
*
* Programmer: Pedro Vicente <pvn@ncsa.uiuc.edu>
- * January, 5, 2004
+ * January, 6, 2004
*
*-------------------------------------------------------------------------
*/
@@ -785,22 +783,7 @@ int main (void)
/* test a copy with layout COMPA options */
nerrors += test_layout_compact();
-
- /* test a copy with the shuffle filter */
- nerrors += test_filter_shuffle();
-
- /* test a copy with the checksum filter */
- nerrors += test_filter_checksum();
-
- /* test a copy with layout CHUNK options */
- nerrors += test_layout_chunked();
-
- /* test a copy with layout CONTI options */
- nerrors += test_layout_contiguous();
-
- /* test a copy with layout COMPA options */
- nerrors += test_layout_compact();
-
+
/* test a copy with all available filters */
nerrors += test_filterqueue();
@@ -815,8 +798,6 @@ error:
puts("***** H5REPACK TESTS FAILED *****");
return 1;
-
- return 0;
}