Incorporate minimized dset ohdr tests into extant suite.

1 files changed, 18 insertions, 8 deletions

diff --git a/test/dsets.c b/test/dsets.c
index 94c967e..092b616 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -13079,14 +13079,14 @@ test_object_header_minimization_dcpl(void)
     /* TESTS */
     /*********/
 
-    /* TEST default value (not set explicitly)
+    /* default value (not set explicitly)
      */
     if (FAIL == H5Pget_dset_no_attrs_hint(dcpl_id, &minimize))
         FAIL_PUTS_ERROR("unable to get minimize value\n");
     if (FALSE != minimize)
         FAIL_PUTS_ERROR("Expected FALSE default but was not!\n");
 
-    /* TEST FALSE-set value
+    /* FALSE-set value
      */
     if (FAIL == H5Pset_dset_no_attrs_hint(dcpl_id, FALSE))
         FAIL_PUTS_ERROR("unable to set minimize value to FALSE\n");
@@ -13095,7 +13095,7 @@ test_object_header_minimization_dcpl(void)
     if (FALSE != minimize)
         FAIL_PUTS_ERROR("Expected FALSE default but was not!\n");
 
-    /* TEST TRUE-set value
+    /* TRUE-set value
      */
     if (FAIL == H5Pset_dset_no_attrs_hint(dcpl_id, TRUE))
         FAIL_PUTS_ERROR("unable to set minimize value to TRUE\n");
@@ -13104,7 +13104,7 @@ test_object_header_minimization_dcpl(void)
     if (TRUE != minimize)
         FAIL_PUTS_ERROR("Expected TRUE default but was not!\n");
 
-    /* TEST error cases
+    /* error cases
      */
     H5E_BEGIN_TRY {
         if (SUCCEED == H5Pget_dset_no_attrs_hint(-1, &minimize))
@@ -13163,6 +13163,7 @@ main(void)
     hid_t    fcpl = -1, fcpl2 = -1;
     unsigned new_format;
     unsigned paged;
+    unsigned minimized_ohdr;
     int      mdc_nelmts;
     size_t   rdcc_nelmts;
     size_t   rdcc_nbytes;
@@ -13213,10 +13214,12 @@ main(void)
     /* Test with paged aggregation enabled or not */
     for(paged = FALSE; paged <= TRUE; paged++) {
 
-        /* Temporary: skip testing for multi/split drivers:
-             fail file create when persisting free-space or using paged aggregation strategy */
-        if(!contig_addr_vfd && paged)
-            continue;
+      /* Temporary: skip testing for multi/split drivers:
+           fail file create when persisting free-space or using paged aggregation strategy */
+      if(!contig_addr_vfd && paged)
+          continue;
+
+      for (minimized_ohdr = FALSE; minimized_ohdr <= TRUE; minimized_ohdr++) {
 
         /* Test with old & new format groups */
         for(new_format = FALSE; new_format <= TRUE; new_format++) {
@@ -13248,6 +13251,12 @@ main(void)
             if((file = H5Fcreate(filename, H5F_ACC_TRUNC, my_fcpl, my_fapl)) < 0)
                 goto error;
 
+            if (TRUE == minimized_ohdr) {
+                if (0 > H5Fset_dset_no_attrs_hint(file, TRUE))
+                    goto error;
+                puts("(minimized dataset object headers with file setting)");
+            }
+
             /* Cause the library to emit initial messages */
             if((grp = H5Gcreate2(file, "emit diagnostics", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
                 goto error;
@@ -13325,6 +13334,7 @@ main(void)
             if(H5Fclose(file) < 0)
                 goto error;
         } /* end for new_format */
+      } /* for minimized dset object headers */
     } /* end for paged */
 
     /* Close property lists */