summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-03-24 18:10:06 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-03-24 18:10:06 (GMT)
commit77bac54352a61bcd746df9c848e905ae559330df (patch)
tree0752a3bd83d88498a212d989386bdc41cba6161d
parent807480a4bb8130fa55492145a046869a5e53cc51 (diff)
parent765cd82d2e650e089e11539c10d6be4fbdbad984 (diff)
downloadhdf5-77bac54352a61bcd746df9c848e905ae559330df.zip
hdf5-77bac54352a61bcd746df9c848e905ae559330df.tar.gz
hdf5-77bac54352a61bcd746df9c848e905ae559330df.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '765cd82d2e650e089e11539c10d6be4fbdbad984': Correct failure when allocation tracking are disabled.
-rw-r--r--test/tmisc.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/test/tmisc.c b/test/tmisc.c
index bd9ae53..76f4ac9 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -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();