[svn-r14258] new feature: make h5diff use the same command line parsing code and syntax than h5dump

usage is now 
h5diff  [OPTIONS]  file1 file2  [obj1[obj2]]

tested: windows, linux, solaris

5 files changed, 252 insertions, 85 deletions

diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index cf83c22..898f56c 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -19,16 +19,46 @@
 #include "h5diff_common.h"
 #include "h5tools_utils.h"
 
+int check_n_input( const char* );
+int check_p_input( const char* );
+int check_d_input( const char* );
+
+
+/* module-scoped variables */
+const char  *progname = "h5diff";
+
+/*
+ * Command-line options: The user can specify short or long-named
+ * parameters.
+ */
+static const char *s_opts = "hVrvqn:d:p:";
+static struct long_options l_opts[] = {
+    { "help", no_arg, 'h' },
+    { "version", no_arg, 'V' },
+    { "report", no_arg, 'r' },
+    { "verbose", no_arg, 'v' },
+    { "quiet", no_arg, 'q' },
+    { "count", require_arg, 'n' },
+    { "delta", require_arg, 'd' },
+    { "relative", require_arg, 'p' },
+    { NULL, 0, '\0' }
+};
+
 
 /*-------------------------------------------------------------------------
- * Function: parse_input
+ * Function: parse_command_line
  *
  * Purpose: parse command line input
  *
  *-------------------------------------------------------------------------
  */
+#if 0
+#define OLD
+#endif
 
