diff options
author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-03-27 20:09:01 (GMT) |
---|---|---|
committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-03-27 20:09:01 (GMT) |
commit | 26e1b18a578af61b491ff47a32779507df77a6ff (patch) | |
tree | 7ed5546454ffd360082b8ab2da1b7f85677cb3c0 /tools/h5repack/testh5repack_main.c | |
parent | 983e043587f221bc2d0ebc17e403f8f61f438dfd (diff) | |
download | hdf5-26e1b18a578af61b491ff47a32779507df77a6ff.zip hdf5-26e1b18a578af61b491ff47a32779507df77a6ff.tar.gz hdf5-26e1b18a578af61b491ff47a32779507df77a6ff.tar.bz2 |
[svn-r12159] Purpose:
bug fix
Description:
h5repack was not dealing with family files
Solution:
use the toolslib function h5tools_open to open the file instead of H5Fopen in h5repack
Platforms tested:
linux
solaris
AIX
Misc. update:
Diffstat (limited to 'tools/h5repack/testh5repack_main.c')
-rw-r--r-- | tools/h5repack/testh5repack_main.c | 96 |
1 files changed, 49 insertions, 47 deletions
diff --git a/tools/h5repack/testh5repack_main.c b/tools/h5repack/testh5repack_main.c index 42beb76..19dc956 100644 --- a/tools/h5repack/testh5repack_main.c +++ b/tools/h5repack/testh5repack_main.c @@ -36,8 +36,10 @@ *------------------------------------------------------------------------- */ +const char *progname = "h5repacktst"; +int d_status = EXIT_SUCCESS; -int main (void) +int main (int argc, char **argv) { pack_opt_t pack_options; diff_opt_t diff_options; @@ -70,7 +72,7 @@ int main (void) TESTING(" copy of datasets (fill values)"); if (h5repack_init (&pack_options, 0)<0) TEST_ERROR; - if (h5repack(FNAME0,FNAME0OUT,&pack_options)<0) + if (h5repack(FNAME0,FNAME0OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME0,FNAME0OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -91,7 +93,7 @@ int main (void) TESTING(" copy of datasets (all datatypes)"); if (h5repack_init (&pack_options, 0)<0) TEST_ERROR; - if (h5repack(FNAME1,FNAME1OUT,&pack_options)<0) + if (h5repack(FNAME1,FNAME1OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME1,FNAME1OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -110,7 +112,7 @@ int main (void) TESTING(" copy of datasets (attributes)"); if (h5repack_init (&pack_options, 0)<0) TEST_ERROR; - if (h5repack(FNAME2,FNAME2OUT,&pack_options)<0) + if (h5repack(FNAME2,FNAME2OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME2,FNAME2OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -130,7 +132,7 @@ int main (void) TESTING(" copy of datasets (hardlinks)"); if (h5repack_init (&pack_options, 0)<0) TEST_ERROR; - if (h5repack(FNAME3,FNAME3OUT,&pack_options)<0) + if (h5repack(FNAME3,FNAME3OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME3,FNAME3OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -150,7 +152,7 @@ int main (void) TESTING(" copy of allocation early file"); if (h5repack_init (&pack_options, 0)<0) TEST_ERROR; - if (h5repack(FNAME5,FNAME5OUT,&pack_options)<0) + if (h5repack(FNAME5,FNAME5OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME5,FNAME5OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -184,7 +186,7 @@ int main (void) TEST_ERROR; if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -212,7 +214,7 @@ int main (void) TEST_ERROR; if (h5repack_addlayout("CHUNK=20x10",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -250,7 +252,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset2:CHUNK=20x10",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -280,7 +282,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("SZIP=8,NN",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -313,7 +315,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -342,7 +344,7 @@ TESTING(" addding shuffle filter to all"); TEST_ERROR; if (h5repack_addlayout("CHUNK=20x10",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -373,7 +375,7 @@ TESTING(" addding shuffle filter to all"); TEST_ERROR; if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -403,7 +405,7 @@ TESTING(" addding shuffle filter to all"); TEST_ERROR; if (h5repack_addlayout("CHUNK=20x10",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -452,7 +454,7 @@ if (szip_can_encode) { TEST_ERROR; #endif - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -475,7 +477,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -495,7 +497,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("CHUNK=20x10",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -516,7 +518,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset1:CONTI",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -537,7 +539,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("CONTI",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -559,7 +561,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset1:COMPA",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -580,7 +582,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("COMPA",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -602,7 +604,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset_compact:CONTI",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -622,7 +624,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset_compact:CHUNK=2x5",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -642,7 +644,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset_compact:COMPA",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -661,7 +663,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset_contiguous:COMPA",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -680,7 +682,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset_contiguous:CHUNK=3x6",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -700,7 +702,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset_contiguous:CONTI",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -719,7 +721,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset_chunk:COMPA",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -739,7 +741,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset_chunk:CONTI",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -758,7 +760,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addlayout("dset_chunk:CHUNK=18x13",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0) + if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -786,7 +788,7 @@ if (szip_can_encode) { if (szip_can_encode) { if (h5repack_init (&pack_options, 0)<0) TEST_ERROR; - if (h5repack(FNAME7,FNAME7OUT,&pack_options)<0) + if (h5repack(FNAME7,FNAME7OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME7,FNAME7OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -811,7 +813,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("dset_szip:NONE",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME7,FNAME7OUT,&pack_options)<0) + if (h5repack(FNAME7,FNAME7OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME7,FNAME7OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -834,7 +836,7 @@ if (szip_can_encode) { #ifdef H5_HAVE_FILTER_DEFLATE if (h5repack_init (&pack_options, 0)<0) TEST_ERROR; - if (h5repack(FNAME8,FNAME8OUT,&pack_options)<0) + if (h5repack(FNAME8,FNAME8OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -856,7 +858,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("dset_deflate:NONE",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME8,FNAME8OUT,&pack_options)<0) + if (h5repack(FNAME8,FNAME8OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -877,7 +879,7 @@ if (szip_can_encode) { #ifdef H5_HAVE_FILTER_SHUFFLE if (h5repack_init (&pack_options, 0)<0) TEST_ERROR; - if (h5repack(FNAME9,FNAME9OUT,&pack_options)<0) + if (h5repack(FNAME9,FNAME9OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME9,FNAME9OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -898,7 +900,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("dset_shuffle:NONE",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME9,FNAME9OUT,&pack_options)<0) + if (h5repack(FNAME9,FNAME9OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME9,FNAME9OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -917,7 +919,7 @@ if (szip_can_encode) { #ifdef H5_HAVE_FILTER_FLETCHER32 if (h5repack_init (&pack_options, 0)<0) TEST_ERROR; - if (h5repack(FNAME10,FNAME10OUT,&pack_options)<0) + if (h5repack(FNAME10,FNAME10OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME10,FNAME10OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -938,7 +940,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("dset_fletcher32:NONE",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME10,FNAME10OUT,&pack_options)<0) + if (h5repack(FNAME10,FNAME10OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME10,FNAME10OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -958,7 +960,7 @@ if (szip_can_encode) { #ifdef H5_HAVE_FILTER_NBIT if (h5repack_init (&pack_options, 0)<0) TEST_ERROR; - if (h5repack(FNAME12,FNAME12OUT,&pack_options)<0) + if (h5repack(FNAME12,FNAME12OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -979,7 +981,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("dset_nbit:NONE",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME12,FNAME12OUT,&pack_options)<0) + if (h5repack(FNAME12,FNAME12OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -1000,7 +1002,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("dset_int31:NBIT",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME12,FNAME12OUT,&pack_options)<0) + if (h5repack(FNAME12,FNAME12OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -1018,7 +1020,7 @@ if (szip_can_encode) { #ifdef H5_HAVE_FILTER_SCALEOFFSET if (h5repack_init (&pack_options, 0)<0) TEST_ERROR; - if (h5repack(FNAME13,FNAME13OUT,&pack_options)<0) + if (h5repack(FNAME13,FNAME13OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -1039,7 +1041,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("dset_scaleoffset:NONE",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME13,FNAME13OUT,&pack_options)<0) + if (h5repack(FNAME13,FNAME13OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -1061,7 +1063,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("dset_none:SOFF=31,IN",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME13,FNAME13OUT,&pack_options)<0) + if (h5repack(FNAME13,FNAME13OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -1097,7 +1099,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("dset_deflate:SZIP=8,NN",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME11,FNAME11OUT,&pack_options)<0) + if (h5repack(FNAME11,FNAME11OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -1125,7 +1127,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("dset_szip:GZIP=1",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME11,FNAME11OUT,&pack_options)<0) + if (h5repack(FNAME11,FNAME11OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; @@ -1157,7 +1159,7 @@ if (szip_can_encode) { TEST_ERROR; if (h5repack_addfilter("NONE",&pack_options)<0) TEST_ERROR; - if (h5repack(FNAME11,FNAME11OUT,&pack_options)<0) + if (h5repack(FNAME11,FNAME11OUT,&pack_options,argc,argv)<0) TEST_ERROR; if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) == 1) TEST_ERROR; |