summaryrefslogtreecommitdiffstats
path: root/test/mf.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-09-21 02:18:45 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-09-21 02:18:45 (GMT)
commit0695d6366a670e1dd9b6b0ca463feec12ab659d7 (patch)
treebaf248c43e42f8a479fb46dd21a916180575ac9b /test/mf.c
parent68659dd411a8ca3b0b2ef86eaaa7d5ba5d5bc449 (diff)
parent8fc9a9ba251ea34ac5a943ad8eb7f6cf012b929d (diff)
downloadhdf5-0695d6366a670e1dd9b6b0ca463feec12ab659d7.zip
hdf5-0695d6366a670e1dd9b6b0ca463feec12ab659d7.tar.gz
hdf5-0695d6366a670e1dd9b6b0ca463feec12ab659d7.tar.bz2
[svn-r27835] Description:
Sync w/trunk. Tested on: MacOSX/64 10.10.5 (amazon) w/serial & parallel (h5committest not required on this branch)
Diffstat (limited to 'test/mf.c')
-rw-r--r--test/mf.c42
1 files changed, 22 insertions, 20 deletions
diff --git a/test/mf.c b/test/mf.c
index 67ebc4e..d0c3149 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -24,13 +24,13 @@
#include "h5test.h"
-#define H5MF_PACKAGE
+#define H5MF_FRIEND /*suppress error about including H5MFpkg */
#include "H5MFpkg.h"
-#define H5FS_PACKAGE
+#define H5FS_FRIEND /*suppress error about including H5FSpkg */
#include "H5FSpkg.h"
-#define H5F_PACKAGE
+#define H5F_FRIEND /*suppress error about including H5Fpkg */
#define H5F_TESTING
#include "H5Fpkg.h"
@@ -331,9 +331,9 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl)
hid_t fapl_new = -1; /* copy of fapl */
char filename[FILENAME_LEN]; /* Filename to use */
H5F_t *f = NULL; /* Internal file object pointer */
- h5_stat_size_t file_size, new_file_size; /* file size */
+ h5_stat_size_t file_size = 0, new_file_size; /* file size */
H5FD_mem_t type;
- haddr_t addr;
+ haddr_t addr = 0;
haddr_t ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
hsize_t ma_size=0, new_ma_size=0;
hbool_t contig_addr_vfd; /* Whether VFD used has a contigous address space */
@@ -3236,7 +3236,7 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl)
hid_t file = -1; /* File ID */
char filename[FILENAME_LEN]; /* Filename to use */
H5F_t *f = NULL; /* Internal file object pointer */
- h5_stat_size_t empty_size, file_size;
+ h5_stat_size_t empty_size = 0, file_size;
H5FD_mem_t type, stype;
haddr_t new_addr, addr, saddr;
haddr_t ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
@@ -3528,7 +3528,7 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl)
hid_t file = -1; /* File ID */
char filename[FILENAME_LEN]; /* Filename to use */
H5F_t *f = NULL; /* Internal file object pointer */
- h5_stat_size_t empty_size, file_size;
+ h5_stat_size_t empty_size = 0, file_size;
H5FD_mem_t type, stype;
haddr_t addr1, addr2, addr3, saddr1;
haddr_t ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
@@ -3764,7 +3764,7 @@ static unsigned
test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
{
hid_t file = -1; /* File ID */
- hid_t fapl1;
+ hid_t fapl1 = -1;
char filename[FILENAME_LEN]; /* Filename to use */
H5F_t *f = NULL; /* Internal file object pointer */
h5_stat_size_t file_size, new_file_size;
@@ -6843,7 +6843,7 @@ test_mf_fs_drivers(hid_t fapl)
ret += test_mf_fs_gone(fapl_new, fcpl);
ret += test_mf_fs_persist(fapl_new, fcpl);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
/* STDIO */
@@ -6857,7 +6857,7 @@ test_mf_fs_drivers(hid_t fapl)
ret += test_mf_fs_gone(fapl_new, fcpl);
ret += test_mf_fs_persist(fapl_new, fcpl);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
/* CORE */
HDputs("Testing free-space managers with core driver");
@@ -6871,7 +6871,7 @@ test_mf_fs_drivers(hid_t fapl)
ret += test_mf_fs_gone(fapl_new, fcpl);
ret += test_mf_fs_persist(fapl_new, fcpl);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
/* FAMILY */
HDputs("Testing free-space managers with family driver");
@@ -6883,7 +6883,7 @@ test_mf_fs_drivers(hid_t fapl)
ret += test_mf_fs_persist(fapl_new, fcpl);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
/* SPLIT */
HDputs("Testing free-space managers with split driver");
@@ -6896,7 +6896,7 @@ test_mf_fs_drivers(hid_t fapl)
ret += test_mf_fs_persist(fapl_new, fcpl);
ret += test_mf_fs_split(fapl_new, fcpl);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
/* MULTI */
HDputs("Testing free-space managers with multi driver");
@@ -6910,7 +6910,7 @@ test_mf_fs_drivers(hid_t fapl)
ret += test_mf_fs_multi(fapl_new, fcpl);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
} /* end for new_format */
@@ -7262,7 +7262,7 @@ test_filespace_drivers(hid_t fapl)
ret += test_filespace_strategy_threshold(fapl_new);
ret += test_filespace_gone(fapl_new);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
/* STDIO */
HDputs("Testing file space management with stdio driver");
@@ -7275,7 +7275,7 @@ test_filespace_drivers(hid_t fapl)
ret += test_filespace_strategy_threshold(fapl_new);
ret += test_filespace_gone(fapl_new);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
/* CORE */
HDputs("Testing file space management with core driver");
@@ -7289,7 +7289,7 @@ test_filespace_drivers(hid_t fapl)
ret += test_filespace_strategy_threshold(fapl_new);
ret += test_filespace_gone(fapl_new);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
/* FAMILY */
HDputs("Testing file space managers with family driver");
@@ -7302,7 +7302,7 @@ test_filespace_drivers(hid_t fapl)
ret += test_filespace_strategy_threshold(fapl_new);
ret += test_filespace_gone(fapl_new);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
/* SPLIT */
@@ -7316,7 +7316,7 @@ test_filespace_drivers(hid_t fapl)
ret += test_filespace_strategy_threshold(fapl_new);
ret += test_filespace_gone(fapl_new);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
/* MULTI */
HDputs("Testing file space managers with multi driver");
@@ -7331,7 +7331,7 @@ test_filespace_drivers(hid_t fapl)
ret += test_filespace_strategy_threshold(fapl_new);
ret += test_filespace_gone(fapl_new);
- h5_cleanup(FILENAME, fapl_new);
+ h5_clean_files(FILENAME, fapl_new);
} /* end for new_format */
@@ -7456,6 +7456,8 @@ main(void)
if(env_h5_drvr == NULL)
env_h5_drvr = "nomatch";
+ h5_reset();
+
fapl = h5_fileaccess();
/* Make a copy of the FAPL before adjusting the alignment */