summaryrefslogtreecommitdiffstats
path: root/test/dsets.c
diff options
context:
space:
mode:
authorVailin Choi <vchoi@jam.ad.hdfgroup.org>2017-05-09 03:14:20 (GMT)
committerVailin Choi <vchoi@jam.ad.hdfgroup.org>2017-05-09 03:14:20 (GMT)
commitd436db6c6efdfe7e9dbe06a642715116ef0eb5e3 (patch)
tree2a5deb26a9573be49d5e5d5982cba1072ebbe171 /test/dsets.c
parent6a4f1187ccef6fd092cf70154e7ffa33f4c2f648 (diff)
downloadhdf5-d436db6c6efdfe7e9dbe06a642715116ef0eb5e3.zip
hdf5-d436db6c6efdfe7e9dbe06a642715116ef0eb5e3.tar.gz
hdf5-d436db6c6efdfe7e9dbe06a642715116ef0eb5e3.tar.bz2
Fix for the two issues reported in HDFFV-10051
Modifications made based on the review comments from pull request #494 Tested on moohan, mayll, kituo, platypus, ostrich, osx1010test, quail, emu.
Diffstat (limited to 'test/dsets.c')
-rw-r--r--test/dsets.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/test/dsets.c b/test/dsets.c
index a561ef48..ad014a6 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -17,24 +17,16 @@
*
* Purpose: Tests the dataset interface (H5D)
*/
-
-#define H5D_FRIEND /*suppress error about including H5Dpkg */
-#define H5D_TESTING
-
#define H5FD_FRIEND /*suppress error about including H5FDpkg */
#define H5FD_TESTING
#define H5Z_FRIEND /*suppress error about including H5Zpkg */
-#define H5D_FRIEND /*suppress error about including H5Dpkg */
#include "h5test.h"
#include "H5srcdir.h"
-#include "H5Dpkg.h"
#include "H5FDpkg.h"
#include "H5VMprivate.h"
-#include "H5Iprivate.h"
#include "H5Zpkg.h"
-#include "H5Dpkg.h"
#ifdef H5_HAVE_SZLIB_H
# include "szlib.h"
#endif
@@ -12669,7 +12661,7 @@ test_compact_open_close_dirty(hid_t fapl)
int wbuf[10]; /* Data buffer */
char filename[FILENAME_BUF_SIZE]; /* Filename */
int i; /* Local index variable */
- H5D_t *dset = NULL; /* Internal dataset pointer */
+ hbool_t dirty; /* The dirty flag */
TESTING("compact dataset repeated open/close and dirty flag");
@@ -12721,16 +12713,17 @@ test_compact_open_close_dirty(hid_t fapl)
if((did = H5Dopen2(fid, DSET_COMPACT_MAX_NAME, H5P_DEFAULT)) < 0)
TEST_ERROR
- /* Get the internal dataset pointer */
- if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
+ /* Retrieve the "dirty" flag from the compact dataset layout */
+ if(H5D__layout_compact_dirty_test(did, &dirty) < 0)
TEST_ERROR
/* Verify that the "dirty" flag is false */
- if(dset->shared->layout.storage.u.compact.dirty)
+ if(dirty)
TEST_ERROR
/* Close the dataset */
- if(H5Dclose(did) < 0) TEST_ERROR
+ if(H5Dclose(did) < 0)
+ TEST_ERROR
/* Close the dataspace */
if(H5Sclose(sid) < 0)