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)

1 files changed, 26 insertions, 5 deletions

diff --git a/test/set_extent.c b/test/set_extent.c
index b9536e5..0467073 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -427,14 +427,35 @@ error:
 */
 static int do_layouts( hid_t fapl )
 {
+    H5F_libver_t low, high; /* Low and high bounds */
+    herr_t ret;      /* Generic return value */
 
-    TESTING("storage layout use");
+    TESTING("storage layout use - tested with all low/high library format bounds");
+    /* 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++) {
 
-    if (test_layouts( H5D_COMPACT, fapl ) < 0)
-        goto error;
+            hid_t new_fapl;
 
-    if (test_layouts( H5D_CONTIGUOUS, fapl ) < 0)
-        goto error;
+            /* Copy plist to use locally to avoid modifying the original */
+            new_fapl = H5Pcopy(fapl);
+
+            /* Set version bounds */
+            H5E_BEGIN_TRY {
+                ret = H5Pset_libver_bounds(new_fapl, low, high);
+            } H5E_END_TRY;
+
+            if (ret < 0) /* Invalid low/high combinations */
+                continue;
+
+            if (test_layouts( H5D_COMPACT, new_fapl ) < 0)
+                goto error;
+
+            if (test_layouts( H5D_CONTIGUOUS, new_fapl ) < 0)
+                goto error;
+
+        } /* end for high */
+    } /* end for low */
 
     PASSED();