Interim checkin to allow Vailin to address assertion failure in

the memory manager -- details shown below.

Note that there are other issues as well -- this is not a
working version.

[mainzer@jelly test]$ ./vfd_swmr
Testing Configure VFD SWMR with fapl                                   PASSED
Testing VFD SWMR configuration for the file and fapl                   PASSED
Testing H5Fvfd_swmr_end_tick() for VFD SWMR                            PASSED
Testing Create/Open/Flush an HDF5 file for VFD SWMR                    PASSED
Testing Verify the metadata file for VFD SWMR writer                  vfd_swmr: H5MVsection.c:233: H5MV__sect_can_merge: Assertion `((sect1->sect_info.addr)!=((haddr_t)(long)(-1)) && (sect2->sect_info.addr)!=((haddr_t)(long)(-1)) && (sect1->sect_info.addr)<(sect2->sect_info.addr))' failed.
Abort (core dumped)
[mainzer@jelly test]$

1 files changed, 8 insertions, 5 deletions

diff --git a/test/cache.c b/test/cache.c
index d5e3c6c..3883ac3 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -13976,7 +13976,7 @@ check_move_entry__run_test(H5F_t * file_ptr,
         if(!spec_ptr->is_protected)
             unprotect_entry(file_ptr, spec_ptr->entry_type, spec_ptr->entry_index, flags);
 
-        move_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, FALSE);
+        move_entry(file_ptr, spec_ptr->entry_type, spec_ptr->entry_index, FALSE);
 
     }
 
@@ -14074,7 +14074,7 @@ check_move_entry__run_test(H5F_t * file_ptr,
     }
 
     /* put the entry back where it started from */
-    move_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, TRUE);
+    move_entry(file_ptr, spec_ptr->entry_type, spec_ptr->entry_index, TRUE);
 
     return;
 
@@ -16960,7 +16960,8 @@ check_move_entry_errs(unsigned paged)
     } /* end if */
 
     if(pass) {
-        result = H5C_move_entry(cache_ptr, types[0], entry_0_0_ptr->addr, entry_0_1_ptr->addr);
+        result = H5C_move_entry(file_ptr, types[0], entry_0_0_ptr->addr, 
+                                entry_0_1_ptr->addr);
 
         if(result >= 0) {
             pass = FALSE;
@@ -16969,7 +16970,8 @@ check_move_entry_errs(unsigned paged)
     } /* end if */
 
     if(pass) {
-        result = H5C_move_entry(cache_ptr, types[0], entry_0_0_ptr->addr, entry_1_0_ptr->addr);
+        result = H5C_move_entry(file_ptr, types[0], entry_0_0_ptr->addr, 
+                                entry_1_0_ptr->addr);
 
         if(result >= 0) {
             pass = FALSE;
@@ -17000,7 +17002,8 @@ check_move_entry_errs(unsigned paged)
     } /* end if */
 
     if(pass) {
-	result = H5C_move_entry(cache_ptr, types[0], entry_ptr->header.addr, entry_ptr->header.addr + 10);
+	result = H5C_move_entry(file_ptr, types[0], entry_ptr->header.addr, 
+                                entry_ptr->header.addr + 10);
 
         if(result >= 0) {
             pass = FALSE;