Merge pull request #876 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:bugfix/version_bounds to develop

* commit 'b4294d8d3e5937527e9814f23d04df412ebbe770':
  Added comment for clarification about latest as 1.10. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)
  Fixed typos Platforms tested:     Linux/32 (jam)
  Additional tests Description:     - Revised and add more variety to version bound tests per review     - Revised gen_bounds.c per review Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
  Added gen_bounds
  Cleaned up per comments in PR# 876
  Modifications made based on comments from pull request.
  Added gen_bounds.c
  Added gen_bounds.c
  Fix bounds check for the generation of cache image.
  Modify usage description for -j and -k options so that it is more informative.
  Modify h5repack usage so that it is more descriptive.
  Changes made based on code reviews.
  Further improvement
  Fixed comment.
  Adding data file generator Description:     Added gen_bounds.c to generate the following files:     - bounds_earliest_latest.h5     - bounds_earliest_v18.h5     - bounds_latest_latest.h5     - bounds_v18_latest.h5     - bounds_v18_v18.h5     for testing the version bounds fix in 1.8 and 1.6.
  Initial checkin for library version bounds Code changes to provide versioning support when adding to the enumerated defines for H5F_libver_t.

1 files changed, 66 insertions, 20 deletions

diff --git a/test/ohdr.c b/test/ohdr.c
index 3915b38..43346a5 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -738,6 +738,42 @@ error:
     return FAIL;
 } /* test_unknown() */
 
+#define STR_EARLIEST "earliest"
+#define STR_V18 "v18"
+#define STR_LATEST "latest"
+char *version_string(H5F_libver_t libver)
+{
+    char *str = NULL;
+
+    str = (char *) malloc(20 * sizeof(char));
+    if (str == NULL)
+    {
+        fprintf(stderr, "Allocation failed\n");
+        exit(1);
+    }
+
+    switch(libver) {
+      case H5F_LIBVER_EARLIEST:
+          strcpy(str, STR_EARLIEST);
+          break;
+
+      case H5F_LIBVER_V18:
+          strcpy(str, STR_V18);
+          break;
+
+      case H5F_LIBVER_V110:
+          HDassert(H5F_LIBVER_LATEST == H5F_LIBVER_V110);
+          strcpy(str, STR_LATEST);
+          break;
+
+      case H5F_LIBVER_ERROR:
+      case H5F_LIBVER_NBOUNDS:
+      default:
+          sprintf(str, "%ld", (long)libver);
+          break;
+    } /* end switch */
+} /* end of version_string */
+
 
 /*-------------------------------------------------------------------------
  * Function:	main
@@ -755,32 +791,40 @@ error:
 int
 main(void)
 {
-    hid_t	fapl = -1, file = -1;
-    H5F_t	*f = NULL;
-    char	filename[1024];
-    H5O_hdr_info_t hdr_info;            /* Object info */
-    H5O_loc_t	oh_loc;                 /* Object header locations */
-    time_t	time_new, ro;
-    int		i;                      /* Local index variable */
-    unsigned    b;                      /* Index for "new format" loop */
-    herr_t      ret;                    /* Generic return value */
+    hid_t fapl = -1;
+    hid_t file = -1;
+    H5F_t *f = NULL;
+    char  filename[1024];
+    H5O_hdr_info_t hdr_info;  /* Object info */
+    H5O_loc_t      oh_loc;    /* Object header locations */
+    H5F_libver_t low, high;   /* File format bounds */
+    time_t time_new, ro;
+    unsigned b;               /* Index for "new format" loop */
+    char msg[80];             /* Message for file format version */
+    int    i;                 /* Local index variable */
+    herr_t ret;               /* Generic return value */
 
     /* Reset library */
     h5_reset();
     fapl = h5_fileaccess();
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
 
-    /* Loop over old & new formats */
-    for(b = FALSE; b <= TRUE; b++) {
-        /* Display info about testing */
-        if(b)
-            HDputs("Using new file format:");
-        else
-            HDputs("Using default file format:");
+    /* Loop through all the combinations of low/high library format bounds */
+    for(low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) {
+      for(high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
 
-        /* Set the format to use for the file */
-        if(H5Pset_libver_bounds(fapl, (b ? H5F_LIBVER_LATEST : H5F_LIBVER_EARLIEST), H5F_LIBVER_LATEST) < 0)
-            FAIL_STACK_ERROR
+        /* Set version bounds before opening the file */
+        H5E_BEGIN_TRY {
+            ret = H5Pset_libver_bounds(fapl, low, high);
+        } H5E_END_TRY;
+
+        if (ret < 0) /* Invalid low/high combinations */
+            continue;
+
+        /* Display info about testing */
+        sprintf(msg, "Using file format version: (%s, %s)", version_string(low),
+                     version_string(high));
+        HDputs(msg);
 
         /* test on object continuation block */
         if(test_cont(filename, fapl) < 0)
@@ -977,7 +1021,9 @@ main(void)
         /* Test object header creation metadata cache issues */
         if(test_ohdr_cache(filename, fapl) < 0)
             TEST_ERROR
-    } /* end for */
+
+      } /* high */
+    } /* low */
 
     /* Verify symbol table messages are cached */
     if(h5_verify_cached_stabs(FILENAME, fapl) < 0) TEST_ERROR