fix unused related warnings

11 files changed, 81 insertions, 85 deletions

diff --git a/test/cache_common.c b/test/cache_common.c
index 1da875f..92c6e53 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -19,6 +19,7 @@
  */
 #include "H5CXprivate.h"        /* API Contexts                         */
 #include "H5MMprivate.h"
+#include "H5private.h"
 
 #include "cache_common.h"
 
@@ -564,7 +565,7 @@ addr_to_type_and_index(haddr_t addr,
  *-------------------------------------------------------------------------
  */
 static herr_t
-get_initial_load_size(void *udata, size_t *image_length, int32_t entry_type)
+get_initial_load_size(void *udata, size_t *image_length, int32_t H5_ATTR_SANITY_CHECK entry_type)
 {
     test_entry_t *entry;
     test_entry_t *base_addr;
@@ -674,7 +675,7 @@ notify_get_initial_load_size(void *udata, size_t *image_length)
  */
 static herr_t
 get_final_load_size(const void H5_ATTR_UNUSED *image, size_t H5_ATTR_UNUSED image_len,
-    void *udata, size_t *actual_len, int32_t entry_type)
+    void *udata, size_t *actual_len, int32_t H5_ATTR_SANITY_CHECK entry_type)
 {
     test_entry_t *entry;
     test_entry_t *base_addr;
@@ -734,7 +735,8 @@ variable_get_final_load_size(const void *image, size_t image_len,
  */
 
 static htri_t
-verify_chksum(const void H5_ATTR_UNUSED *image, size_t H5_ATTR_UNUSED len, void *udata, int32_t entry_type)
+verify_chksum(const void H5_ATTR_UNUSED *image, size_t H5_ATTR_UNUSED len, void *udata, 
+    int32_t H5_ATTR_SANITY_CHECK entry_type)
 {
     test_entry_t *entry;
     test_entry_t *base_addr;
@@ -787,8 +789,8 @@ variable_verify_chksum(const void *image, size_t len, void *udata)
  *-------------------------------------------------------------------------
  */
 static void *
-deserialize(const void *image, size_t len, void *udata, hbool_t *dirty,
-    int32_t entry_type)
+deserialize(const void *image, size_t H5_ATTR_SANITY_CHECK len, void *udata, hbool_t *dirty,
+    int32_t H5_ATTR_SANITY_CHECK entry_type)
 {
     test_entry_t *entry;
     test_entry_t *base_addr;
@@ -944,12 +946,10 @@ notify_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty)
  *-------------------------------------------------------------------------
  */
 herr_t
-image_len(const void *thing, size_t *image_length, int32_t entry_type)
+image_len(const void *thing, size_t *image_length, int32_t H5_ATTR_SANITY_CHECK entry_type)
 {
     const test_entry_t *entry;
-    test_entry_t *base_addr;
     int32_t type;
-    int32_t idx;
 
     HDassert(thing);
     HDassert(image_length);
@@ -959,14 +959,12 @@ image_len(const void *thing, size_t *image_length, int32_t entry_type)
     HDassert(entry->self == entry);
 
     type = entry->type;
-    idx = entry->index;
 
     HDassert((type >= 0) && (type < NUMBER_OF_ENTRY_TYPES));
     HDassert(type == entry_type);
-    HDassert((idx >= 0) && (idx <= max_indices[type]));
+    HDassert((entry->index >= 0) && (entry->index <= max_indices[type]));
 
-    base_addr = entries[type];
-    HDassert(entry == &(base_addr[idx]));
+    HDassert(entry == &(entries[type][entry->index]));
 
     if(type != VARIABLE_ENTRY_TYPE)
     HDassert(entry->size == entry_sizes[type]);
@@ -1066,18 +1064,15 @@ notify_image_len(const void *thing, size_t *image_length)
  *-------------------------------------------------------------------------
  */
 herr_t
-pre_serialize(H5F_t *f,
+pre_serialize(H5F_t H5_ATTR_SANITY_CHECK *f,
               void *thing,
-              haddr_t addr,
-              size_t len,
+              haddr_t H5_ATTR_SANITY_CHECK addr,
+              size_t H5_ATTR_SANITY_CHECK len,
               haddr_t *new_addr_ptr,
               size_t *new_len_ptr,
               unsigned *flags_ptr)
 {
     test_entry_t *entry;
-    test_entry_t *base_addr;
-    int32_t type;
-    int32_t idx;
     int32_t i;
 
     HDassert(f);
@@ -1097,16 +1092,9 @@ pre_serialize(H5F_t *f,
 
     /* shouldn't serialize the entry unless it is dirty */
     HDassert(entry->is_dirty);
-
-    type = entry->type;
-    idx = entry->index;
-
-    HDassert((type >= 0) && (type < NUMBER_OF_ENTRY_TYPES));
-    HDassert((idx >= 0) && (idx <= max_indices[type]));
-
-    base_addr = entries[type];
-
-    HDassert(entry == &(base_addr[idx]));
+    HDassert((entry->type >= 0) && (entry->type < NUMBER_OF_ENTRY_TYPES));
+    HDassert((entry->index >= 0) && (entry->index <= max_indices[entry->type]));
+    HDassert(entry == &(entries[entry->type][entry->index]));
     HDassert(entry->num_flush_ops >= 0);
     HDassert(entry->num_flush_ops < MAX_FLUSH_OPS);
 
@@ -1318,9 +1306,7 @@ herr_t
 serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thing)
 {
     test_entry_t *entry;
-    test_entry_t *base_addr;
     int32_t type;
-    int32_t idx;
 
     HDassert(image_ptr);
     HDassert(thing);
@@ -1334,14 +1320,11 @@ serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thin
     HDassert(entry->is_dirty);
 
     type = entry->type;
-    idx = entry->index;
 
     HDassert((type >= 0) && (type < NUMBER_OF_ENTRY_TYPES));
-    HDassert((idx >= 0) && (idx <= max_indices[type]));
+    HDassert((entry->index >= 0) && (entry->index <= max_indices[type]));
 
-    base_addr = entries[type];
-
-    HDassert(entry == &(base_addr[idx]));
+    HDassert(entry == &(entries[type][entry->index]));
     HDassert(entry->num_flush_ops >= 0);
     HDassert(entry->num_flush_ops < MAX_FLUSH_OPS);
 
@@ -1472,21 +1455,19 @@ notify_serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len,
  *-------------------------------------------------------------------------
  */
 static herr_t
-notify(H5C_notify_action_t action, void *thing, int32_t entry_type)
+notify(H5C_notify_action_t action, void *thing, int32_t H5_ATTR_SANITY_CHECK entry_type)
 {
     test_entry_t *entry;
-    test_entry_t *base_addr;
 
     HDassert(thing);
 
     entry = (test_entry_t *)thing;
-    base_addr = entries[entry->type];
 
     HDassert(entry->index >= 0);
     HDassert(entry->index <= max_indices[entry->type]);
     HDassert((entry->type >= 0) && (entry->type < NUMBER_OF_ENTRY_TYPES));
     HDassert(entry->type == entry_type);
-    HDassert(entry == &(base_addr[entry->index]));
+    HDassert(entry == &(entries[entry->type][entry->index]));
     HDassert(entry == entry->self);
     if(!(action == H5C_NOTIFY_ACTION_ENTRY_DIRTIED && entry->action == TEST_ENTRY_ACTION_MOVE))
         HDassert(entry->header.addr == entry->addr);
@@ -1551,18 +1532,14 @@ notify_notify(H5C_notify_action_t action, void *thing)
  *-------------------------------------------------------------------------
  */
 herr_t
-free_icr(test_entry_t *entry, int32_t entry_type)
+free_icr(test_entry_t *entry, int32_t H5_ATTR_SANITY_CHECK entry_type)
 {
-    test_entry_t *base_addr;
-
     HDassert(entry);
 
-    base_addr = entries[entry->type];
-
     HDassert(entry->type == entry_type);
     HDassert(entry->index >= 0);
     HDassert(entry->index <= max_indices[entry->type]);
-    HDassert(entry == &(base_addr[entry->index]));
+    HDassert(entry == &(entries[entry->type][entry->index]));
     HDassert(entry == entry->self);
     HDassert(entry->cache_ptr != NULL);
     HDassert(entry->cache_ptr->magic == H5C__H5C_T_MAGIC);
diff --git a/test/cache_image.c b/test/cache_image.c
index 3a30ddc..d4002c7 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -7838,7 +7838,7 @@ get_free_sections_test(hbool_t single_file_vfd)
  *-------------------------------------------------------------------------
  */
 static unsigned
-evict_on_close_test()
+evict_on_close_test(hbool_t single_file_vfd)
 {
 #ifndef H5_HAVE_PARALLEL
     const char * fcn_name = "evict_on_close_test()";
diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index 564e5bc..ddd63e4 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -443,7 +443,7 @@ check_file_creation_tags(hid_t fcpl_id, int type)
     hid_t fid = -1;             /* File Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;        /* verbose test outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t fapl = -1;         /* File access prop list */
     haddr_t root_tag = 0;
     haddr_t sbe_tag = 0;
@@ -532,7 +532,7 @@ check_file_open_tags(hid_t fcpl, int type)
     hid_t fid = -1;          /* File Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t fapl = -1;         /* File access prop list */
     haddr_t root_tag;       /* Root Group Tag */
     haddr_t sbe_tag;        /* Sblock Extension Tag */
@@ -647,7 +647,7 @@ check_group_creation_tags(void)
     hid_t gid = -1;          /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t fapl = -1;         /* File access prop list */
     haddr_t root_tag = HADDR_UNDEF;   /* Root Group Tag */
     haddr_t g_tag;          /* Group Tag */
@@ -750,7 +750,7 @@ check_multi_group_creation_tags(void)
     hid_t gid = -1;          /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     char gname[16];          /* group name buffer */
     int i = 0;               /* iterator */
     hid_t fapl = -1;         /* File access prop list */
@@ -881,7 +881,7 @@ check_link_iteration_tags(void)
     hid_t did = -1;          /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     int i = 0;               /* iterator */
     haddr_t root_tag = 0;   /* Root Group Tag Value */
     char dsetname[500];      /* Name of dataset */
@@ -1003,7 +1003,7 @@ check_dense_attribute_tags(void)
     hid_t dcpl = -1;         /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     int i = 0;               /* iterator */
     hid_t fapl = -1;         /* File access property list */
     haddr_t d_tag = 0;       /* Dataset tag value */
@@ -1187,7 +1187,7 @@ check_group_open_tags(void)
     hid_t gid = -1;          /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file output */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t fapl = -1;         /* File access prop list */
     haddr_t root_tag = HADDR_UNDEF;
     haddr_t g_tag;
@@ -1298,7 +1298,7 @@ check_attribute_creation_tags(hid_t fcpl, int type)
     hid_t sid = -1;          /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t fapl = -1;         /* File access prop list */
     haddr_t root_tag = 0;   /* Root group tag */
     haddr_t g_tag = 0;
@@ -1434,7 +1434,7 @@ check_attribute_open_tags(hid_t fcpl, int type)
     hid_t sid = -1;          /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t fapl = -1;         /* File access prop list */
     haddr_t root_tag = 0;
     haddr_t g_tag = 0;
@@ -1573,7 +1573,7 @@ check_attribute_rename_tags(hid_t fcpl, int type)
     hid_t sid = -1;                         /* Dataset Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     int *data = NULL;                       /* data buffer */
     int i,j,k = 0;                          /* iterators */
     hid_t fapl = -1;         /* File access prop list */
@@ -1750,7 +1750,7 @@ check_attribute_delete_tags(hid_t fcpl, int type)
     hid_t sid = -1;                         /* Dataset Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     int *data = NULL;                       /* data buffer */
     int i,j,k = 0;                          /* iterators */
     hid_t fapl = -1;         /* File access prop list */
@@ -1918,7 +1918,7 @@ check_dataset_creation_tags(hid_t fcpl, int type)
     hid_t sid = -1;                         /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2053,7 +2053,7 @@ check_dataset_creation_earlyalloc_tags(hid_t fcpl, int type)
     hid_t sid = -1;                         /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2192,7 +2192,7 @@ check_dataset_open_tags(void)
     hid_t sid = -1;                         /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2320,7 +2320,7 @@ check_dataset_write_tags(void)
     hid_t sid = -1;                         /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2464,7 +2464,7 @@ check_attribute_write_tags(hid_t fcpl, int type)
     hid_t sid = -1;                         /* Dataset Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     int *data = NULL;                       /* data buffer */
     int i,j,k = 0;                          /* iterators */
     hid_t fapl = -1;         /* File access prop list */
@@ -2619,7 +2619,7 @@ check_dataset_read_tags(void)
     hid_t sid = -1;                         /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2758,7 +2758,7 @@ check_dataset_size_retrieval(void)
     hid_t sid = -1;                         /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2899,7 +2899,7 @@ check_dataset_extend_tags(void)
     hid_t sid = -1;                         /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -3038,7 +3038,7 @@ check_object_info_tags(void)
     hid_t gid = -1;          /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file output */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t fapl = -1;         /* File access prop list */
     haddr_t root_tag = HADDR_UNDEF;
     haddr_t g_tag;
@@ -3152,7 +3152,7 @@ check_object_copy_tags(void)
     hid_t gid = -1;                         /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file output */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t fapl = -1;         /* File access prop list */
     haddr_t root_tag = HADDR_UNDEF;
     haddr_t g_tag;
@@ -3275,7 +3275,7 @@ check_link_removal_tags(hid_t fcpl, int type)
     hid_t gid = -1;                         /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -3436,7 +3436,7 @@ check_link_getname_tags(void)
     hid_t gid = -1;                         /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -3587,7 +3587,7 @@ check_external_link_creation_tags(void)
     hid_t gid = -1;                         /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     hid_t fapl = -1;         /* File access prop list */
     haddr_t root_tag = 0;
 
@@ -3695,7 +3695,7 @@ check_external_link_open_tags(void)
     hid_t xid = -1;                         /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif
     H5O_native_info_t ninfo;                /* Native object info struct */
     hid_t fapl = -1;         /* File access prop list */
     haddr_t root_tag = 0;
diff --git a/test/dsets.c b/test/dsets.c
index 7684de4..bb12b38 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -7655,10 +7655,10 @@ static herr_t
 test_deprec(hid_t file)
 {
     hid_t    dataset, space, small_space, create_parms, dcpl;
-    hsize_t    dims[2], small_dims[2];
-    hsize_t     deprec_size;
-    herr_t    status;
-    hsize_t    csize[2];
+    hsize_t  dims[2], small_dims[2];
+    hsize_t  deprec_size;
+    herr_t   H5_ATTR_SANITY_CHECK status;
+    hsize_t  csize[2];
 
     TESTING("deprecated API routines");
 
diff --git a/test/dtypes.c b/test/dtypes.c
index ec82ffd..98abe5c 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -6732,7 +6732,7 @@ static void create_del_obj_named_test_file(const char *filename, hid_t fapl,
     hid_t my_fapl;      /* Copy of file access property list ID */
     hid_t dcpl;         /* Dataset creation property list ID */
     unsigned use_at_least_v18;/* Whether to use old or new format */
-    herr_t status;      /* Generic return value */
+    herr_t H5_ATTR_SANITY_CHECK status; /* Generic return value */
 
     /* Make copy of FAPL */
     my_fapl = H5Pcopy(fapl);
diff --git a/test/mf.c b/test/mf.c
index 3a6a21f..30bc91b 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -38,6 +38,7 @@
 #include "H5Iprivate.h"
 #include "H5VLprivate.h"        /* Virtual Object Layer                     */
 #include "H5VMprivate.h"
+#include "H5private.h"
 
 #define FILENAME_LEN        1024
 
@@ -7528,7 +7529,8 @@ error:
  *-------------------------------------------------------------------------
  */
 static int
-set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t multi, hbool_t split)
+set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t H5_ATTR_SANITY_CHECK multi, 
+    hbool_t split)
 {
     H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
     hid_t memb_fapl_arr[H5FD_MEM_NTYPES];
diff --git a/test/page_buffer.c b/test/page_buffer.c
index 92325f3..d79705e 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -42,6 +42,12 @@
 
 #define FILENAME_LEN            1024
 
+#ifndef H5_HAVE_PARALLEL
+#define NUM_DSETS               5
+#define NX                      100
+#define NY                      50
+#endif
+
 /* helper routines */
 #ifndef H5_HAVE_PARALLEL
 static unsigned create_file(char *filename, hid_t fcpl, hid_t fapl);
diff --git a/test/tfile.c b/test/tfile.c
index 4c23488..bce7ce9 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -25,6 +25,7 @@
 #include "H5Iprivate.h"
 #include "H5Pprivate.h"
 #include "H5VLprivate.h"        /* Virtual Object Layer                     */
+#include "H5private.h"
 
 /*
  * This file needs to access private information from the H5F package.
@@ -4208,7 +4209,8 @@ test_filespace_info(const char *env_h5_drvr)
 **
 *****************************************************************/
 static int
-set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t multi, hbool_t split)
+set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t H5_ATTR_SANITY_CHECK multi, 
+    hbool_t split)
 {
     H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
     hid_t memb_fapl_arr[H5FD_MEM_NTYPES];
diff --git a/test/tmisc.c b/test/tmisc.c
index 34d20bf..c9162cb 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -130,10 +130,18 @@ typedef struct
 #define MISC8_DSETNAME1         "Dataset1"
 #define MISC8_DSETNAME4         "Dataset4"
 #define MISC8_DSETNAME5         "Dataset5"
+#define MISC8_DSETNAME8         "Dataset8"
+
 #ifndef H5_HAVE_PARALLEL
+#define MISC8_DSETNAME2         "Dataset2"
+#define MISC8_DSETNAME3         "Dataset3"
+#define MISC8_DSETNAME4         "Dataset4"
+#define MISC8_DSETNAME6         "Dataset6"
 #define MISC8_DSETNAME7         "Dataset7"
+#define MISC8_DSETNAME9         "Dataset9"
+#define MISC8_DSETNAME10        "Dataset10"
 #endif
-#define MISC8_DSETNAME8         "Dataset8"
+
 #define MISC8_RANK              2
 #define MISC8_DIM0              50
 #define MISC8_DIM1              50
diff --git a/test/tselect.c b/test/tselect.c
index 27bc36b..348d30a 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -27,6 +27,7 @@
 #include "testhdf5.h"
 #include "hdf5.h"
 #include "H5Spkg.h"        /* Dataspaces                */
+#include "H5private.h"
 
 #define FILENAME   "tselect.h5"
 
@@ -1613,7 +1614,7 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist)
 ****************************************************************/
 static void
 verify_select_hyper_contig_dr__run_test(const uint16_t *cube_buf,
-    size_t cube_size, unsigned edge_size, unsigned cube_rank)
+    size_t H5_ATTR_SANITY_CHECK cube_size, unsigned edge_size, unsigned cube_rank)
 {
     const uint16_t     *cube_ptr;           /* Pointer into the cube buffer */
     uint16_t        expected_value;     /* Expected value in dataset */
diff --git a/test/vds_swmr.h b/test/vds_swmr.h
index eb2dcf4..43c78a4 100644
--- a/test/vds_swmr.h
+++ b/test/vds_swmr.h
@@ -84,7 +84,7 @@
 #define N_PLANES_TO_WRITE   25
 
 /* Planes */
-static hsize_t PLANES[N_SOURCES][RANK] = {
+H5TEST_DLLVAR hsize_t PLANES[N_SOURCES][RANK] = {
     {1, SM_HEIGHT, WIDTH},
     {1, LG_HEIGHT, WIDTH},
     {1, SM_HEIGHT, WIDTH},
@@ -94,7 +94,7 @@ static hsize_t PLANES[N_SOURCES][RANK] = {
 };
 
 /* File names for source datasets */
-static char FILE_NAMES[N_SOURCES][NAME_LEN] = {
+H5TEST_DLLVAR char FILE_NAMES[N_SOURCES][NAME_LEN] = {
     {"vds_swmr_src_a.h5"},
     {"vds_swmr_src_b.h5"},
     {"vds_swmr_src_c.h5"},
@@ -104,11 +104,11 @@ static char FILE_NAMES[N_SOURCES][NAME_LEN] = {
 };
 
 /* VDS file name */
-static char VDS_FILE_NAME[NAME_LEN] = "vds_swmr.h5";
+H5TEST_DLLVAR char VDS_FILE_NAME[NAME_LEN] = "vds_swmr.h5";
 
 /* Dataset names */
-static char SOURCE_DSET_PATH[NAME_LEN] = "/source_dset";
-static char VDS_DSET_NAME[NAME_LEN]    = "vds_dset";
+H5TEST_DLLVAR char SOURCE_DSET_PATH[NAME_LEN] = "/source_dset";
+H5TEST_DLLVAR char VDS_DSET_NAME[NAME_LEN]    = "vds_dset";
 
 /* Fill values */
 #endif /* VDS_SWMR_H */