-void parse_input(int argc, 
+#if defined (OLD)
+
+void parse_command_line(int argc, 
                  const char* argv[], 
                  const char** fname1, 
                  const char** fname2,
@@ -108,7 +138,7 @@ void parse_input(int argc,
      if ( i<argc-1 &&'-' != argv[i+1][0] )
      {
       options->d=1;
-      if ( check_f_input(argv[i+1])==-1)
+      if ( check_p_input(argv[i+1])==-1)
       {
        printf("<-d %s> is not a valid option\n", argv[i+1] );
        usage();
@@ -126,7 +156,7 @@ void parse_input(int argc,
      if ( i<argc-1 &&'-' !=argv[i+1][0] )
      {
       options->p=1;
-      if ( check_f_input(argv[i+1])==-1)
+      if ( check_p_input(argv[i+1])==-1)
       {
        printf("<-p %s> is not a valid option\n", argv[i+1] );
        usage();
@@ -190,6 +220,118 @@ void parse_input(int argc,
  }/*for*/
 }
 
+#else
+
+void parse_command_line(int argc, 
+                        const char* argv[], 
+                        const char** fname1, 
+                        const char** fname2,
+                        const char** objname1, 
+                        const char** objname2, 
+                        diff_opt_t* options)
+{
+    
+    int opt;
+
+    /* process the command-line */
+    memset(options, 0, sizeof (diff_opt_t));
+    
+    /* parse command line options */
+    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) 
+    {
+        switch ((char)opt) 
+        {
+        default:
+            usage();
+            h5diff_exit(EXIT_FAILURE);
+        case 'h':
+            usage();
+            h5diff_exit(EXIT_SUCCESS);
+        case 'V':
+            print_version(progname);
+            h5diff_exit(EXIT_SUCCESS);
+        case 'v':
+            options->m_verbose = 1;
+            break;
+        case 'q':
+            /* use quiet mode; supress the message "0 differences found" */
+            options->m_quiet = 1;
+            break;
+        case 'r':
+            options->m_report = 1;
+            break;
+        case 'd':
+            options->d=1;
+            
+            if ( check_d_input( opt_arg )==-1)
+            {
+                printf("<-d %s> is not a valid option\n", opt_arg );
+                usage();
+                h5diff_exit(EXIT_FAILURE);
+            }
+            options->delta = atof( opt_arg );
+            break;
+
+        case 'p':
+            
+            options->p=1;
+            if ( check_p_input( opt_arg )==-1)
+            {
+                printf("<-p %s> is not a valid option\n", opt_arg );
+                usage();
+                h5diff_exit(EXIT_FAILURE);
+            }
+            options->percent = atof( opt_arg );
+            break;
+
+        case 'n':
+            
+            options->n=1;
+            if ( check_n_input( opt_arg )==-1)
+            {
+                printf("<-n %s> is not a valid option\n", opt_arg );
+                usage();
+                h5diff_exit(EXIT_FAILURE);
+            }
+            options->count = atol( opt_arg );
+            
+            break;
+        }
+    }
+    
+    /* check for file names to be processed */
+    if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL) 
+    {
+        error_msg(progname, "missing file names\n");
+        usage();
+        h5diff_exit(EXIT_FAILURE);
+    }
+
+    *fname1 = argv[ opt_ind ];
+    *fname2 = argv[ opt_ind + 1 ];
+    *objname1 = argv[ opt_ind + 2 ];
+
+    if ( *objname1 == NULL )
+    {
+        *objname2 = NULL;
+        return;
+    }
+
+    if ( argv[ opt_ind + 3 ] != NULL) 
+    {
+        *objname2 = argv[ opt_ind + 3 ];
+    }
+    else
+    {
+        *objname2 = *objname1;
+    }
+
+   
+}
+
+
+#endif
+
 /*-------------------------------------------------------------------------
  * Function: print_info
  *
@@ -259,9 +401,9 @@ int check_n_input( const char *str )
 }
 
 /*-------------------------------------------------------------------------
- * Function: check_f_input
+ * Function: check_p_input
  *
- * Purpose: check for a valid floating point input
+ * Purpose: check for a valid p option input
  *
  * Return: 1 for ok, -1 for fail
  *
@@ -273,7 +415,40 @@ int check_n_input( const char *str )
  *
  *-------------------------------------------------------------------------
  */
-int check_f_input( const char *str )
+int check_p_input( const char *str )
+{
+ double x;
+
+ /*
+ the atof return value on a hexadecimal input is different
+ on some systems; we do a character check for this
+ */
+ if (strlen(str)>2 && str[0]=='0' && str[1]=='x')
+  return -1;
+
+ x=atof(str);
+ if (x<=0)
+  return -1;
+
+ return 1;
+}
+
+/*-------------------------------------------------------------------------
+ * Function: check_d_input
+ *
+ * Purpose: check for a valid d option input
+ *
+ * Return: 1 for ok, -1 for fail
+ *
+ * Date: November 11, 2007
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+int check_d_input( const char *str )
 {
  double x;
 
@@ -285,7 +460,7 @@ int check_f_input( const char *str )
   return -1;
 
  x=atof(str);
- if (x==0)
+ if (x <=0)
   return -1;
 
  return 1;
@@ -302,7 +477,7 @@ int check_f_input( const char *str )
  */
 void usage(void)
 {
- printf("usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] \n");
+ printf("usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] \n");
  printf("\n");
  printf("file1             File name of the first HDF5 file\n");
  printf("file2             File name of the second HDF5 file\n");
@@ -356,12 +531,6 @@ void usage(void)
  printf("1) datasets: numerical array differences 2) groups: name string difference ");
  printf("3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value\n");
 
- #ifdef H5_HAVE_PARALLEL
- if(g_Parallel)
-  h5diff_exit(0);
- else
-#endif
-  exit(0);
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/h5diff/h5diff_common.h b/tools/h5diff/h5diff_common.h
index f540a20..2796bd5 100644
--- a/tools/h5diff/h5diff_common.h
+++ b/tools/h5diff/h5diff_common.h
@@ -17,9 +17,7 @@ extern unsigned char g_Parallel;
 extern int g_nTasks;
 
 void usage(void);
-int check_n_input( const char* );
-int check_f_input( const char* );
-void parse_input(int argc, const char* argv[], const char** fname1, const char** fname2, const char** objname1, const char** objname2, diff_opt_t* options);
+void parse_command_line(int argc, const char* argv[], const char** fname1, const char** fname2, const char** objname1, const char** objname2, diff_opt_t* options);
 void h5diff_exit(int status);
 void print_info(diff_opt_t* options);
 
diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index c5c447c..e7795c6 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -66,14 +66,14 @@
 int main(int argc, const char *argv[])
 {
     int        ret;
-    const char *fname1 = NULL;
-    const char *fname2 = NULL;
-    const char *objname1  = NULL;
-    const char *objname2  = NULL;
+    char       *fname1 = NULL;
+    char       *fname2 = NULL;
+    char       *objname1  = NULL;
+    char       *objname2  = NULL;
     hsize_t    nfound=0;
     diff_opt_t options;
 
-    parse_input(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
+    parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
 
     nfound = h5diff(fname1,fname2,objname1,objname2,&options);
 
diff --git a/tools/h5diff/ph5diff_main.c b/tools/h5diff/ph5diff_main.c
index af2ab7f..a4ac793 100644
--- a/tools/h5diff/ph5diff_main.c
+++ b/tools/h5diff/ph5diff_main.c
@@ -76,7 +76,7 @@ int main(int argc, const char *argv[])
 
         g_Parallel = 0;
 
-        parse_input(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
+        parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
 
         nfound = h5diff(fname1, fname2, objname1, objname2, &options);
 
@@ -90,7 +90,7 @@ int main(int argc, const char *argv[])
     /* Have the manager process the command-line */
     if(nID == 0)
     {
-        parse_input(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
+        parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
 
         nfound = h5diff(fname1, fname2, objname1, objname2, &options);
 
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index dd538e0..ccf4232 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -278,63 +278,63 @@ TOOLTEST h5diff_11.txt  $FILE1 $FILE2
 TOOLTEST h5diff_12.txt  $FILE1 $FILE2  g1/dset1 g1/dset2
 
 # 1.3 report mode
-TOOLTEST h5diff_13.txt $FILE1 $FILE2 -r
+TOOLTEST h5diff_13.txt -r $FILE1 $FILE2 
 
 # 1.4 report  mode with objects
-TOOLTEST h5diff_14.txt  $FILE1 $FILE2  -r g1/dset1 g1/dset2
+TOOLTEST h5diff_14.txt  -r $FILE1 $FILE2 g1/dset1 g1/dset2
 
 # 1.5 with -d
-TOOLTEST h5diff_15.txt $FILE1 $FILE2 -r -d 5 g1/dset3 g1/dset4
+TOOLTEST h5diff_15.txt -r -d 5 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 1.6.1 with -p (int)
-TOOLTEST h5diff_16_1.txt $FILE1 $FILE1 -v -p 0.02 g1/dset5 g1/dset6
+TOOLTEST h5diff_16_1.txt -v -p 0.02 $FILE1 $FILE1 g1/dset5 g1/dset6
 
 # 1.6.2 with -p (unsigned long_long)
-TOOLTEST h5diff_16_2.txt $FILE1 $FILE1 -v -p 0.02 g1/dset7 g1/dset8
+TOOLTEST h5diff_16_2.txt -v -p 0.02 $FILE1 $FILE1 g1/dset7 g1/dset8
 
 # 1.6.3 with -p (double)
-TOOLTEST h5diff_16_3.txt $FILE1 $FILE1 -v -p 0.02 g1/dset9 g1/dset10
+TOOLTEST h5diff_16_3.txt -v -p 0.02 $FILE1 $FILE1 g1/dset9 g1/dset10
 
 # 1.7 verbose mode
-TOOLTEST h5diff_17.txt $FILE1 $FILE2 -v  
+TOOLTEST h5diff_17.txt -v $FILE1 $FILE2   
 
 # 1.8 quiet mode 
-TOOLTEST h5diff_18.txt $FILE1 $FILE2 -q
+TOOLTEST h5diff_18.txt -q $FILE1 $FILE2 
 
 # ##############################################################################
 # # not comparable types
 # ##############################################################################
 
 # 2.0
-TOOLTEST h5diff_20.txt $FILE3 $FILE3 -v dset g1
+TOOLTEST h5diff_20.txt -v $FILE3 $FILE3  dset g1
 
 # 2.1
-TOOLTEST h5diff_21.txt $FILE3 $FILE3 -v dset l1
+TOOLTEST h5diff_21.txt -v $FILE3 $FILE3 dset l1
 
 # 2.2
-TOOLTEST h5diff_22.txt $FILE3 $FILE3 -v dset t1
+TOOLTEST h5diff_22.txt -v  $FILE3 $FILE3 dset t1
 
 # ##############################################################################
 # # compare groups, types, links (no differences and differences)
 # ##############################################################################
 
 # 2.3
-TOOLTEST h5diff_23.txt $FILE3 $FILE3 -v g1 g1
+TOOLTEST h5diff_23.txt -v $FILE3 $FILE3 g1 g1
 
 # 2.4
-TOOLTEST h5diff_24.txt $FILE3 $FILE3 -v t1 t1
+TOOLTEST h5diff_24.txt -v $FILE3 $FILE3 t1 t1
 
 # 2.5
-TOOLTEST h5diff_25.txt $FILE3 $FILE3 -v l1 l1 
+TOOLTEST h5diff_25.txt -v $FILE3 $FILE3 l1 l1 
 
 # 2.6
-TOOLTEST h5diff_26.txt $FILE3 $FILE3 -v g1 g2
+TOOLTEST h5diff_26.txt -v $FILE3 $FILE3 g1 g2
 
 # 2.7
-TOOLTEST h5diff_27.txt $FILE3 $FILE3 -v t1 t2
+TOOLTEST h5diff_27.txt -v $FILE3 $FILE3 t1 t2
 
 # 2.8
-TOOLTEST h5diff_28.txt $FILE3 $FILE3 -v l1 l2
+TOOLTEST h5diff_28.txt -v $FILE3 $FILE3 l1 l2
 
 
 
@@ -343,31 +343,31 @@ TOOLTEST h5diff_28.txt $FILE3 $FILE3 -v l1 l2
 # ##############################################################################
 
 # 5.0
-TOOLTEST h5diff_50.txt $FILE4 $FILE4 -v dset0a dset0b
+TOOLTEST h5diff_50.txt -v $FILE4 $FILE4 dset0a dset0b
 
 # 5.1
-TOOLTEST h5diff_51.txt $FILE4 $FILE4 -v dset1a dset1b
+TOOLTEST h5diff_51.txt -v $FILE4 $FILE4 dset1a dset1b
 
 # 5.2
-TOOLTEST h5diff_52.txt $FILE4 $FILE4 -v dset2a dset2b
+TOOLTEST h5diff_52.txt -v $FILE4 $FILE4 dset2a dset2b
 
 # 5.3
-TOOLTEST h5diff_53.txt $FILE4 $FILE4 -v dset3a dset4b
+TOOLTEST h5diff_53.txt -v $FILE4 $FILE4 dset3a dset4b
 
 # 5.4
-TOOLTEST h5diff_54.txt $FILE4 $FILE4 -v dset4a dset4b
+TOOLTEST h5diff_54.txt -v $FILE4 $FILE4 dset4a dset4b
 
 # 5.5
-TOOLTEST h5diff_55.txt $FILE4 $FILE4 -v dset5a dset5b
+TOOLTEST h5diff_55.txt -v $FILE4 $FILE4 dset5a dset5b
 
 # 5.6
-TOOLTEST h5diff_56.txt $FILE4 $FILE4 -v dset6a dset6b
+TOOLTEST h5diff_56.txt -v $FILE4 $FILE4 dset6a dset6b
 
 # 5.7
-TOOLTEST h5diff_57.txt $FILE4 $FILE4 -v dset7a dset7b
+TOOLTEST h5diff_57.txt -v $FILE4 $FILE4 dset7a dset7b
 
 # 5.8 (region reference)
-TOOLTEST h5diff_58.txt $FILE7 $FILE8 -v refreg
+TOOLTEST h5diff_58.txt -v $FILE7 $FILE8 refreg
 
 # ##############################################################################
 # # Error messages
@@ -378,38 +378,38 @@ TOOLTEST h5diff_58.txt $FILE7 $FILE8 -v refreg
 TOOLTEST h5diff_600.txt $FILE1 
 
 # 6.1: Check for invalid options
-TOOLTEST h5diff_601.txt $FILE1 $FILE2 -x 
+#TOOLTEST h5diff_601.txt -x $FILE1 $FILE2 
 
 # ##############################################################################
 # # -d 
 # ##############################################################################
 
 # 6.2: no value
-TOOLTEST h5diff_602.txt $FILE1 $FILE2  -d g1/dset3 g1/dset4
+TOOLTEST h5diff_602.txt -d $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.3: negative value
-TOOLTEST h5diff_603.txt $FILE1 $FILE2  -d -4 g1/dset3 g1/dset4
+TOOLTEST h5diff_603.txt -d -4 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.4: zero
-TOOLTEST h5diff_604.txt $FILE1 $FILE2  -d 0 g1/dset3 g1/dset4
+TOOLTEST h5diff_604.txt -d 0 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.5: non number
-TOOLTEST h5diff_605.txt $FILE1 $FILE2  -d u g1/dset3 g1/dset4
+TOOLTEST h5diff_605.txt -d u $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.6: hexadecimal
-TOOLTEST h5diff_606.txt $FILE1 $FILE2 -d 0x1 g1/dset3 g1/dset4
+TOOLTEST h5diff_606.txt -d 0x1 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.7: string
-TOOLTEST h5diff_607.txt $FILE1 $FILE2  -d "1" g1/dset3 g1/dset4
+TOOLTEST h5diff_607.txt -d "1" $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.8: repeated option
-TOOLTEST h5diff_608.txt $FILE1 $FILE2  -d 1 -d 2 g1/dset3 g1/dset4
+TOOLTEST h5diff_608.txt -d 1 -d 2 $FILE1 $FILE2  g1/dset3 g1/dset4
 
 # 6.9: number larger than biggest difference
-TOOLTEST h5diff_609.txt $FILE1 $FILE2  -d 200 g1/dset3 g1/dset4
+TOOLTEST h5diff_609.txt -d 200 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.10: number smaller than smallest difference
-TOOLTEST h5diff_610.txt $FILE1 $FILE2  -d 1 g1/dset3 g1/dset4
+TOOLTEST h5diff_610.txt -d 1 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 
 # ##############################################################################
@@ -418,31 +418,31 @@ TOOLTEST h5diff_610.txt $FILE1 $FILE2  -d 1 g1/dset3 g1/dset4
 
 
 # 6.11: no value
-TOOLTEST h5diff_611.txt $FILE1 $FILE2 -r -p g1/dset3 g1/dset4
+TOOLTEST h5diff_611.txt -r -p $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.12: negative value
-TOOLTEST h5diff_612.txt $FILE1 $FILE2 -p -4 g1/dset3 g1/dset4
+TOOLTEST h5diff_612.txt -p -4 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.13: zero
-TOOLTEST h5diff_613.txt $FILE1 $FILE2 -p 0 g1/dset3 g1/dset4
+TOOLTEST h5diff_613.txt -p 0 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.14: non number
-TOOLTEST h5diff_614.txt $FILE1 $FILE2 -p u g1/dset3 g1/dset4
+TOOLTEST h5diff_614.txt -p u $FILE1 $FILE2  g1/dset3 g1/dset4
 
 # 6.15: hexadecimal
-TOOLTEST h5diff_615.txt $FILE1 $FILE2 -p 0x1 g1/dset3 g1/dset4
+TOOLTEST h5diff_615.txt -p 0x1 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.16: string
-TOOLTEST h5diff_616.txt $FILE1 $FILE2 -p "0.21" g1/dset3 g1/dset4
+TOOLTEST h5diff_616.txt -p "0.21" $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.17: repeated option
-TOOLTEST h5diff_617.txt $FILE1 $FILE2 -p 0.21 -p 0.22 g1/dset3 g1/dset4
+TOOLTEST h5diff_617.txt -p 0.21 -p 0.22 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.18: number larger than biggest difference
-TOOLTEST h5diff_618.txt $FILE1 $FILE2 -p 2 g1/dset3 g1/dset4
+TOOLTEST h5diff_618.txt -p 2 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.19: number smaller than smallest difference
-TOOLTEST h5diff_619.txt $FILE1 $FILE2 -p 0.005 g1/dset3 g1/dset4
+TOOLTEST h5diff_619.txt -p 0.005 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 
 
@@ -452,31 +452,31 @@ TOOLTEST h5diff_619.txt $FILE1 $FILE2 -p 0.005 g1/dset3 g1/dset4
 
 
 # 6.20: no value
-TOOLTEST h5diff_620.txt $FILE1 $FILE2 -n g1/dset3 g1/dset4
+TOOLTEST h5diff_620.txt -n $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.21: negative value
-TOOLTEST h5diff_621.txt $FILE1 $FILE2 -n -4 g1/dset3 g1/dset4
+TOOLTEST h5diff_621.txt -n -4 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.22: zero
-TOOLTEST h5diff_622.txt $FILE1 $FILE2 -n 0 g1/dset3 g1/dset4
+TOOLTEST h5diff_622.txt -n 0 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.23: non number
-TOOLTEST h5diff_623.txt $FILE1 $FILE2 -n u g1/dset3 g1/dset4
+TOOLTEST h5diff_623.txt -n u $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.24: hexadecimal
-TOOLTEST h5diff_624.txt $FILE1 $FILE2 -n 0x1 g1/dset3 g1/dset4
+TOOLTEST h5diff_624.txt -n 0x1 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.25: string
-TOOLTEST h5diff_625.txt $FILE1 $FILE2 -n "2" g1/dset3 g1/dset4
+TOOLTEST h5diff_625.txt -n "2" $FILE1 $FILE2  g1/dset3 g1/dset4
 
 # 6.26: repeated option
-TOOLTEST h5diff_626.txt $FILE1 $FILE2 -n 2 -n 3 g1/dset3 g1/dset4
+TOOLTEST h5diff_626.txt -n 2 -n 3 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.27: number larger than biggest difference
-TOOLTEST h5diff_627.txt $FILE1 $FILE2 -n 200 g1/dset3 g1/dset4
+TOOLTEST h5diff_627.txt -n 200 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.28: number smaller than smallest difference
-TOOLTEST h5diff_628.txt $FILE1 $FILE2 -n 1 g1/dset3 g1/dset4
+TOOLTEST h5diff_628.txt -n 1 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.29  non valid files
 TOOLTEST h5diff_629.txt file1.h6 file2.h6
@@ -484,22 +484,22 @@ TOOLTEST h5diff_629.txt file1.h6 file2.h6
 # ##############################################################################
 # 7.  attributes
 # ##############################################################################
-TOOLTEST h5diff_70.txt $FILE5 $FILE6 -v
+TOOLTEST h5diff_70.txt -v $FILE5 $FILE6 
 
 # ##############################################################################
 # 8.  all dataset datatypes
 # ##############################################################################
-TOOLTEST h5diff_80.txt $FILE7 $FILE8 -v
+TOOLTEST h5diff_80.txt -v $FILE7 $FILE8 
 
 # 9. compare a file with itself
-TOOLTEST h5diff_90.txt $FILE2 $FILE2
+TOOLTEST h5diff_90.txt -v $FILE2 $FILE2
 
 # 10. read by hyperslab, print indexes
-TOOLTEST h5diff_100.txt $FILE9 $FILE10 -v
+TOOLTEST h5diff_100.txt -v $FILE9 $FILE10 
 
 # 11. floating point comparison
-TOOLTEST h5diff_101.txt $FILE1 $FILE1 g1/d1  g1/d2  -v
-TOOLTEST h5diff_102.txt $FILE1 $FILE1 g1/fp1 g1/fp2 -v
+TOOLTEST h5diff_101.txt -v $FILE1 $FILE1 g1/d1  g1/d2  
+TOOLTEST h5diff_102.txt -v $FILE1 $FILE1 g1/fp1 g1/fp2 
 
 # ##############################################################################
 # # END