diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-07-31 19:53:14 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-07-31 19:53:14 (GMT) |
| commit | 26303bfdb55cf158a24a58ad64e81c9bbd65b7f9 (patch) | |
| tree | d4faa210235702a2240acbac9e2432731de24fd5 | |
| parent | beb04ae817268a49656b5abe043627dcbba15e5d (diff) | |
| download | hdf5-26303bfdb55cf158a24a58ad64e81c9bbd65b7f9.zip hdf5-26303bfdb55cf158a24a58ad64e81c9bbd65b7f9.tar.gz hdf5-26303bfdb55cf158a24a58ad64e81c9bbd65b7f9.tar.bz2 | |
[svn-r12520] bug fix
added a call to h5tools_close
tested: linux
| -rw-r--r-- | tools/h5copy/h5copy.c | 16 | ||||
| -rw-r--r-- | tools/h5copy/testh5copy.sh | 14 |
2 files changed, 24 insertions, 6 deletions
diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c index a57f96a..dacef35 100644 --- a/tools/h5copy/h5copy.c +++ b/tools/h5copy/h5copy.c @@ -19,6 +19,10 @@ #include <string.h> #include <stdlib.h> +#if 0 +#define H5COPY_DEBUG +#endif + const char *progname="h5copy"; int d_status; @@ -153,6 +157,9 @@ main (int argc, const char *argv[]) int verbose=0; hid_t pid; char str_flag[20]; + + /* initialize h5tools lib */ + h5tools_init(); /* switches come before non-switch arguments */ for (argno=1; argno<argc && '-'==argv[argno][0]; argno++) @@ -209,6 +216,9 @@ main (int argc, const char *argv[]) while (fname_src && *fname_src) { +#ifdef H5COPY_DEBUG + printf("%s\n",fname_src); +#endif fid_src = h5tools_fopen(fname_src, NULL, NULL, 0, argc, argv); if (fid_src>=0) @@ -240,7 +250,7 @@ main (int argc, const char *argv[]) } /*------------------------------------------------------------------------- - * last argument, same logic, but the file does not exist, so we attempt to + * last argument, same logic, but the file might not exist, so we attempt to * create one instead *-------------------------------------------------------------------------*/ @@ -341,6 +351,8 @@ main (int argc, const char *argv[]) free(fname_src); if (fname_dst) free(fname_dst); + + h5tools_close(); return 0; @@ -356,6 +368,8 @@ error: free(fname_src); if (fname_dst) free(fname_dst); + + h5tools_close(); return 1; diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh index 5bf4828..13b7e81 100644 --- a/tools/h5copy/testh5copy.sh +++ b/tools/h5copy/testh5copy.sh @@ -45,8 +45,12 @@ TOOLTEST() { TESTING $H5COPY $@ ( - cd $srcdir/../testfiles - $RUNSERIAL $H5COPY_BIN $@ + echo "#############################" + echo " output for '$H5COPY $@'" + echo "#############################" + cd $srcdir/../testfiles +# echo " pwd = `pwd`" + $RUNSERIAL $H5COPY_BIN $@ ) > output.out RET=$? if [ $RET != 0 ] ; then @@ -65,8 +69,8 @@ TOOLTEST() { #TOOLTEST -v test1.h5/integer test1.out.h5/integer_copy #TOOLTEST -v test1.h5/g1 test1.out.h5/g1 -#if test $nerrors -eq 0 ; then -# echo "All h5copy tests passed." -#fi +if test $nerrors -eq 0 ; then + echo "All h5copy tests passed." +fi exit $nerrors |