From def04e356437bd592bc194e99fe39a987caff85d Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 17 Jul 1999 19:00:22 -0500 Subject: [svn-r1507] Uncommented VL datatypes in compound datatypes test, since it's working now. Some other memory leaks in the tests fixed. --- test/big.c | 1 + test/dsets.c | 2 +- test/enum.c | 2 ++ test/tvltypes.c | 5 ++--- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/big.c b/test/big.c index d414e7d..790cdee 100644 --- a/test/big.c +++ b/test/big.c @@ -79,6 +79,7 @@ is_sparse(void) if ((fd=open("x.h5", O_RDWR|O_TRUNC|O_CREAT, 0666))<0) return 0; if (lseek(fd, 1024*1024, SEEK_SET)!=1024*1024) return 0; if (5!=write(fd, "hello", 5)) return 0; + if (close(fd)<0) return 0; if (stat("x.h5", &sb)<0) return 0; if (unlink("x.h5")<0) return 0; #ifdef HAVE_STAT_ST_BLOCKS diff --git a/test/dsets.c b/test/dsets.c index c8bcbc2..8233360 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -168,7 +168,7 @@ test_simple_io(hid_t file) /* Initialize the dataset */ for (i = n = 0; i < 100; i++) { - for (j = 0; j < 100; j++) { + for (j = 0; j < 200; j++) { points[i][j] = n++; } } diff --git a/test/enum.c b/test/enum.c index 71fc4bf..8091c07 100644 --- a/test/enum.c +++ b/test/enum.c @@ -367,6 +367,8 @@ main(void) nerrors += test_tr1(file); nerrors += test_tr2(file); + H5Fclose(file); + if (nerrors) goto error; puts("All enum tests passed."); h5_cleanup(fapl); diff --git a/test/tvltypes.c b/test/tvltypes.c index 539ea99..be1ada0 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -309,7 +309,6 @@ test_vltypes_vlen_compound(void) ret=H5Dvlen_reclaim(tid1,sid1,xfer_pid,rdata); CHECK(ret, FAIL, "H5Dvlen_reclaim"); - /* Make certain the VL memory has been freed */ VERIFY(mem_used,0,"H5Dvlen_reclaim"); @@ -463,7 +462,7 @@ test_vltypes_compound_vlen_atomic(void) VERIFY(mem_used,0,"H5Dvlen_reclaim"); /* Reclaim the write VL data */ - ret=H5Dvlen_reclaim(tid1,sid1,H5P_DEFAULT,wdata); + ret=H5Dvlen_reclaim(tid2,sid1,H5P_DEFAULT,wdata); CHECK(ret, FAIL, "H5Dvlen_reclaim"); /* Close Dataset */ @@ -600,7 +599,7 @@ test_vltypes_vlen_vlen_atomic(void) VERIFY(mem_used,0,"H5Dvlen_reclaim"); /* Reclaim the write VL data */ - ret=H5Dvlen_reclaim(tid1,sid1,H5P_DEFAULT,wdata); + ret=H5Dvlen_reclaim(tid2,sid1,H5P_DEFAULT,wdata); CHECK(ret, FAIL, "H5Dvlen_reclaim"); /* Close Dataset */ -- cgit v0.12