Add no subsets option to h5diff like h5dump (#2761)

15 files changed, 196 insertions, 268 deletions

diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index 62de20e..e7eb0b7 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -51,28 +51,29 @@ typedef struct {
     int                       mode_quiet;   /* quiet mode: no output at all */
     int                       mode_report;  /* report mode: print the data */
     int                       mode_verbose; /* verbose mode: print the data, list of objcets, warnings */
-    int                       mode_verbose_level; /* control verbose details */
-    int                       mode_list_not_cmp;  /* list not comparable messages */
-    int                       print_header;       /* print header */
-    int                       print_percentage;   /* print percentage */
-    int                       print_dims;         /* print dimension index */
-    int                       delta_bool;         /* delta, absolute value to compare */
-    double                    delta;              /* delta value */
-    int                       use_system_epsilon; /* flag to use system epsilon (1 or 0) */
-    int                       percent_bool;       /* relative error to compare*/
-    double                    percent;            /* relative error value */
-    hbool_t                   follow_links;       /* follow symbolic links */
-    int                       no_dangle_links;    /* return error when find dangling link */
-    int                       cmn_objs;           /* do we have common objects */
-    int                       not_cmp;            /* are the objects comparable */
-    int                       contents;           /* equal contents */
-    int                       do_nans;            /* consider Nans while diffing floats */
-    int                       exclude_path;       /* exclude path to an object */
-    int                       exclude_attr_path;  /* exclude path to an object */
-    struct exclude_path_list *exclude;            /* keep exclude path list */
-    struct exclude_path_list *exclude_attr;       /* keep exclude attribute list */
-    int                       count_bool;         /* count, compare up to count */
-    hsize_t                   count;              /* count value */
+    int                       mode_verbose_level;     /* control verbose details */
+    int                       mode_list_not_cmp;      /* list not comparable messages */
+    int                       print_header;           /* print header */
+    int                       print_percentage;       /* print percentage */
+    int                       print_dims;             /* print dimension index */
+    int                       delta_bool;             /* delta, absolute value to compare */
+    double                    delta;                  /* delta value */
+    int                       use_system_epsilon;     /* flag to use system epsilon (1 or 0) */
+    int                       percent_bool;           /* relative error to compare*/
+    double                    percent;                /* relative error value */
+    hbool_t                   follow_links;           /* follow symbolic links */
+    int                       no_dangle_links;        /* return error when find dangling link */
+    int                       cmn_objs;               /* do we have common objects */
+    int                       not_cmp;                /* are the objects comparable */
+    int                       contents;               /* equal contents */
+    int                       do_nans;                /* consider Nans while diffing floats */
+    int                       disable_compact_subset; /* disable compact form of subset notation */
+    int                       exclude_path;           /* exclude path to an object */
+    int                       exclude_attr_path;      /* exclude path to an object */
+    struct exclude_path_list *exclude;                /* keep exclude path list */
+    struct exclude_path_list *exclude_attr;           /* keep exclude attribute list */
+    int                       count_bool;             /* count, compare up to count */
+    hsize_t                   count;                  /* count value */
     diff_err_t                err_stat;  /* an error occurred (2, error, 1, differences, 0, no error) */
     hsize_t                   nelmts;    /* total number of elements */
     hsize_t                   hs_nelmts; /* number of elements to read at a time*/
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 79c0dca..f16ee0d 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -162,6 +162,128 @@ help_ref_msg(FILE *output)
 }
 
 /*-------------------------------------------------------------------------
+ * Function:    parse_hsize_list
+ *
+ * Purpose:     Parse a list of comma or space separated integers and return
+ *              them in a list. The string being passed into this function
+ *              should be at the start of the list you want to parse. You are
+ *              responsible for freeing the array returned from here.
+ *
+ *              Lists in the so-called "terse" syntax are separated by
+ *              semicolons (;). The lists themselves can be separated by
+ *              either commas (,) or white spaces.
+ *
+ * Return:      <none>
+ *-------------------------------------------------------------------------
+ */
+void
+parse_hsize_list(const char *h_list, subset_d *d)
+{
+    hsize_t     *p_list;
+    const char  *ptr;
+    unsigned int size_count = 0;
+    unsigned int i          = 0;
+    unsigned int last_digit = 0;
+
+    if (!h_list || !*h_list || *h_list == ';')
+        return;
+
+    H5TOOLS_START_DEBUG(" - h_list:%s", h_list);
+    /* count how many integers do we have */
+    for (ptr = h_list; ptr && *ptr && *ptr != ';' && *ptr != ']'; ptr++)
+        if (HDisdigit(*ptr)) {
+            if (!last_digit)
+                /* the last read character wasn't a digit */
+                size_count++;
+
+            last_digit = 1;
+        }
+        else
+            last_digit = 0;
+
+    if (size_count == 0) {
+        /* there aren't any integers to read */
+        H5TOOLS_ENDDEBUG("No integers to read");
+        return;
+    }
+    H5TOOLS_DEBUG("Number integers to read=%ld", size_count);
+
+    /* allocate an array for the integers in the list */
+    if ((p_list = (hsize_t *)HDcalloc(size_count, sizeof(hsize_t))) == NULL)
+        H5TOOLS_INFO("Unable to allocate space for subset data");
+
+    for (ptr = h_list; i < size_count && ptr && *ptr && *ptr != ';' && *ptr != ']'; ptr++)
+        if (HDisdigit(*ptr)) {
+            /* we should have an integer now */
+            p_list[i++] = (hsize_t)HDstrtoull(ptr, NULL, 0);
+
+            while (HDisdigit(*ptr))
+                /* scroll to end of integer */
+                ptr++;
+        }
+    d->data = p_list;
+    d->len  = size_count;
+    H5TOOLS_ENDDEBUG(" ");
+}
+
+/*-------------------------------------------------------------------------
+ * Function:    parse_subset_params
+ *
+ * Purpose:     Parse the so-called "terse" syntax for specifying subsetting parameters.
+ *
+ * Return:      Success:    struct subset_t object
+ *              Failure:    NULL
+ *-------------------------------------------------------------------------
+ */
+struct subset_t *
+parse_subset_params(const char *dset)
+{
+    struct subset_t *s = NULL;
+    char            *brace;
+    const char      *q_dset;
+
+    H5TOOLS_START_DEBUG(" - dset:%s", dset);
+    /* if dset name is quoted wait till after second quote to look for subset brackets */
+    if (*dset == '"')
+        q_dset = HDstrchr(dset, '"');
+    else
+        q_dset = dset;
+    if ((brace = HDstrrchr(q_dset, '[')) != NULL) {
+        *brace++ = '\0';
+
+        s = (struct subset_t *)HDcalloc(1, sizeof(struct subset_t));
+        parse_hsize_list(brace, &s->start);
+
+        while (*brace && *brace != ';')
+            brace++;
+
+        if (*brace)
+            brace++;
+
+        parse_hsize_list(brace, &s->stride);
+
+        while (*brace && *brace != ';')
+            brace++;
+
+        if (*brace)
+            brace++;
+
+        parse_hsize_list(brace, &s->count);
+
+        while (*brace && *brace != ';')
+            brace++;
+
+        if (*brace)
+            brace++;
+
+        parse_hsize_list(brace, &s->block);
+    }
+    H5TOOLS_ENDDEBUG(" ");
+
+    return s;
+}
+
+/*-------------------------------------------------------------------------
  * Function: get_option
  *
  * Purpose:  Determine the command-line options a user specified. We can
diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h
index 587860f..b227555 100644
--- a/tools/lib/h5tools_utils.h
+++ b/tools/lib/h5tools_utils.h
@@ -113,9 +113,12 @@ typedef struct find_objs_t {
 H5TOOLS_DLLVAR unsigned h5tools_nCols; /*max number of columns for outputting  */
 
 /* Definitions of useful routines */
+H5TOOLS_DLL struct subset_t *parse_subset_params(const char *dset);
+
 H5TOOLS_DLL void   indentation(unsigned);
 H5TOOLS_DLL void   print_version(const char *progname);
 H5TOOLS_DLL void   parallel_print(const char *format, ...);
+H5TOOLS_DLL void   parse_hsize_list(const char *h_list, subset_d *d);
 H5TOOLS_DLL herr_t parse_tuple(const char *start, int sep, char **cpy_out, unsigned *nelems,
                                char ***ptrs_out);
 H5TOOLS_DLL void   error_msg(const char *fmt, ...);
diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c
index 233e7b4..a012cb3 100644
--- a/tools/src/h5diff/h5diff_common.c
+++ b/tools/src/h5diff/h5diff_common.c
@@ -24,23 +24,24 @@ static int check_d_input(const char *);
  * Command-line options: The user can specify short or long-named
  * parameters.
  */
-static const char         *s_opts   = "hVrv*qn:d:p:NcelxE:A:S*";
-static struct long_options l_opts[] = {{"help", no_arg, 'h'},
-                                       {"version", no_arg, 'V'},
-                                       {"report", no_arg, 'r'},
-                                       {"verbose", optional_arg, 'v'},
-                                       {"quiet", no_arg, 'q'},
-                                       {"count", require_arg, 'n'},
+static const char         *s_opts   = "cd:ehln:p:qrv*xA:CE:NS*V";
+static struct long_options l_opts[] = {{"compare", no_arg, 'c'},
                                        {"delta", require_arg, 'd'},
-                                       {"relative", require_arg, 'p'},
-                                       {"nan", no_arg, 'N'},
-                                       {"compare", no_arg, 'c'},
                                        {"use-system-epsilon", no_arg, 'e'},
+                                       {"help", no_arg, 'h'},
                                        {"follow-symlinks", no_arg, 'l'},
+                                       {"count", require_arg, 'n'},
+                                       {"relative", require_arg, 'p'},
+                                       {"quiet", no_arg, 'q'},
+                                       {"report", no_arg, 'r'},
+                                       {"verbose", optional_arg, 'v'},
                                        {"no-dangling-links", no_arg, 'x'},
-                                       {"exclude-path", require_arg, 'E'},
                                        {"exclude-attribute", require_arg, 'A'},
+                                       {"no-compact-subset", no_arg, 'C'},
+                                       {"exclude-path", require_arg, 'E'},
+                                       {"nan", no_arg, 'N'},
                                        {"enable-error-stack", optional_arg, 'S'},
+                                       {"version", no_arg, 'V'},
                                        {NULL, 0, '\0'}};
 
 /*-------------------------------------------------------------------------
@@ -70,122 +71,6 @@ check_options(diff_opt_t *opts)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    parse_hsize_list
- *
- * Purpose:     Parse a list of comma or space separated integers and return
- *              them in a list. The string being passed into this function
- *              should be at the start of the list you want to parse. You are
- *              responsible for freeing the array returned from here.
- *
- *              Lists in the so-called "terse" syntax are separated by
- *              semicolons (;). The lists themselves can be separated by
- *              either commas (,) or white spaces.
- *
- * Return:      <none>
- *-------------------------------------------------------------------------
- */
-static void
-parse_hsize_list(const char *h_list, subset_d *d)
-{
-    hsize_t     *p_list;
-    const char  *ptr;
-    unsigned int size_count = 0;
-    unsigned int i          = 0;
-    unsigned int last_digit = 0;
-
-    if (!h_list || !*h_list || *h_list == ';')
-        return;
-
-    H5TOOLS_START_DEBUG(" - h_list:%s", h_list);
-    /* count how many integers do we have */
-    for (ptr = h_list; ptr && *ptr && *ptr != ';' && *ptr != ']'; ptr++)
-        if (HDisdigit(*ptr)) {
-            if (!last_digit)
-                /* the last read character wasn't a digit */
-                size_count++;
-
-            last_digit = 1;
-        }
-        else
-            last_digit = 0;
-
-    if (size_count == 0) {
-        /* there aren't any integers to read */
-        H5TOOLS_ENDDEBUG("No integers to read");
-        return;
-    }
-    H5TOOLS_DEBUG("Number integers to read=%ld", size_count);
-
-    /* allocate an array for the integers in the list */
-    if ((p_list = (hsize_t *)HDcalloc(size_count, sizeof(hsize_t))) == NULL)
-        H5TOOLS_INFO("Unable to allocate space for subset data");
-
-    for (ptr = h_list; i < size_count && ptr && *ptr && *ptr != ';' && *ptr != ']'; ptr++)
-        if (HDisdigit(*ptr)) {
-            /* we should have an integer now */
-            p_list[i++] = (hsize_t)HDstrtoull(ptr, NULL, 0);
-
-            while (HDisdigit(*ptr))
-                /* scroll to end of integer */
-                ptr++;
-        }
-    d->data = p_list;
-    d->len  = size_count;
-    H5TOOLS_ENDDEBUG(" ");
-}
-
-/*-------------------------------------------------------------------------
- * Function:    parse_subset_params
- *
- * Purpose:     Parse the so-called "terse" syntax for specifying subsetting parameters.
- *
- * Return:      Success:    struct subset_t object
- *              Failure:    NULL
- *-------------------------------------------------------------------------
- */
-static struct subset_t *
-parse_subset_params(const char *dset)
-{
-    struct subset_t *s = NULL;
-    char            *brace;
-
-    H5TOOLS_START_DEBUG(" - dset:%s", dset);
-    if ((brace = HDstrrchr(dset, '[')) != NULL) {
-        *brace++ = '\0';
-
-        s = (struct subset_t *)HDcalloc(1, sizeof(struct subset_t));
-        parse_hsize_list(brace, &s->start);
-
-        while (*brace && *brace != ';')
-            brace++;
-
-        if (*brace)
-            brace++;
-
-        parse_hsize_list(brace, &s->stride);
-
-        while (*brace && *brace != ';')
-            brace++;
-
-        if (*brace)
-            brace++;
-
-        parse_hsize_list(brace, &s->count);
-
-        while (*brace && *brace != ';')
-            brace++;
-
-        if (*brace)
-            brace++;
-
-        parse_hsize_list(brace, &s->block);
-    }
-    H5TOOLS_ENDDEBUG(" ");
-
-    return s;
-}
-
-/*-------------------------------------------------------------------------
  * Function: parse_command_line
  *
  * Purpose: parse command line input
@@ -321,6 +206,10 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
                 }
                 break;
 
+            case 'C':
+                opts->disable_compact_subset = TRUE;
+                break;
+
             case 'A':
                 opts->exclude_attr_path = 1;
 
@@ -438,13 +327,10 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
     }
     H5TOOLS_DEBUG("objname2 = %s", *objname2);
 
-    /*
-     * TRILABS_227 is complete except for an issue with printing indices
-     * the following calls will enable subsetting
-     */
-    opts->sset[0] = parse_subset_params(*objname1);
-
-    opts->sset[1] = parse_subset_params(*objname2);
+    if (!opts->disable_compact_subset) {
+        opts->sset[0] = parse_subset_params(*objname1);
+        opts->sset[1] = parse_subset_params(*objname2);
+    }
 
     H5TOOLS_ENDDEBUG(" ");
 }
@@ -768,6 +654,9 @@ usage(void)
      */
     PRINTVALSTREAM(rawoutstream, " Subsetting options:\n");
     PRINTVALSTREAM(rawoutstream,
+                   "  --no-compact-subset  Disable compact form of subsetting and allow the use\n");
+    PRINTVALSTREAM(rawoutstream, "                          of \"[\" in dataset names.\n");
+    PRINTVALSTREAM(rawoutstream,
                    "  Subsetting is available by using the fcompact form of subsetting, as follows:\n");
     PRINTVALSTREAM(rawoutstream, "    obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]\n");
     PRINTVALSTREAM(rawoutstream,
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index 522fe12..de8b96f 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -524,114 +524,6 @@ set_sort_order(const char *form)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    parse_hsize_list
- *
- * Purpose:     Parse a list of comma or space separated integers and return
- *              them in a list. The string being passed into this function
- *              should be at the start of the list you want to parse. You are
- *              responsible for freeing the array returned from here.
- *
- *              Lists in the so-called "terse" syntax are separated by
- *              semicolons (;). The lists themselves can be separated by
- *              either commas (,) or white spaces.
- *
- * Return:      <none>
- *-------------------------------------------------------------------------
- */
-static void
-parse_hsize_list(const char *h_list, subset_d *d)
-{
-    hsize_t     *p_list;
-    const char  *ptr;
-    unsigned int size_count = 0;
-    unsigned int i          = 0;
-    unsigned int last_digit = 0;
-
-    if (!h_list || !*h_list || *h_list == ';')
-        return;
-
-    /* count how many integers do we have */
-    for (ptr = h_list; ptr && *ptr && *ptr != ';' && *ptr != ']'; ptr++)
-        if (HDisdigit(*ptr)) {
-            if (!last_digit)
-                /* the last read character wasn't a digit */
-                size_count++;
-
-            last_digit = 1;
-        }
-        else
-            last_digit = 0;
-
-    if (size_count == 0)
-        /* there aren't any integers to read */
-        return;
-
-    /* allocate an array for the integers in the list */
-    p_list = (hsize_t *)HDcalloc(size_count, sizeof(hsize_t));
-
-    for (ptr = h_list; i < size_count && ptr && *ptr && *ptr != ';' && *ptr != ']'; ptr++)
-        if (HDisdigit(*ptr)) {
-            /* we should have an integer now */
-            p_list[i++] = (hsize_t)HDstrtoull(ptr, NULL, 0);
-
-            while (HDisdigit(*ptr))
-                /* scroll to end of integer */
-                ptr++;
-        }
-    d->data = p_list;
-    d->len  = size_count;
-}
-
-/*-------------------------------------------------------------------------
- * Function:    parse_subset_params
- *
- * Purpose:     Parse the so-called "terse" syntax for specifying subsetting parameters.
- *
- * Return:      Success:    struct subset_t object
- *              Failure:    NULL
- *-------------------------------------------------------------------------
- */
-static struct subset_t *
-parse_subset_params(const char *dset)
-{
-    struct subset_t *s = NULL;
-    char            *brace;
-
-    if (!dump_opts.disable_compact_subset && ((brace = HDstrrchr(dset, '[')) != NULL)) {
-        *brace++ = '\0';
-
-        s = (struct subset_t *)HDcalloc(1, sizeof(struct subset_t));
-        parse_hsize_list(brace, &s->start);
-
-        while (*brace && *brace != ';')
-            brace++;
-
-        if (*brace)
-            brace++;
-
-        parse_hsize_list(brace, &s->stride);
-
-        while (*brace && *brace != ';')
-            brace++;
-
-        if (*brace)
-            brace++;
-
-        parse_hsize_list(brace, &s->count);
-
-        while (*brace && *brace != ';')
-            brace++;
-
-        if (*brace)
-            brace++;
-
-        parse_hsize_list(brace, &s->block);
-    }
-
-    return s;
-}
-
-/*-------------------------------------------------------------------------
  * Function:    parse_mask_list
  *
  * Purpose:     Parse a list of comma or space separated integers and fill
@@ -916,10 +808,11 @@ parse_start:
 
                 for (i = 0; i < argc; i++)
                     if (!hand[i].func) {
-                        hand[i].func        = handle_datasets;
-                        hand[i].obj         = HDstrdup(opt_arg);
-                        hand[i].subset_info = parse_subset_params(hand[i].obj);
-                        last_dset           = &hand[i];
+                        hand[i].func = handle_datasets;
+                        hand[i].obj  = HDstrdup(opt_arg);
+                        if (!dump_opts.disable_compact_subset)
+                            hand[i].subset_info = parse_subset_params(hand[i].obj);
+                        last_dset = &hand[i];
                         break;
                     }
 
diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/testfiles/h5diff_10.txt
index 2f2f21e..d286733 100644
--- a/tools/test/h5diff/testfiles/h5diff_10.txt
+++ b/tools/test/h5diff/testfiles/h5diff_10.txt
@@ -133,6 +133,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
        symbolic links are compared.).
 
  Subsetting options:
+  --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
   Subsetting is available by using the fcompact form of subsetting, as follows:
     obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
   It is not required to use all parameters, but until the last parameter value used,
diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/testfiles/h5diff_600.txt
index 385af242..163e4b7 100644
--- a/tools/test/h5diff/testfiles/h5diff_600.txt
+++ b/tools/test/h5diff/testfiles/h5diff_600.txt
@@ -133,6 +133,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
        symbolic links are compared.).
 
  Subsetting options:
+  --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
   Subsetting is available by using the fcompact form of subsetting, as follows:
     obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
   It is not required to use all parameters, but until the last parameter value used,
diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/testfiles/h5diff_603.txt
index d5dc978..09d2293 100644
--- a/tools/test/h5diff/testfiles/h5diff_603.txt
+++ b/tools/test/h5diff/testfiles/h5diff_603.txt
@@ -134,6 +134,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
        symbolic links are compared.).
 
  Subsetting options:
+  --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
   Subsetting is available by using the fcompact form of subsetting, as follows:
     obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
   It is not required to use all parameters, but until the last parameter value used,
diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/testfiles/h5diff_606.txt
index 60181dd..bb21aeb 100644
--- a/tools/test/h5diff/testfiles/h5diff_606.txt
+++ b/tools/test/h5diff/testfiles/h5diff_606.txt
@@ -134,6 +134,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
        symbolic links are compared.).
 
  Subsetting options:
+  --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
   Subsetting is available by using the fcompact form of subsetting, as follows:
     obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
   It is not required to use all parameters, but until the last parameter value used,
diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/testfiles/h5diff_612.txt
index c027655..e0a1a75 100644
--- a/tools/test/h5diff/testfiles/h5diff_612.txt
+++ b/tools/test/h5diff/testfiles/h5diff_612.txt
@@ -134,6 +134,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
        symbolic links are compared.).
 
  Subsetting options:
+  --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
   Subsetting is available by using the fcompact form of subsetting, as follows:
     obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
   It is not required to use all parameters, but until the last parameter value used,
diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/testfiles/h5diff_615.txt
index 792741c..b4aebdd 100644
--- a/tools/test/h5diff/testfiles/h5diff_615.txt
+++ b/tools/test/h5diff/testfiles/h5diff_615.txt
@@ -134,6 +134,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
        symbolic links are compared.).
 
  Subsetting options:
+  --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
   Subsetting is available by using the fcompact form of subsetting, as follows:
     obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
   It is not required to use all parameters, but until the last parameter value used,
diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/testfiles/h5diff_621.txt
index 27d9f09..e08cfa0 100644
--- a/tools/test/h5diff/testfiles/h5diff_621.txt
+++ b/tools/test/h5diff/testfiles/h5diff_621.txt
@@ -134,6 +134,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
        symbolic links are compared.).
 
  Subsetting options:
+  --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
   Subsetting is available by using the fcompact form of subsetting, as follows:
     obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
   It is not required to use all parameters, but until the last parameter value used,
diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/testfiles/h5diff_622.txt
index 2c0395d..dfc2338 100644
--- a/tools/test/h5diff/testfiles/h5diff_622.txt
+++ b/tools/test/h5diff/testfiles/h5diff_622.txt
@@ -134,6 +134,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
        symbolic links are compared.).
 
  Subsetting options:
+  --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
   Subsetting is available by using the fcompact form of subsetting, as follows:
     obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
   It is not required to use all parameters, but until the last parameter value used,
diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/testfiles/h5diff_623.txt
index ddf110c..bb76151 100644
--- a/tools/test/h5diff/testfiles/h5diff_623.txt
+++ b/tools/test/h5diff/testfiles/h5diff_623.txt
@@ -134,6 +134,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
        symbolic links are compared.).
 
  Subsetting options:
+  --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
   Subsetting is available by using the fcompact form of subsetting, as follows:
     obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
   It is not required to use all parameters, but until the last parameter value used,
diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/testfiles/h5diff_624.txt
index d9534ae..71f2eb5 100644
--- a/tools/test/h5diff/testfiles/h5diff_624.txt
+++ b/tools/test/h5diff/testfiles/h5diff_624.txt
@@ -134,6 +134,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
        symbolic links are compared.).
 
  Subsetting options:
+  --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
   Subsetting is available by using the fcompact form of subsetting, as follows:
     obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
   It is not required to use all parameters, but until the last parameter value used,