Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '765cd82d2e650e089e11539c10d6be4fbdbad984':
  Correct failure when allocation tracking are disabled.
This commit is contained in:
Allen Byrne 2020-03-24 13:10:06 -05:00
commit 77bac54352

View File

@ -5743,6 +5743,7 @@ test_misc35(void)
ret = H5get_free_list_sizes(&reg_size_start, &arr_size_start, &blk_size_start, &fac_size_start);
CHECK(ret, FAIL, "H5get_free_list_sizes");
#if defined H5_MEMORY_ALLOC_SANITY_CHECK
/* All the free list values should be >0 */
if(0 == reg_size_start)
ERROR("reg_size_start == 0");
@ -5752,6 +5753,17 @@ test_misc35(void)
ERROR("blk_size_start == 0");
if(0 == fac_size_start)
ERROR("fac_size_start == 0");
#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
/* All the values should be == 0 */
if(0 != reg_size_start)
ERROR("reg_size_start != 0");
if(0 != arr_size_start)
ERROR("arr_size_start != 0");
if(0 != blk_size_start)
ERROR("blk_size_start != 0");
if(0 != fac_size_start)
ERROR("fac_size_start != 0");
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
/* Garbage collect the free lists */
ret = H5garbage_collect();