Merge errors fixed

5 files changed, 122 insertions, 87 deletions

diff --git a/tools/h5stat/CMakeTests.cmake b/tools/h5stat/CMakeTests.cmake
index 005bea6..c638f5b 100644
--- a/tools/h5stat/CMakeTests.cmake
+++ b/tools/h5stat/CMakeTests.cmake
@@ -99,7 +99,8 @@
       add_test (
           NAME H5STAT-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5stat>"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5stat${tgt_ext}>"
               -D "TEST_ARGS=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
               -D "TEST_OUTPUT=${resultfile}.out"
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index 55ae638..54f252b 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -124,7 +124,7 @@ struct handler_t {
     char **obj;
 };
 
-static const char *s_opts ="Aa:Ddm:FfhGgl:STO:V";
+static const char *s_opts ="Aa:Ddm:EFfhGgl:STO:V";
 /* e.g. "filemetadata" has to precede "file"; "groupmetadata" has to precede "group" etc. */
 static struct long_options l_opts[] = {
     {"help", no_arg, 'h'},
@@ -202,6 +202,7 @@ static struct long_options l_opts[] = {
     { "attr", no_arg, 'A' },
     { "att", no_arg, 'A' },
     { "at", no_arg, 'A' },
+    { "enable-error-stack", no_arg, 'E' },
     { "numattrs", require_arg, 'a' },
     { "numattr", require_arg, 'a' },
     { "numatt", require_arg, 'a' },
@@ -262,6 +263,7 @@ static void usage(const char *prog)
      HDfprintf(stdout, "                           information for small # of attributes.  N is an integer greater\n");
      HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
      HDfprintf(stdout, "     -S, --summary         Print summary of file space information\n");
+     HDfprintf(stdout, "     --enable-error-stack  Prints messages from the HDF5 error stack as they occur\n");
 }
 
 
@@ -370,9 +372,9 @@ attribute_stats(iter_t *iter, const H5O_info_t *oi)
 static herr_t
 group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 {
-    H5G_info_t     ginfo;                  /* Group information */
-    unsigned     bin;                     /* "bin" the number of objects falls in */
-    herr_t     ret;
+    H5G_info_t ginfo;           /* Group information */
+    unsigned bin;               /* "bin" the number of objects falls in */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     /* Gather statistics about this type of object */
     iter->uniq_groups++;
@@ -382,8 +384,8 @@ group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     iter->group_ohdr_info.free_size += oi->hdr.space.free;
 
     /* Get group information */
-    ret = H5Gget_info_by_name(iter->fid, name, &ginfo, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    if((ret_value = H5Gget_info_by_name(iter->fid, name, &ginfo, H5P_DEFAULT)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gget_info_by_name() failed");
 
     /* Update link stats */
     /* Collect statistics for small groups */
@@ -397,10 +399,10 @@ group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     bin = ceil_log10((unsigned long)ginfo.nlinks);
     if((bin + 1) > iter->group_nbins) {
         /* Allocate more storage for info about dataset's datatype */
-        iter->group_bins = (unsigned long *)HDrealloc(iter->group_bins, (bin + 1) * sizeof(unsigned long));
-        HDassert(iter->group_bins);
+        if((iter->group_bins = (unsigned long *)HDrealloc(iter->group_bins, (bin + 1) * sizeof(unsigned long))) == NULL)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Drealloc() failed");
 
-  /* Initialize counts for intermediate bins */
+        /* Initialize counts for intermediate bins */
         while(iter->group_nbins < bin)
             iter->group_bins[iter->group_nbins++] = 0;
         iter->group_nbins++;
@@ -416,10 +418,11 @@ group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     iter->groups_heap_storage_size += oi->meta_size.obj.heap_size;
 
     /* Update attribute metadata info */
-    ret = attribute_stats(iter, oi);
-    HDassert(ret >= 0);
+    if((ret_value = attribute_stats(iter, oi)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "attribute_stats failed");
 
-    return 0;
+done:
+    return ret_value;
 } /* end group_stats() */
 
 
@@ -439,22 +442,22 @@ group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 static herr_t
 dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 {
-    unsigned     bin;               /* "bin" the number of objects falls in */
-    hid_t     did;               /* Dataset ID */
-    hid_t     sid;               /* Dataspace ID */
-    hid_t     tid;               /* Datatype ID */
-    hid_t     dcpl;              /* Dataset creation property list ID */
-    hsize_t     dims[H5S_MAX_RANK];/* Dimensions of dataset */
-    H5D_layout_t   lout;              /* Layout of dataset */
-    unsigned     type_found;        /* Whether the dataset's datatype was */
-                                         /* already found */
-    int     ndims;             /* Number of dimensions of dataset */
-    hsize_t     storage;           /* Size of dataset storage */
-    unsigned     u;                 /* Local index variable */
-    int     num_ext;           /* Number of external files for a dataset */
-    int     nfltr;             /* Number of filters for a dataset */
-    H5Z_filter_t  fltr;              /* Filter identifier */
-    herr_t     ret;
+    unsigned bin;               /* "bin" the number of objects falls in */
+    hid_t did;                  /* Dataset ID */
+    hid_t sid;                  /* Dataspace ID */
+    hid_t tid;                  /* Datatype ID */
+    hid_t dcpl;                 /* Dataset creation property list ID */
+    hsize_t dims[H5S_MAX_RANK]; /* Dimensions of dataset */
+    H5D_layout_t lout;          /* Layout of dataset */
+    unsigned type_found;        /* Whether the dataset's datatype was */
+                                /* already found */
+    int ndims;                  /* Number of dimensions of dataset */
+    hsize_t storage;            /* Size of dataset storage */
+    unsigned u;                 /* Local index variable */
+    int num_ext;                /* Number of external files for a dataset */
+    int nfltr;                  /* Number of filters for a dataset */
+    H5Z_filter_t fltr;          /* Filter identifier */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     /* Gather statistics about this type of object */
     iter->uniq_dsets++;
@@ -463,26 +466,26 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     iter->dset_ohdr_info.total_size += oi->hdr.space.total;
     iter->dset_ohdr_info.free_size += oi->hdr.space.free;
 
-    did = H5Dopen2(iter->fid, name, H5P_DEFAULT);
-    HDassert(did > 0);
+    if((did = H5Dopen2(iter->fid, name, H5P_DEFAULT)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen() failed");
 
     /* Update dataset metadata info */
     iter->datasets_index_storage_size += oi->meta_size.obj.index_size;
     iter->datasets_heap_storage_size += oi->meta_size.obj.heap_size;
 
     /* Update attribute metadata info */
-    ret = attribute_stats(iter, oi);
-    HDassert(ret >= 0);
+    if((ret_value = attribute_stats(iter, oi)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "attribute_stats() failed");
 
     /* Get storage info */
     storage = H5Dget_storage_size(did);
 
     /* Gather layout statistics */
-    dcpl = H5Dget_create_plist(did);
-    HDassert(dcpl > 0);
+    if((dcpl = H5Dget_create_plist(did)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_create_plist() failed");
 
-    lout = H5Pget_layout(dcpl);
-    HDassert(lout >= 0);
+    if((lout = H5Pget_layout(dcpl)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_layout() failed");
 
     /* Object header's total size for H5D_COMPACT layout includes raw data size */
     /* "storage" also includes H5D_COMPACT raw data size */
@@ -493,8 +496,8 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     (iter->dset_layouts[lout])++;
 
     /* Get the number of external files for the dataset */
-    num_ext = H5Pget_external_count(dcpl);
-    assert (num_ext >= 0);
+    if((num_ext = H5Pget_external_count(dcpl)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_external_count() failed");
 
     /* Accumulate raw data size accordingly */
     if(num_ext) {
@@ -504,11 +507,11 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
         iter->dset_storage_size += storage;
 
     /* Gather dataspace statistics */
-    sid = H5Dget_space(did);
-    HDassert(sid > 0);
+    if((sid = H5Dget_space(did)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sget_space() failed");
 
-    ndims = H5Sget_simple_extent_dims(sid, dims, NULL);
-    HDassert(ndims >= 0);
+    if((ndims = H5Sget_simple_extent_dims(sid, dims, NULL)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sget_simple_extent_dims() failed");
 
     /* Check for larger rank of dataset */
     if((unsigned)ndims > iter->max_dset_rank)
@@ -530,8 +533,8 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
         bin = ceil_log10((unsigned long)dims[0]);
         if((bin + 1) > iter->dset_dim_nbins) {
             /* Allocate more storage for info about dataset's datatype */
-            iter->dset_dim_bins = (unsigned long *)HDrealloc(iter->dset_dim_bins, (bin + 1) * sizeof(unsigned long));
-            HDassert(iter->dset_dim_bins);
+            if((iter->dset_dim_bins = (unsigned long *)HDrealloc(iter->dset_dim_bins, (bin + 1) * sizeof(unsigned long))) == NULL)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Drealloc() failed");
 
             /* Initialize counts for intermediate bins */
             while(iter->dset_dim_nbins < bin)
@@ -545,12 +548,12 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
             (iter->dset_dim_bins[bin])++;
     } /* end if */
 
-    ret = H5Sclose(sid);
-    HDassert(ret >= 0);
+    if(H5Sclose(sid) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sclose() failed");
 
     /* Gather datatype statistics */
-    tid = H5Dget_type(did);
-    HDassert(tid > 0);
+    if((tid = H5Dget_type(did)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_type() failed");
 
     type_found = FALSE;
     for(u = 0; u < iter->dset_ntypes; u++)
@@ -568,12 +571,12 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
         iter->dset_ntypes++;
 
         /* Allocate more storage for info about dataset's datatype */
-        iter->dset_type_info = (dtype_info_t *)HDrealloc(iter->dset_type_info, iter->dset_ntypes * sizeof(dtype_info_t));
-        HDassert(iter->dset_type_info);
+        if((iter->dset_type_info = (dtype_info_t *)HDrealloc(iter->dset_type_info, iter->dset_ntypes * sizeof(dtype_info_t))) == NULL)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Drealloc() failed");
 
         /* Initialize information about datatype */
-        iter->dset_type_info[curr_ntype].tid = H5Tcopy(tid);
-        HDassert(iter->dset_type_info[curr_ntype].tid > 0);
+        if((iter->dset_type_info[curr_ntype].tid = H5Tcopy(tid)) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tcopy() failed");
         iter->dset_type_info[curr_ntype].count = 1;
         iter->dset_type_info[curr_ntype].named = 0;
 
@@ -585,8 +588,8 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     if(H5Tcommitted(tid) > 0)
         (iter->dset_type_info[u].named)++;
 
-    ret = H5Tclose(tid);
-    HDassert(ret >= 0);
+    if(H5Tclose(tid) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tclose() failed");
 
     /* Track different filters */
     if((nfltr = H5Pget_nfilters(dcpl)) >= 0) {
@@ -603,13 +606,14 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
         } /* end for */
     } /* endif nfltr */
 
-     ret = H5Pclose(dcpl);
-     HDassert(ret >= 0);
+     if(H5Pclose(dcpl) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose() failed");
 
-     ret = H5Dclose(did);
-     HDassert(ret >= 0);
+     if(H5Dclose(did) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dclose() failed");
 
-     return 0;
+done:
+     return ret_value;
 }  /* end dataset_stats() */
 
 
@@ -628,7 +632,7 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 static herr_t
 datatype_stats(iter_t *iter, const H5O_info_t *oi)
 {
-    herr_t ret;
+    herr_t ret_value = SUCCEED;
 
     /* Gather statistics about this type of object */
     iter->uniq_dtypes++;
@@ -638,10 +642,10 @@ datatype_stats(iter_t *iter, const H5O_info_t *oi)
     iter->dtype_ohdr_info.free_size += oi->hdr.space.free;
 
     /* Update attribute metadata info */
-    ret = attribute_stats(iter, oi);
-    HDassert(ret >= 0);
-
-     return 0;
+    if((ret_value = attribute_stats(iter, oi)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "attribute_stats() failed");
+done:
+     return ret_value;
 }  /* end datatype_stats() */
 
 
@@ -663,6 +667,7 @@ obj_stats(const char *path, const H5O_info_t *oi, const char *already_visited,
     void *_iter)
 {
     iter_t *iter = (iter_t *)_iter;
+    herr_t ret_value = SUCCEED;
 
     /* If the object has already been seen then just return */
     if(NULL == already_visited) {
@@ -672,15 +677,18 @@ obj_stats(const char *path, const H5O_info_t *oi, const char *already_visited,
 
         switch(oi->type) {
             case H5O_TYPE_GROUP:
-                group_stats(iter, path, oi);
+                if(group_stats(iter, path, oi) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "group_stats failed");
                 break;
 
             case H5O_TYPE_DATASET:
-                dataset_stats(iter, path, oi);
+                if(dataset_stats(iter, path, oi) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "dataset_stats failed");
                 break;
 
             case H5O_TYPE_NAMED_DATATYPE:
-                datatype_stats(iter, oi);
+                if(datatype_stats(iter, oi) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "datatype_stats failed");
                 break;
 
             case H5O_TYPE_UNKNOWN:
@@ -692,7 +700,8 @@ obj_stats(const char *path, const H5O_info_t *oi, const char *already_visited,
         } /* end switch */
     } /* end if */
 
-    return 0;
+done:
+    return ret_value;
 } /* end obj_stats() */
 
 
@@ -799,6 +808,10 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 goto done;
                 break;
 
+            case 'E':
+                enable_error_stack = 1;
+                break;
+
             case 'F':
                 display_all = FALSE;
                 display_file_metadata = TRUE;
@@ -1230,8 +1243,8 @@ print_dataset_info(const iter_t *iter)
 
         printf("Dataset layout information:\n");
         for(u = 0; u < H5D_NLAYOUTS; u++)
-            printf("\tDataset layout counts[%s]: %lu\n", (u == 0 ? "COMPACT" :
-                (u == 1 ? "CONTIG" : "CHUNKED")), iter->dset_layouts[u]);
+            printf("\tDataset layout counts[%s]: %lu\n", (u == H5D_COMPACT ? "COMPACT" :
+                (u == H5D_CONTIGUOUS ? "CONTIG" : (u == H5D_CHUNKED ? "CHUNKED" : "ERROR"))), iter->dset_layouts[u]);
         printf("\tNumber of external files : %lu\n", iter->nexternal);
 
         printf("Dataset filters information:\n");
@@ -1388,7 +1401,7 @@ print_storage_summary(const iter_t *iter)
     hsize_t total_meta = 0;
     hsize_t unaccount = 0;
 
-    printf("Summary of file space information:\n");
+    HDprintf("Summary of file space information:\n");
     total_meta =
             iter->super_ext_size + iter->ublk_size +
             iter->group_ohdr_info.total_size +
@@ -1534,17 +1547,26 @@ main(int argc, const char *argv[])
     iter_t              iter;
     const char         *fname = NULL;
     hid_t               fid = -1;
+    H5E_auto2_t         func;
+    H5E_auto2_t         tools_func;
+    void               *edata;
+    void               *tools_edata;
     struct handler_t   *hand = NULL;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
     /* Disable error reporting */
+    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
     H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
     /* Initialize h5tools lib */
     h5tools_init();
-    
+
+    /* Disable tools error reporting */
+    H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
+    H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL);
+
     HDmemset(&iter, 0, sizeof(iter));
 
     if(parse_command_line(argc, argv, &hand) < 0)
@@ -1552,6 +1574,11 @@ main(int argc, const char *argv[])
 
     fname = argv[opt_ind];
 
+    if(enable_error_stack > 0) {
+        H5Eset_auto2(H5E_DEFAULT, func, edata);
+        H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
+    }
+
     /* Check for filename given */
     if(fname) {
         hid_t               fcpl;
@@ -1583,15 +1610,15 @@ main(int argc, const char *argv[])
             iter.SM_heap_storage_size = finfo.sohm.msgs_info.heap_size;
         } /* end else */
 
-	iter.num_small_groups = (unsigned long *)HDcalloc((size_t)sgroups_threshold, sizeof(unsigned long));
-	iter.num_small_attrs = (unsigned long *)HDcalloc((size_t)(sattrs_threshold+1), sizeof(unsigned long));
-	iter.small_dset_dims = (unsigned long *)HDcalloc((size_t)sdsets_threshold, sizeof(unsigned long));
+        iter.num_small_groups = (unsigned long *)HDcalloc((size_t)sgroups_threshold, sizeof(unsigned long));
+        iter.num_small_attrs = (unsigned long *)HDcalloc((size_t)(sattrs_threshold+1), sizeof(unsigned long));
+        iter.small_dset_dims = (unsigned long *)HDcalloc((size_t)sdsets_threshold, sizeof(unsigned long));
 
-	if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
-	    error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
-            h5tools_setstatus(EXIT_FAILURE);
-	    goto done;
-	}
+        if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
+            error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
+                h5tools_setstatus(EXIT_FAILURE);
+            goto done;
+        }
 
         if((fcpl = H5Fget_create_plist(fid)) < 0)
             warn_msg("Unable to retrieve file creation property\n");
@@ -1604,16 +1631,18 @@ main(int argc, const char *argv[])
             unsigned u;
 
             for(u = 0; u < hand->obj_count; u++) {
-                if(h5trav_visit(fid, hand->obj[u], TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0)
-                    warn_msg("Unable to traverse object \"%s\"\n", hand->obj[u]);
-                else
+                if(h5trav_visit(fid, hand->obj[u], TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0) {
+                    error_msg("unable to traverse object \"%s\"\n", hand->obj[u]);
+                    h5tools_setstatus(EXIT_FAILURE);
+                } else
                     print_statistics(hand->obj[u], &iter);
             } /* end for */
         } /* end if */
         else {
-            if(h5trav_visit(fid, "/", TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0)
-                warn_msg("Unable to traverse objects/links in file \"%s\"\n", fname);
-            else
+            if(h5trav_visit(fid, "/", TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0) {
+                error_msg("unable to traverse objects/links in file \"%s\"\n", fname);
+                h5tools_setstatus(EXIT_FAILURE);
+            } else
                 print_statistics("/", &iter);
         } /* end else */
     } /* end if */
@@ -1629,6 +1658,8 @@ done:
         h5tools_setstatus(EXIT_FAILURE);
     } /* end if */
 
+    H5Eset_auto2(H5E_DEFAULT, func, edata);
+
     leave(h5tools_getstatus());
 } /* end main() */
 
diff --git a/tools/h5stat/testfiles/h5stat_help1.ddl b/tools/h5stat/testfiles/h5stat_help1.ddl
index 4c61425..ce8bb73 100644
--- a/tools/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/h5stat/testfiles/h5stat_help1.ddl
@@ -21,3 +21,4 @@ Usage: h5stat [OPTIONS] file
                            information for small # of attributes.  N is an integer greater
                            than 0.  The default threshold is 10.
      -S, --summary         Print summary of file space information
+     --enable-error-stack  Prints messages from the HDF5 error stack as they occur
diff --git a/tools/h5stat/testfiles/h5stat_help2.ddl b/tools/h5stat/testfiles/h5stat_help2.ddl
index 4c61425..ce8bb73 100644
--- a/tools/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/h5stat/testfiles/h5stat_help2.ddl
@@ -21,3 +21,4 @@ Usage: h5stat [OPTIONS] file
                            information for small # of attributes.  N is an integer greater
                            than 0.  The default threshold is 10.
      -S, --summary         Print summary of file space information
+     --enable-error-stack  Prints messages from the HDF5 error stack as they occur
diff --git a/tools/h5stat/testfiles/h5stat_nofile.ddl b/tools/h5stat/testfiles/h5stat_nofile.ddl
index 4c61425..ce8bb73 100644
--- a/tools/h5stat/testfiles/h5stat_nofile.ddl
+++ b/tools/h5stat/testfiles/h5stat_nofile.ddl
@@ -21,3 +21,4 @@ Usage: h5stat [OPTIONS] file
                            information for small # of attributes.  N is an integer greater
                            than 0.  The default threshold is 10.
      -S, --summary         Print summary of file space information
+     --enable-error-stack  Prints messages from the HDF5 error stack as they occur