summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2009-06-15 19:05:42 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2009-06-15 19:05:42 (GMT)
commitaad47d8e8bd166f9d9f981c9ef81f5d5398a9f65 (patch)
tree251d00e0276266c633dba64bcdfabec04aea0772 /tools/lib
parent049ce53e19cc9c4417b91acf4ad3b8819eaa7992 (diff)
downloadhdf5-aad47d8e8bd166f9d9f981c9ef81f5d5398a9f65.zip
hdf5-aad47d8e8bd166f9d9f981c9ef81f5d5398a9f65.tar.gz
hdf5-aad47d8e8bd166f9d9f981c9ef81f5d5398a9f65.tar.bz2
[svn-r17052] Add a run to the h5repack shell script to read a family file
The file used for input is located in the common source tools for testfiles, in tools/testfiles Modified the h5repack shell script to read files from this location (h5repack reads its input files from a dedicated testfiles location in h5repack/testfiles) Changed the h5diff open file call to use h5tools_fopen, so that it can open all file drivers Tested: windows, linux, solaris
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/h5diff.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 432dd95..5a4e2f2 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -17,6 +17,8 @@
#include "h5diff.h"
#include "H5private.h"
#include "ph5diff.h"
+#include "h5tools.h"
+#include "h5tools_utils.h"
/*
* Debug printf macros. The prefix allows output filtering by test scripts.
@@ -210,9 +212,11 @@ hsize_t h5diff(const char *fname1,
/* disable error reporting */
H5E_BEGIN_TRY
{
- /* open the files */
- if((file1_id = H5Fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+ /* open file 1 */
+
+ if((file1_id = h5tools_fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
{
+
parallel_print("h5diff: <%s>: unable to open file\n", fname1);
options->err_stat = 1;
@@ -223,8 +227,13 @@ hsize_t h5diff(const char *fname1,
#endif
goto out;
} /* end if */
- if((file2_id = H5Fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+
+
+ /* open file 2 */
+
+ if((file2_id = h5tools_fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
{
+
parallel_print("h5diff: <%s>: unable to open file\n", fname2);
options->err_stat = 1;