Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_func_enter_vol

Plus initial steps toward merging API context push into FUNC_ENTER_API* macros

1 files changed, 27 insertions, 0 deletions

diff --git a/test/fheap.c b/test/fheap.c
index 00a372e..3a4fea3 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -16370,6 +16370,33 @@ api_ctx_pushed = TRUE;
                 if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0)
                     TEST_ERROR
                 fapl = def_fapl;
+                /* This is a fix for the daily test failure from the checkin for libver bounds. */
+                /* 
+                 * Many tests failed the file size check when comparing (a) and (b) as below:
+                 * --Create a file and close the file.  Got the initial file size (a).
+                 * --Reopen the file, perform fractal heap operations, and close the file.
+                 *   Got the file size (b).
+                 * The cause for the file size differences:
+                 *   When the file is initially created with persisting free-space and with 
+                 *   (earliest, latest) libver bounds, the file will have version 2 superblock 
+                 *   due to non-default free-space handling.  As the low bound is earliest,
+                 *   the library uses version 1 object header when creating the superblock
+                 *   extension message.
+                 *   When the file is reopened with the same libver bounds, the file's low
+                 *   bound is upgraded to v18 because the file has version 2 superblock.
+                 *   When the library creates the superblock extension message on file close,
+                 *   the library uses version 2 object header for the superblock extension
+                 *   message since the low bound is v18.
+                 *   This leads to the discrepancy in file sizes as the file is persisting
+                 *   free-space and there is object header version differences.
+                 *  The fix:
+                 *    Set libver bounds in fapl to (v18, latest) so that the file created in the
+                 *    test routines will have low bound set to v18.  This will cause the
+                 *    library to use version 2 object header for the superblock extension 
+                 *    message.
+                 */
+                if(H5Pset_libver_bounds(fapl, H5F_LIBVER_V18, H5F_LIBVER_LATEST) < 0)
+                    TEST_ERROR
                 break;
             case 2:
                 if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1) < 0)