[svn-r17053] merge 17052 from trunk

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: linux

1 files changed, 12 insertions, 3 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 596249d..bfe2a61 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;