summaryrefslogtreecommitdiffstats
path: root/test/vds.c
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2022-05-04 15:49:01 (GMT)
committerGitHub <noreply@github.com>2022-05-04 15:49:01 (GMT)
commit838d050a63d310a38f92a510dc94c0656a84bb51 (patch)
tree55fe7b05c0408ebf4b28c3bfb5cd9a1d04fb2502 /test/vds.c
parent19a59c29b93c04ae069881da2354d3d7048619b9 (diff)
downloadhdf5-838d050a63d310a38f92a510dc94c0656a84bb51.zip
hdf5-838d050a63d310a38f92a510dc94c0656a84bb51.tar.gz
hdf5-838d050a63d310a38f92a510dc94c0656a84bb51.tar.bz2
h5test.h testing macros get enclosed in do..while loops (#1721)
* h5test.h testing macros get enclosed in do..while loops * Adds missed macro in hl C++ code * Fixes macro in Windows code
Diffstat (limited to 'test/vds.c')
-rw-r--r--test/vds.c5105
1 files changed, 2560 insertions, 2545 deletions
diff --git a/test/vds.c b/test/vds.c
index 4455ad4..f6b1794 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -39,16 +39,25 @@ const char *FILENAME[] = {"vds_virt_0", "vds_virt_1", "vds_src_0", "vds_src_1",
#ifdef VDS_TEST_VERBOSE
/* For verbose output just use standard error printing */
-#define TESTING_2_SUPPRESSED(WHAT) TESTING_2(WHAT)
-#define PASSED_SUPPRESSED() PASSED()
-#define TEST_ERROR_SUPPRESSED TEST_ERROR
+#define TESTING_2_SUPPRESSED(WHAT) \
+ do { \
+ TESTING_2(WHAT); \
+ } while (0)
+#define PASSED_SUPPRESSED() \
+ do { \
+ PASSED(); \
+ } while (0)
+#define TEST_ERROR_SUPPRESSED \
+ do { \
+ TEST_ERROR; \
+ } while (0)
/* Print config directly to output */
#define PRINT_CONFIG(...) \
- { \
+ do { \
HDprintf("Config: " __VA_ARGS__); \
HDputs(""); \
- }
+ } while (0)
#else /* VDS_TEST_VERBOSE */
@@ -58,22 +67,28 @@ char vds_test_str_g[128] = "";
/* Replacement for TESTING_2 for non-verbose-output */
#define TESTING_2_SUPPRESSED(WHAT) \
- { \
+ do { \
HDsnprintf(vds_test_str_g, sizeof(vds_test_str_g), WHAT); \
- }
+ } while (0)
/* Suppress output from PASSED() */
-#define PASSED_SUPPRESSED()
+#define PASSED_SUPPRESSED() \
+ do { \
+ ; \
+ } while (0)
/* Replacement for TEST_ERROR for non-verbose output */
#define TEST_ERROR_SUPPRESSED \
- { \
- printf("Failed config: %s\nFailed test: %s\n", vds_config_str_g, vds_test_str_g); \
- TEST_ERROR \
- }
+ do { \
+ HDprintf("Failed config: %s\nFailed test: %s\n", vds_config_str_g, vds_test_str_g); \
+ TEST_ERROR; \
+ } while (0)
/* Replacement for HDprintf for printing configuration for non-verbose output */
-#define PRINT_CONFIG(...) HDsnprintf(vds_config_str_g, sizeof(vds_config_str_g), __VA_ARGS__);
+#define PRINT_CONFIG(...) \
+ do { \
+ HDsnprintf(vds_config_str_g, sizeof(vds_config_str_g), __VA_ARGS__); \
+ } while (0)
#endif /* VDS_TEST_VERBOSE */
@@ -113,9 +128,9 @@ vds_select_equal(hid_t space1, hid_t space2)
/* Get and compare selection types */
if ((type1 = H5Sget_select_type(space1)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((type2 = H5Sget_select_type(space2)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (type1 != type2)
return FALSE;
@@ -133,32 +148,32 @@ vds_select_equal(hid_t space1, hid_t space2)
/* Get and compare rank */
if ((rank1 = H5Sget_simple_extent_ndims(space1)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((rank2 = H5Sget_simple_extent_ndims(space2)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (rank1 != rank2)
return FALSE;
/* Get and compare number of points */
if ((npoints1 = H5Sget_select_elem_npoints(space1)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((npoints2 = H5Sget_select_elem_npoints(space2)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (npoints1 != npoints2)
return FALSE;
/* Allocate point lists. Do not return directly after
* allocating, to make sure buffers are freed. */
if (NULL == (buf1 = (hsize_t *)HDmalloc((size_t)rank1 * (size_t)npoints1 * sizeof(hsize_t))))
- TEST_ERROR
+ TEST_ERROR;
if (NULL == (buf2 = (hsize_t *)HDmalloc((size_t)rank1 * (size_t)npoints1 * sizeof(hsize_t))))
- TEST_ERROR
+ TEST_ERROR;
/* Get and compare point lists */
if (H5Sget_select_elem_pointlist(space1, (hsize_t)0, (hsize_t)npoints1, buf1) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (H5Sget_select_elem_pointlist(space2, (hsize_t)0, (hsize_t)npoints1, buf2) < 0)
- TEST_ERROR
+ TEST_ERROR;
for (i = 0; i < ((size_t)rank1 * (size_t)npoints1); i++)
if (buf1[i] != buf2[i]) {
ret_value = FALSE;
@@ -182,17 +197,17 @@ vds_select_equal(hid_t space1, hid_t space2)
/* Get and compare rank */
if ((rank1 = H5Sget_simple_extent_ndims(space1)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((rank2 = H5Sget_simple_extent_ndims(space2)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (rank1 != rank2)
return FALSE;
/* Get and compare number of blocks */
if ((nblocks1 = H5Sget_select_hyper_nblocks(space1)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((nblocks2 = H5Sget_select_hyper_nblocks(space2)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (nblocks1 != nblocks2)
return FALSE;
@@ -200,16 +215,16 @@ vds_select_equal(hid_t space1, hid_t space2)
* allocating, to make sure buffers are freed. */
if (NULL ==
(buf1 = (hsize_t *)HDmalloc((size_t)2 * (size_t)rank1 * (size_t)nblocks1 * sizeof(*buf1))))
- TEST_ERROR
+ TEST_ERROR;
if (NULL ==
(buf2 = (hsize_t *)HDmalloc((size_t)2 * (size_t)rank1 * (size_t)nblocks1 * sizeof(*buf2))))
- TEST_ERROR
+ TEST_ERROR;
/* Get and compare block lists */
if (H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks1, buf1) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (H5Sget_select_hyper_blocklist(space2, (hsize_t)0, (hsize_t)nblocks1, buf2) < 0)
- TEST_ERROR
+ TEST_ERROR;
for (i = 0; i < ((size_t)2 * (size_t)rank1 * (size_t)nblocks1); i++)
if (buf1[i] != buf2[i]) {
ret_value = FALSE;
@@ -228,7 +243,7 @@ vds_select_equal(hid_t space1, hid_t space2)
case H5S_SEL_ERROR:
case H5S_SEL_N:
default:
- TEST_ERROR
+ TEST_ERROR;
} /* end switch */
return ret_value;
@@ -270,55 +285,55 @@ vds_check_mapping(hid_t dcpl, size_t i, hid_t vspace, hid_t srcspace, const char
/* Check vspace */
if ((space_out = H5Pget_virtual_vspace(dcpl, i)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((tri_ret = H5Sextent_equal(space_out, vspace)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (!tri_ret)
- TEST_ERROR
+ TEST_ERROR;
if ((tri_ret = vds_select_equal(space_out, vspace)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (!tri_ret)
- TEST_ERROR
+ TEST_ERROR;
if (H5Sclose(space_out) < 0)
- TEST_ERROR
+ TEST_ERROR;
space_out = -1;
/* Check srcspace */
if ((space_out = H5Pget_virtual_srcspace(dcpl, i)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((tri_ret = vds_select_equal(space_out, srcspace)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (!tri_ret)
- TEST_ERROR
+ TEST_ERROR;
if (H5Sclose(space_out) < 0)
- TEST_ERROR
+ TEST_ERROR;
space_out = -1;
/* Check filename */
if ((str_len = H5Pget_virtual_filename(dcpl, i, NULL, (size_t)0)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((size_t)str_len != HDstrlen(filename))
- TEST_ERROR
+ TEST_ERROR;
HDassert((size_t)str_len < sizeof(name_out));
if ((str_len = H5Pget_virtual_filename(dcpl, i, name_out, sizeof(name_out))) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((size_t)str_len != HDstrlen(filename))
- TEST_ERROR
+ TEST_ERROR;
if (HDstrncmp(name_out, filename, (size_t)str_len + 1) != 0)
- TEST_ERROR
+ TEST_ERROR;
/* Check dsetname */
if ((str_len = H5Pget_virtual_dsetname(dcpl, i, NULL, (size_t)0)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((size_t)str_len != HDstrlen(dsetname))
- TEST_ERROR
+ TEST_ERROR;
HDassert((size_t)str_len < sizeof(name_out));
if ((str_len = H5Pget_virtual_dsetname(dcpl, i, name_out, sizeof(name_out))) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((size_t)str_len != HDstrlen(dsetname))
- TEST_ERROR
+ TEST_ERROR;
if (HDstrncmp(name_out, dsetname, (size_t)str_len + 1) != 0)
- TEST_ERROR
+ TEST_ERROR;
return 0;
@@ -365,105 +380,105 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex
if (config >= TEST_API_CREATE_DSET) {
/* Create file and dataset */
if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((dset = H5Dcreate2(file, "vdset", H5T_NATIVE_INT, vspace, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Test H5Dget_space_status */
if (H5Dget_space_status(dset, &space_status) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (space_status != H5D_SPACE_STATUS_ALLOCATED)
- TEST_ERROR
+ TEST_ERROR;
/* Reopen dataset if requested */
if (config >= TEST_API_REOPEN_DSET) {
/* Close dataset */
if (H5Dclose(dset) < 0)
- TEST_ERROR
+ TEST_ERROR;
dset = -1;
/* Reopen file if requested */
if (config == TEST_API_REOPEN_FILE) {
if (H5Fclose(file) < 0)
- TEST_ERROR
+ TEST_ERROR;
file = -1;
if ((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
- TEST_ERROR
+ TEST_ERROR;
}
/* Open dataset */
if ((dset = H5Dopen2(file, "vdset", H5P_DEFAULT)) < 0)
- TEST_ERROR
+ TEST_ERROR;
}
/* Get DCPL from dataset */
if ((*ex_dcpl = H5Dget_create_plist(dset)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Test H5Dget_offset() (just returns HADDR_UNDEF) */
if (HADDR_UNDEF != H5Dget_offset(dset))
- TEST_ERROR
+ TEST_ERROR;
/* Test H5Oget_info returns correct metadata size */
if (H5Oget_native_info(dset, &ninfo, H5O_NATIVE_INFO_META_SIZE) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (ninfo.meta_size.obj.index_size != (hsize_t)0)
- TEST_ERROR
+ TEST_ERROR;
if (config == TEST_API_REOPEN_FILE) {
if (ninfo.meta_size.obj.heap_size != exp_meta_size) {
HDprintf("VDS metadata size: %llu Expected: %llu\n",
(long long unsigned)ninfo.meta_size.obj.heap_size,
(long long unsigned)exp_meta_size);
- TEST_ERROR
+ TEST_ERROR;
}
}
else if ((ninfo.meta_size.obj.heap_size != exp_meta_size) &&
(ninfo.meta_size.obj.heap_size != (hsize_t)0))
- TEST_ERROR
+ TEST_ERROR;
if (ninfo.meta_size.attr.index_size != (hsize_t)0)
- TEST_ERROR
+ TEST_ERROR;
if (ninfo.meta_size.attr.index_size != (hsize_t)0)
- TEST_ERROR
+ TEST_ERROR;
/* Test H5Dget_space_status */
if (H5Dget_space_status(dset, &space_status) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (space_status != H5D_SPACE_STATUS_ALLOCATED)
- TEST_ERROR
+ TEST_ERROR;
/* Close dataset */
if (H5Dclose(dset) < 0)
- TEST_ERROR
+ TEST_ERROR;
dset = -1;
/* Delete dataset */
if (H5Ldelete(file, "vdset", H5P_DEFAULT) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Close file */
if (H5Fclose(file) < 0)
- TEST_ERROR
+ TEST_ERROR;
file = -1;
}
else if (config == TEST_API_COPY_PLIST) {
/* Copy property list */
if ((*ex_dcpl = H5Pcopy(dcpl)) < 0)
- TEST_ERROR
+ TEST_ERROR;
}
else if (config == TEST_API_ENCDEC_PLIST) {
size_t plist_buf_size;
/* Encode property list to plist_buf */
if (H5Pencode2(dcpl, NULL, &plist_buf_size, fapl) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (NULL == (plist_buf = HDmalloc(plist_buf_size)))
- TEST_ERROR
+ TEST_ERROR;
if (H5Pencode2(dcpl, plist_buf, &plist_buf_size, fapl) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Decode serialized property list to *ex_dcpl */
if ((*ex_dcpl = H5Pdecode(plist_buf)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Free plist_buf */
HDfree(plist_buf);
@@ -473,7 +488,7 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex
/* Simply copy the id to ex_dcpl and increment the ref count so ex_dcpl
* can be closed */
if (H5Iinc_ref(dcpl) < 0)
- TEST_ERROR
+ TEST_ERROR;
*ex_dcpl = dcpl;
}
@@ -483,9 +498,9 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex
*/
if ((*ex_dcpl != dcpl) && (config != TEST_API_REOPEN_FILE)) {
if ((tri_ret = H5Pequal(dcpl, *ex_dcpl)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (!tri_ret)
- TEST_ERROR
+ TEST_ERROR;
}
return 0;
@@ -534,78 +549,78 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
switch (config) {
case TEST_API_BASIC:
- TESTING_2("virtual dataset API functions")
+ TESTING_2("virtual dataset API functions");
break;
case TEST_API_COPY_PLIST:
- TESTING_2("virtual dataset API functions with copied plists")
+ TESTING_2("virtual dataset API functions with copied plists");
break;
case TEST_API_ENCDEC_PLIST:
- TESTING_2("virtual dataset API functions with encoded and decoded plists")
+ TESTING_2("virtual dataset API functions with encoded and decoded plists");
break;
case TEST_API_CREATE_DSET:
- TESTING_2("virtual dataset create")
+ TESTING_2("virtual dataset create");
break;
case TEST_API_REOPEN_DSET:
- TESTING_2("virtual dataset create with reopened dataset")
+ TESTING_2("virtual dataset create with reopened dataset");
break;
case TEST_API_REOPEN_FILE:
- TESTING_2("virtual dataset create with reopened file")
+ TESTING_2("virtual dataset create with reopened file");
break;
case TEST_API_NTESTS:
default:
- TEST_ERROR
+ TEST_ERROR;
}
h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
/* Create DCPL */
if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/*
* Test 1: All - all selection
*/
/* Create source dataspace */
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create virtual dataspace */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select all (should not be necessary, but just to be sure) */
if (H5Sselect_all(srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (H5Sselect_all(vspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[0], src_file[0], src_dset[0], srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Get examination DCPL */
if (test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)69) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Test H5Pget_virtual_count */
if (H5Pget_virtual_count(ex_dcpl, &size_out) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (size_out != (size_t)1)
- TEST_ERROR
+ TEST_ERROR;
/* Check that the mapping in the DCPL is correct */
if (vds_check_mapping(ex_dcpl, (size_t)0, vspace[0], srcspace[0], src_file[0], src_dset[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Close */
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
vspace[0] = -1;
if (H5Pclose(ex_dcpl) < 0)
- TEST_ERROR
+ TEST_ERROR;
ex_dcpl = -1;
/*
@@ -613,15 +628,15 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create source dataspace */
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create virtual dataspace */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select regular hyperslab in source space */
start[0] = 2;
@@ -633,7 +648,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
block[0] = 2;
block[1] = 4;
if (H5Sselect_hyperslab(srcspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select composite hyperslab in virtual space */
count[0] = 1;
@@ -641,43 +656,43 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
block[0] = 5;
block[1] = 6;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, count, block) < 0)
- TEST_ERROR
+ TEST_ERROR;
start[0] = 7;
start[1] = 0;
block[0] = 1;
block[1] = 18;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_OR, start, NULL, count, block) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[0], src_file[0], src_dset[0], srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Get examination DCPL */
if (test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename,
(low >= H5F_LIBVER_V112) ? (hsize_t)99 : (low >= H5F_LIBVER_V110 ? 174 : 213)) <
0)
- TEST_ERROR
+ TEST_ERROR;
/* Test H5Pget_virtual_count */
if (H5Pget_virtual_count(ex_dcpl, &size_out) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (size_out != (size_t)1)
- TEST_ERROR
+ TEST_ERROR;
/* Check that the mapping in the DCPL is correct */
if (vds_check_mapping(ex_dcpl, (size_t)0, vspace[0], srcspace[0], src_file[0], src_dset[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Close */
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
vspace[0] = -1;
if (H5Pclose(ex_dcpl) < 0)
- TEST_ERROR
+ TEST_ERROR;
ex_dcpl = -1;
#ifdef VDS_POINT_SELECTIONS /* VDS does not currently support point selections */
@@ -686,15 +701,15 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create source dataspace */
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create virtual dataspace */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select points in source space */
coord[0] = 5;
@@ -708,7 +723,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
coord[8] = 8;
coord[9] = 18;
if (H5Sselect_elements(srcspace[0], H5S_SELECT_SET, (size_t)5, coord) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select points in virtual space */
coord[0] = 3;
@@ -722,35 +737,35 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
coord[8] = 5;
coord[9] = 5;
if (H5Sselect_elements(vspace[0], H5S_SELECT_SET, (size_t)5, coord) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[0], src_file[0], src_dset[0], srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Get examination DCPL */
if (test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)0) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Test H5Pget_virtual_count */
if (H5Pget_virtual_count(ex_dcpl, &size_out) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (size_out != (size_t)1)
- TEST_ERROR
+ TEST_ERROR;
/* Check that the mapping in the DCPL is correct */
if (vds_check_mapping(ex_dcpl, (size_t)0, vspace[0], srcspace[0], src_file[0], src_dset[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Close */
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
vspace[0] = -1;
if (H5Pclose(ex_dcpl) < 0)
- TEST_ERROR
+ TEST_ERROR;
ex_dcpl = -1;
/*
@@ -758,15 +773,15 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create source dataspace */
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create virtual dataspace */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select hyperslab in source space */
start[0] = 2;
@@ -776,7 +791,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
block[0] = 1;
block[1] = 5;
if (H5Sselect_hyperslab(srcspace[0], H5S_SELECT_SET, start, NULL, count, block) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select points in virtual space */
coord[0] = 1;
@@ -790,35 +805,35 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
coord[8] = 7;
coord[9] = 16;
if (H5Sselect_elements(vspace[0], H5S_SELECT_SET, (size_t)5, coord) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[0], src_file[0], src_dset[0], srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Get examination DCPL */
if (test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)0) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Test H5Pget_virtual_count */
if (H5Pget_virtual_count(ex_dcpl, &size_out) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (size_out != (size_t)1)
- TEST_ERROR
+ TEST_ERROR;
/* Check that the mapping in the DCPL is correct */
if (vds_check_mapping(ex_dcpl, (size_t)0, vspace[0], srcspace[0], src_file[0], src_dset[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Close */
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
vspace[0] = -1;
if (H5Pclose(ex_dcpl) < 0)
- TEST_ERROR
+ TEST_ERROR;
ex_dcpl = -1;
/*
@@ -826,24 +841,24 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create dataspaces */
for (i = 0; i < 4; i++) {
/* Create source dataspace */
if ((srcspace[i] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create virtual dataspace */
if ((vspace[i] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
}
/* Select all (should not be necessary, but just to be sure) */
if (H5Sselect_all(srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (H5Sselect_all(vspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select regular hyperslab in source space */
start[0] = 2;
@@ -855,7 +870,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
block[0] = 2;
block[1] = 4;
if (H5Sselect_hyperslab(srcspace[1], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select composite hyperslab in virtual space */
count[0] = 1;
@@ -863,13 +878,13 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
block[0] = 5;
block[1] = 6;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, NULL, count, block) < 0)
- TEST_ERROR
+ TEST_ERROR;
start[0] = 7;
start[1] = 0;
block[0] = 1;
block[1] = 18;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_OR, start, NULL, count, block) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select points in source space */
coord[0] = 5;
@@ -883,7 +898,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
coord[8] = 8;
coord[9] = 18;
if (H5Sselect_elements(srcspace[2], H5S_SELECT_SET, (size_t)5, coord) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select points in virtual space */
coord[0] = 3;
@@ -897,7 +912,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
coord[8] = 5;
coord[9] = 5;
if (H5Sselect_elements(vspace[2], H5S_SELECT_SET, (size_t)5, coord) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select hyperslab in source space */
start[0] = 2;
@@ -907,7 +922,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
block[0] = 1;
block[1] = 5;
if (H5Sselect_hyperslab(srcspace[3], H5S_SELECT_SET, start, NULL, count, block) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select points in virtual space */
coord[0] = 1;
@@ -921,39 +936,39 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
coord[8] = 7;
coord[9] = 16;
if (H5Sselect_elements(vspace[3], H5S_SELECT_SET, (size_t)5, coord) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Add virtual layout mappings */
for (i = 0; i < 4; i++)
if (H5Pset_virtual(dcpl, vspace[i], src_file[i], src_dset[i], srcspace[i]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Get examination DCPL */
if (test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)0) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Test H5Pget_virtual_count */
if (H5Pget_virtual_count(ex_dcpl, &size_out) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (size_out != (size_t)4)
- TEST_ERROR
+ TEST_ERROR;
/* Check that the mappings in the DCPL are correct */
for (i = 0; i < 4; i++)
if (vds_check_mapping(ex_dcpl, (size_t)i, vspace[i], srcspace[i], src_file[i], src_dset[i]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Close */
for (i = 0; i < 4; i++) {
if (H5Sclose(srcspace[i]) < 0)
- TEST_ERROR
+ TEST_ERROR;
srcspace[i] = -1;
if (H5Sclose(vspace[i]) < 0)
- TEST_ERROR
+ TEST_ERROR;
vspace[i] = -1;
}
if (H5Pclose(ex_dcpl) < 0)
- TEST_ERROR
+ TEST_ERROR;
ex_dcpl = -1;
#else /* VDS_POINT_SELECTIONS */
@@ -963,15 +978,15 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create source dataspace */
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create virtual dataspace */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select points in source space */
coord[0] = 5;
@@ -985,7 +1000,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
coord[8] = 8;
coord[9] = 18;
if (H5Sselect_elements(srcspace[0], H5S_SELECT_SET, (size_t)5, coord) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select points in virtual space */
coord[0] = 3;
@@ -999,7 +1014,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
coord[8] = 5;
coord[9] = 5;
if (H5Sselect_elements(vspace[0], H5S_SELECT_SET, (size_t)5, coord) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Attempt to add virtual layout mapping */
H5E_BEGIN_TRY
@@ -1008,7 +1023,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
}
H5E_END_TRY
if (ret >= 0)
- TEST_ERROR
+ TEST_ERROR;
#endif /* VDS_POINT_SELECTIONS */
/*
@@ -1016,16 +1031,16 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create source dataspace */
dims[0] = 1;
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select all in source space (should not be necessary, but just to be sure) */
if (H5Sselect_all(srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Init virtual space extent */
dims[0] = LIST_DOUBLE_SIZE;
@@ -1042,34 +1057,34 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
for (i = 0; i < LIST_DOUBLE_SIZE; i++) {
/* Create virtual dataspace */
if ((vspace[i] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select row in virtual dataspace */
start[0] = (hsize_t)i;
if (H5Sselect_hyperslab(vspace[i], H5S_SELECT_SET, start, NULL, count, block) < 0)
- TEST_ERROR
+ TEST_ERROR;
- /* Create file and dataset names */
- (void) HDsnprintf(tmp_filename, sizeof(tmp_filename), "src_file%u", i);
+ /* Create file and dataset names */
+ (void)HDsnprintf(tmp_filename, sizeof(tmp_filename), "src_file%u", i);
tmp_filename[sizeof(tmp_filename) - 1] = '\0';
(void)HDsnprintf(tmp_dsetname, sizeof(tmp_dsetname), "src_dset%u", i);
tmp_dsetname[sizeof(tmp_dsetname) - 1] = '\0';
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[i], tmp_filename, tmp_dsetname, srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
}
/* Get examination DCPL */
if (test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename,
(low >= H5F_LIBVER_V112) ? (hsize_t)607 : (hsize_t)697) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Test H5Pget_virtual_count */
if (H5Pget_virtual_count(ex_dcpl, &size_out) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (size_out != (size_t)LIST_DOUBLE_SIZE)
- TEST_ERROR
+ TEST_ERROR;
/* Verify virtual layout */
for (i = 0; i < LIST_DOUBLE_SIZE; i++) {
@@ -1083,20 +1098,20 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
/* Check that the mapping in the DCPL is correct */
if (vds_check_mapping(ex_dcpl, (size_t)i, vspace[i], srcspace[0], tmp_filename, tmp_dsetname) < 0)
- TEST_ERROR
+ TEST_ERROR;
}
/* Close */
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
srcspace[0] = -1;
for (i = 0; i < LIST_DOUBLE_SIZE; i++) {
if (H5Sclose(vspace[i]) < 0)
- TEST_ERROR
+ TEST_ERROR;
vspace[i] = -1;
}
if (H5Pclose(ex_dcpl) < 0)
- TEST_ERROR
+ TEST_ERROR;
ex_dcpl = -1;
/*
@@ -1104,37 +1119,37 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Create virtual dataspace */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Select all (should not be necessary, but just to be sure) */
if (H5Sselect_all(vspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Get examination DCPL */
if (test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)0) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Test H5Pget_virtual_count */
if (H5Pget_virtual_count(ex_dcpl, &size_out) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (size_out != (size_t)0)
- TEST_ERROR
+ TEST_ERROR;
/* Close */
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR
+ TEST_ERROR;
vspace[0] = -1;
if (H5Pclose(ex_dcpl) < 0)
- TEST_ERROR
+ TEST_ERROR;
ex_dcpl = -1;
/* Close */
if (H5Pclose(dcpl) < 0)
- TEST_ERROR
+ TEST_ERROR;
dcpl = -1;
PASSED();
@@ -1191,7 +1206,7 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl)
int i, j;
char buffer[1024]; /* buffer to read vds_prefix */
- TESTING_2_SUPPRESSED("basic virtual dataset I/O via H5Pset_vds_prefix(): all selection")
+ TESTING_2_SUPPRESSED("basic virtual dataset I/O via H5Pset_vds_prefix(): all selection");
if ((srcfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
TEST_ERROR_SUPPRESSED;
@@ -1212,76 +1227,76 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* create tmp directory and get current working directory path */
if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create DCPL */
if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Set fill value */
if (H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fill) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Initialize VDS prefix items */
if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_prefix(dapl, TMPDIR) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pget_virtual_prefix(dapl, buffer, sizeof(buffer)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (HDstrcmp(buffer, TMPDIR) != 0)
FAIL_PUTS_ERROR("vds prefix not set correctly");
/* Create source dataspace */
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspace */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select all (should not be necessary, but just to be sure) */
if (H5Sselect_all(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sselect_all(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if (NULL == HDgetcwd(buffer, 1024))
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (HDchdir(TMPDIR) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (HDchdir(buffer) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source dataset */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -1290,17 +1305,17 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data directly to source dataset */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcdset and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -1308,27 +1323,27 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data through virtual dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++) {
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != buf[i][j]) {
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
}
@@ -1339,59 +1354,59 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data through virtual dataset */
if (H5Dwrite(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcdset and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE) {
if (NULL == HDgetcwd(buffer, 1024))
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (HDchdir(TMPDIR) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDONLY, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (HDchdir(buffer) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((srcdset[0] = H5Dopen2(srcfile[0], "src_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data directly from source dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != buf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Pclose(dapl) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dapl = -1;
if (H5Pclose(dcpl) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dcpl = -1;
HDfree(srcfilename);
@@ -1423,7 +1438,7 @@ error:
H5E_END_TRY;
if (HDsetenv("HDF5_VDS_PREFIX", "", 1) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
HDfree(srcfilename);
HDfree(srcfilename_map);
@@ -1478,7 +1493,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
herr_t ret; /* Generic return value */
int i, j, u, v;
- TESTING_2_SUPPRESSED("basic virtual dataset I/O")
+ TESTING_2_SUPPRESSED("basic virtual dataset I/O");
if ((srcfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
TEST_ERROR_SUPPRESSED;
@@ -1502,57 +1517,57 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Create DCPL */
if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Set fill value */
if (H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fill) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/*
* Test 1: All - all selection
*/
/* Create source dataspace */
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspace */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select all (should not be necessary, but just to be sure) */
if (H5Sselect_all(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sselect_all(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source dataset */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -1561,17 +1576,17 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data directly to source dataset */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcdset and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -1579,27 +1594,27 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data through virtual dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != buf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -1608,46 +1623,46 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data through virtual dataset */
if (H5Dwrite(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcdset and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDONLY, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "src_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data directly from source dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != buf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
/*
@@ -1656,70 +1671,70 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[1] = 13;
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select all in source space (should not be necessary, but just to be sure)
*/
if (H5Sselect_all(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 13;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".",
"%%src_dset1", srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".",
"src_dset2%%", srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset dims */
dims[1] = 26;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "%src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2%", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -1728,22 +1743,22 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data directly to source datasets */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -1751,27 +1766,27 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data through virtual dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != buf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -1780,40 +1795,40 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data through virtual dataset */
if (H5Dwrite(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "%src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2%", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data directly from source datasets */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dread(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != buf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Test H5Ocopy() to same file */
/* Copy virtual dataset */
if (H5Ocopy(vfile, "v_dset", vfile, "v_dset2", H5P_DEFAULT, H5P_DEFAULT) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close v_dset */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
/* Adjust write buffer */
@@ -1823,22 +1838,22 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data directly to source datasets */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -1846,36 +1861,36 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Open v_dset2 */
if ((vdset = H5Dopen2(vfile, "v_dset2", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through copied virtual dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != buf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "%src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2%", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Only copy to a different file if the source datasets are in a different
@@ -1883,16 +1898,16 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
if (config & TEST_IO_DIFFERENT_FILE) {
/* Close v_dset2 */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
/* Create file to copy virtual dataset to */
if ((vfile2 = H5Fcreate(vfilename2, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Copy virtual dataset */
if (H5Ocopy(vfile, "v_dset", vfile2, "v_dset3", H5P_DEFAULT, H5P_DEFAULT) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -1901,22 +1916,22 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data directly to source datasets */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -1924,66 +1939,66 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen copied virtual file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile2) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile2 = -1;
if ((vfile2 = H5Fopen(vfilename2, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Open v_dset3 */
if ((vdset = H5Dopen2(vfile2, "v_dset3", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through copied virtual dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != buf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDONLY, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "%src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2%", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
}
/* Close */
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (vfile2 >= 0 && H5Fclose(vfile2) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile2 = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
/*
@@ -1991,71 +2006,71 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[1] = 13;
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select all in source space (should not be necessary, but just to be sure)
*/
if (H5Sselect_all(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
start[0] = 0;
start[1] = 3;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mappings */
offset[1] = -3;
if (H5Soffset_simple(vspace[0], offset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".",
"%%src_dset1", srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
offset[1] = 10;
if (H5Soffset_simple(vspace[0], offset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".",
"src_dset2%%", srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset dims */
dims[1] = 26;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "%src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2%", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2065,27 +2080,27 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data directly to source datasets */
offset[1] = -3;
if (H5Soffset_simple(vspace[0], offset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
offset[1] = 10;
if (H5Soffset_simple(vspace[0], offset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -2093,27 +2108,27 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data through virtual dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != buf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2122,59 +2137,59 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data through virtual dataset */
if (H5Dwrite(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDONLY, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "%src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2%", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data directly from source datasets */
HDmemset(rbuf[0], 0, sizeof(rbuf));
offset[1] = -3;
if (H5Soffset_simple(vspace[0], offset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dread(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
offset[1] = 10;
if (H5Soffset_simple(vspace[0], offset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dread(srcdset[1], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != buf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
/*
@@ -2183,70 +2198,70 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[1] = 13;
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select all in source space (should not be necessary, but just to be sure)
*/
if (H5Sselect_all(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 13;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilenamepct_map : ".",
"src_dset1", srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilenamepct_map : ".",
"src_dset2", srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset dims */
dims[1] = 26;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilenamepct, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2255,22 +2270,22 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data directly to source datasets */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -2278,38 +2293,38 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read first source dataset through virtual dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(vdset, H5T_NATIVE_INT, vspace[0], vspace[0], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != (j < (int)(sizeof(buf[0]) / sizeof(buf[0][0]) / 2) ? buf[i][j] : 0))
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read second source dataset through virtual dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(vdset, H5T_NATIVE_INT, vspace[1], vspace[1], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != (j < (int)(sizeof(buf[0]) / sizeof(buf[0][0]) / 2) ? 0 : buf[i][j]))
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2318,7 +2333,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write first source dataset through virtual dataset */
if (H5Dwrite(vdset, H5T_NATIVE_INT, vspace[0], vspace[0], H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2327,25 +2342,25 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write second source dataset through virtual dataset */
if (H5Dwrite(vdset, H5T_NATIVE_INT, vspace[1], vspace[1], H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilenamepct, H5F_ACC_RDONLY, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data directly from source datasets */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dread(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2353,32 +2368,32 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
if (rbuf[i][j] != (j < (int)(sizeof(buf[0]) / sizeof(buf[0][0]) / 2)
? (buf[i][j] - (int)(sizeof(buf) / sizeof(buf[0][0])))
: buf[i][j]))
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
/*
@@ -2386,19 +2401,19 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspaces */
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcspace[1] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in source space */
start[0] = 0;
@@ -2406,10 +2421,10 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 10;
count[1] = 13;
if (H5Sselect_hyperslab(srcspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 13;
if (H5Sselect_hyperslab(srcspace[1], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
start[0] = 0;
@@ -2417,45 +2432,45 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 5;
count[1] = 26;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 5;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2",
srcspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2", H5T_NATIVE_INT, srcspace[1], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2465,7 +2480,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data directly to source datasets */
/* Write first dataset */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update evbuf */
for (i = 0; i < 5; i++) {
@@ -2482,7 +2497,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write second dataset */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update evbuf */
for (i = 0; i < 5; i++) {
@@ -2495,15 +2510,15 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -2511,15 +2526,15 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data through virtual dataset by hyperslab */
@@ -2528,7 +2543,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Read first slice */
if (H5Dread(vdset, H5T_NATIVE_INT, vspace[0], srcspace[0], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++) {
@@ -2540,7 +2555,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Read second slice */
if (H5Dread(vdset, H5T_NATIVE_INT, vspace[1], srcspace[1], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++) {
@@ -2554,7 +2569,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2564,7 +2579,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data through virtual dataset */
/* Write first slice */
if (H5Dwrite(vdset, H5T_NATIVE_INT, vspace[0], srcspace[0], H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update evbuf */
for (i = 0; i < 5; i++) {
@@ -2581,7 +2596,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write second slice */
if (H5Dwrite(vdset, H5T_NATIVE_INT, vspace[1], srcspace[1], H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update evbuf */
for (i = 0; i < 5; i++) {
@@ -2595,11 +2610,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDONLY, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data directly from source datasets */
@@ -2608,7 +2623,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Read first dataset */
if (H5Dread(srcdset[0], H5T_NATIVE_INT, srcspace[0], srcspace[0], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++) {
@@ -2620,7 +2635,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Read second dataset */
if (H5Dread(srcdset[1], H5T_NATIVE_INT, srcspace[1], srcspace[1], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++) {
@@ -2634,35 +2649,35 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(srcspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[1] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
/*
@@ -2671,25 +2686,25 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create memory dataspace */
if ((memspace = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
dims[1] = 52;
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace and file space for second operation (srcspace[1])
*/
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcspace[1] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset dims */
dims[1] = 26;
@@ -2705,10 +2720,10 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 10;
block[1] = 1;
if (H5Sselect_hyperslab(srcspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 1;
if (H5Sselect_hyperslab(srcspace[1], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs (checkerboard) in virtual spaces */
start[0] = 0;
@@ -2720,53 +2735,53 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 1;
block[1] = 1;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 1;
start[1] = 1;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_OR, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 0;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 1;
start[1] = 0;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_OR, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2776,7 +2791,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data directly to source datasets */
/* Write first dataset */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i += 2)
@@ -2790,7 +2805,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write second dataset */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 1; i < 10; i += 2)
@@ -2800,15 +2815,15 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -2816,15 +2831,15 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data through virtual dataset by hyperslab */
@@ -2833,17 +2848,17 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Read first stripe pattern */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read second stripe pattern */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, srcspace[1], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i += 2)
@@ -2856,7 +2871,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2866,7 +2881,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data through virtual dataset */
/* Write first slice */
if (H5Dwrite(vdset, H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i += 2)
@@ -2880,7 +2895,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write second slice */
if (H5Dwrite(vdset, H5T_NATIVE_INT, memspace, srcspace[1], H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 1; i < 10; i += 2)
@@ -2891,11 +2906,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDONLY, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data directly from source datasets */
@@ -2904,13 +2919,13 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Read first dataset */
if (H5Dread(srcdset[0], H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i += 2)
@@ -2921,44 +2936,44 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Read second dataset */
if (H5Dread(srcdset[1], H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(srcspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[1] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
if (H5Sclose(memspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
memspace = -1;
/*
@@ -2967,11 +2982,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create memory dataspace */
if ((memspace = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
dims[0] = 3;
@@ -2979,18 +2994,18 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
dims[2] = 3;
dims[3] = 3;
if ((vspace[0] = H5Screate_simple(4, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(4, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspaces */
dims[0] = 2;
dims[1] = 4;
dims[2] = 4;
if ((srcspace[0] = H5Screate_simple(3, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcspace[1] = H5Screate_simple(3, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset dims */
dims[0] = 10;
@@ -3010,10 +3025,10 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[1] = 1;
block[2] = 4;
if (H5Sselect_hyperslab(srcspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 1;
if (H5Sselect_hyperslab(srcspace[1], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs (corners) in first virtual space */
start[0] = 0;
@@ -3033,7 +3048,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[2] = 1;
block[3] = 1;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs ("+" pattern) in second virtual space */
start[0] = 1;
@@ -3053,61 +3068,61 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[2] = 1;
block[3] = 1;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 0;
start[2] = 1;
count[1] = 2;
count[2] = 1;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_OR, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 0;
start[1] = 1;
count[0] = 2;
count[1] = 1;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_OR, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 1;
count[0] = 1;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_OR, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 0;
start[3] = 1;
count[1] = 2;
count[3] = 1;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_OR, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1",
srcspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source dataset */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -3120,21 +3135,21 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 2;
count[1] = 16;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write data directly to source dataset */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcdset and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -3142,15 +3157,15 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data through virtual dataset */
@@ -3163,7 +3178,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 9;
count[1] = 3;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset by hyperslab */
/* Reset rbuf */
@@ -3179,11 +3194,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[2] = 1;
count[3] = 3;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read first stripe pattern */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
HDmemset(erbuf, 0, sizeof(erbuf));
@@ -3205,7 +3220,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset rbuf */
HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -3220,7 +3235,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[2] = 1;
count[3] = 3;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslab in memory space */
start[0] = 0;
@@ -3228,11 +3243,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 9;
count[1] = 3;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read second stripe pattern */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 9; i++)
@@ -3256,10 +3271,10 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if ((j >= 3) && (j < 6)) {
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset rbuf */
HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -3274,7 +3289,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[2] = 1;
count[3] = 3;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslab in memory space */
start[0] = 0;
@@ -3282,11 +3297,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 9;
count[1] = 3;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read third stripe pattern */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 9; i++)
@@ -3308,10 +3323,10 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if ((j >= 6) && (j < 9)) {
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Now read entire VDS */
/* Set memory space extent to 9x9, select all in order to reach part of the
@@ -3319,19 +3334,19 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
dims[0] = 9;
dims[1] = 9;
if (H5Sset_extent_simple(memspace, 2, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sselect_all(memspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read third stripe pattern */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf99[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(rbuf99) / sizeof(rbuf99[0])); i++)
for (j = 0; j < (int)(sizeof(rbuf99[0]) / sizeof(rbuf99[0][0])); j++)
if (rbuf99[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -3353,7 +3368,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[2] = 1;
count[3] = 2;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 1;
start[1] = 1;
start[2] = 0;
@@ -3367,24 +3382,24 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[2] = 1;
count[3] = 2;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_OR, start, stride, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset extent of memspace, select hyperslab */
dims[0] = 10;
dims[1] = 26;
if (H5Sset_extent_simple(memspace, 2, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 0;
start[1] = 0;
count[0] = 1;
count[1] = 10;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write data through virtual dataset by hyperslab */
/* Write first stripe pattern */
if (H5Dwrite(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
HDmemset(erbuf, 0, sizeof(erbuf));
@@ -3418,7 +3433,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[2] = 1;
count[3] = 2;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 1;
start[1] = 0;
start[2] = 1;
@@ -3432,7 +3447,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[2] = 1;
count[3] = 3;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_OR, start, stride, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslab in memory space */
start[0] = 0;
@@ -3440,11 +3455,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 1;
count[1] = 12;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write second slice */
if (H5Dwrite(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
erbuf[0][4] = buf[0][0];
@@ -3479,7 +3494,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[2] = 1;
count[3] = 2;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 1;
start[1] = 1;
start[2] = 2;
@@ -3493,7 +3508,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[2] = 1;
count[3] = 2;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_OR, start, stride, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslab in memory space */
start[0] = 0;
@@ -3501,11 +3516,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 1;
count[1] = 10;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write third slice */
if (H5Dwrite(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
erbuf[0][2] = buf[0][0];
@@ -3523,9 +3538,9 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDONLY, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read data directly from source dataset */
@@ -3535,61 +3550,61 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 2;
count[1] = 16;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset rbuf */
HDmemset(rbuf[0], 0, sizeof(rbuf));
/* Read dataset */
if (H5Dread(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Now try writing to whole VDS (should fail due to unmapped elements) */
count[0] = 9;
count[1] = 9;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
H5E_BEGIN_TRY
{
ret = H5Dwrite(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]);
}
H5E_END_TRY
if (ret >= 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(srcspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[1] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
if (H5Sclose(memspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
memspace = -1;
/*
@@ -3598,46 +3613,46 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create memory dataspace */
if ((memspace = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
dims[0] = 8;
dims[1] = 15;
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[0] = 4;
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select all in source space (should not be necessary, but just to be sure)
*/
if (H5Sselect_all(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 4;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset dims */
dims[0] = 10;
@@ -3645,30 +3660,30 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset erbuf */
HDmemset(erbuf[0], 0, sizeof(rbuf));
@@ -3684,11 +3699,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 4;
count[1] = 15;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write data directly to first source dataset */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
u = 0;
@@ -3706,11 +3721,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory */
start[0] = 4;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write data directly to second source dataset */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 4; i < 6; i++)
@@ -3726,28 +3741,28 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Select hyperslab in memory */
@@ -3760,7 +3775,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 1;
block[1] = 1;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslab in file */
start[0] = 2;
@@ -3768,48 +3783,48 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 4;
count[1] = 15;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
if (H5Sclose(memspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
memspace = -1;
/*
@@ -3818,56 +3833,56 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create memory dataspace */
dims[1] = 13;
dims[2] = 2;
if ((memspace = H5Screate_simple(3, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
dims[0] = 6;
dims[1] = 10;
if ((vspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[2] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[0] = 2;
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select all in source space (should not be necessary, but just to be sure)
*/
if (H5Sselect_all(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 2;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 4;
if (H5Sselect_hyperslab(vspace[2], H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[2], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset3",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset dims */
dims[0] = 10;
@@ -3875,33 +3890,33 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[2] = H5Dcreate2(srcfile[0], "src_dset3", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset erbuf */
HDmemset(erbuf[0], 0, sizeof(rbuf));
@@ -3919,11 +3934,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[1] = 5;
count[2] = 2;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write data directly to first source dataset */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
u = 0;
@@ -3942,11 +3957,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory */
start[0] = 2;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write data directly to second source dataset */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 2; i < 4; i++)
@@ -3963,11 +3978,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory */
start[0] = 4;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write data directly to third source dataset */
if (H5Dwrite(srcdset[2], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 4; i < 6; i++)
@@ -3984,31 +3999,31 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Dclose(srcdset[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[2] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Select hyperslab in memory */
@@ -4025,54 +4040,54 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[1] = 3;
block[2] = 2;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Dclose(srcdset[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[2] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
if (H5Sclose(vspace[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[2] = -1;
if (H5Sclose(memspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
memspace = -1;
/*
@@ -4081,30 +4096,30 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create memory dataspace */
if ((memspace = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
dims[0] = 10;
dims[1] = 9;
dims[2] = 6;
if ((vspace[0] = H5Screate_simple(3, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(3, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[1] = 12;
if ((srcspace[0] = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select all in source space (should not be necessary, but just to be sure)
*/
if (H5Sselect_all(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
start[0] = 0;
@@ -4120,18 +4135,18 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[1] = 1;
block[2] = 1;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[2] = 1;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reset dims */
dims[0] = 10;
@@ -4139,30 +4154,30 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Initialize erbuf */
HDmemset(erbuf[0], 0, sizeof(rbuf));
@@ -4183,11 +4198,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 10;
count[1] = 12;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write data directly to first source dataset */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
u = 0;
@@ -4208,11 +4223,11 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory */
start[1] = 8;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write data directly to second source dataset */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
u = 0;
@@ -4233,28 +4248,28 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Select hyperslab in memory */
@@ -4267,7 +4282,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 10;
block[1] = 2;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslab in file */
start[0] = 0;
@@ -4277,53 +4292,53 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[1] = 4;
count[2] = 2;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
HDmemset(rbuf[0], 0, sizeof(rbuf));
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
for (j = 0; j < (int)(sizeof(buf[0]) / sizeof(buf[0][0])); j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
if (H5Sclose(memspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
memspace = -1;
/* Close */
if (H5Pclose(dcpl) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dcpl = -1;
HDfree(srcfilename);
@@ -4406,7 +4421,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
H5D_vds_view_t virtual_view; /* Virtual view property */
int i, j;
- TESTING_2_SUPPRESSED("virtual dataset I/O with unlimited selections")
+ TESTING_2_SUPPRESSED("virtual dataset I/O with unlimited selections");
h5_fixname(FILENAME[0], vds_fapl, vfilename, sizeof vfilename);
h5_fixname(FILENAME[2], src_fapl, srcfilename, sizeof srcfilename);
@@ -4414,44 +4429,44 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Create DCPLs */
if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Set fill value */
if (H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fill) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Set chunk dimensions */
if (H5Pset_chunk(srcdcpl, 2, cdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create DAPL */
if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create memory space */
if ((memspace = H5Screate_simple(2, mdims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/*
* Test 1: 2 Source datasets, single unlimited hyperslab virtual mappings
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[0] = 5;
mdims[0] = 5;
if ((srcspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
mdims[0] = 10;
/* Select hyperslab in source space */
@@ -4460,49 +4475,49 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 5;
count[1] = H5S_UNLIMITED;
if (H5Sselect_hyperslab(srcspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 5;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, srcdcpl,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, srcdcpl,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -4519,11 +4534,11 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
count[1] = 10;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write first dataset */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++)
@@ -4537,7 +4552,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write second dataset */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++)
@@ -4547,15 +4562,15 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -4563,40 +4578,40 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -4605,74 +4620,74 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
start[0] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Test H5Pget_virtual_view() */
if (H5Pget_virtual_view(dapl, &virtual_view) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (virtual_view != H5D_VDS_LAST_AVAILABLE)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_FIRST_MISSING) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Test H5Pget_virtual_view() */
if (H5Pget_virtual_view(dapl, &virtual_view) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (virtual_view != H5D_VDS_FIRST_MISSING)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -4680,33 +4695,33 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcdset[0] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Extend srcdset[0] */
dims[0] = 5;
dims[1] = 15;
if (H5Dset_extent(srcdset[0], dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -4716,26 +4731,26 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to new area of srcdset */
count[1] = 5;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((filespace = H5Dget_space(srcdset[0])) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 10;
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcdset[0] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -4743,42 +4758,42 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions. Note that since we are using
* H5D_VDS_FIRST_MISSING and we only extended one source dataset the
* dimensions will not have changed. */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -4787,38 +4802,38 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_LAST_AVAILABLE) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf to reflect new data that is now visible due to the change to
* H5D_VDS_LAST_AVAILABLE */
@@ -4828,27 +4843,27 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 15)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -4857,37 +4872,37 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Extend srcdset[1] */
dims[0] = 5;
dims[1] = 20;
if (H5Dset_extent(srcdset[1], dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -4897,16 +4912,16 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to new area of srcdset */
count[1] = 10;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((filespace = H5Dget_space(srcdset[1])) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 10;
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++)
@@ -4916,12 +4931,12 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -4929,40 +4944,40 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -4971,17 +4986,17 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Now just read middle 2 rows */
HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -4989,9 +5004,9 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 2;
count[1] = 20;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, memspace, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data - algorithmically check for only 2 middle rows being
* read so we don't have to wipe out erbuf and then restore it afterwards */
@@ -4999,24 +5014,24 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
for (j = 0; j < (int)mdims[1]; j++)
if ((i == 4) || (i == 5)) {
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Now test reopening virtual dataset without calling H5Dget_space, if
* REOPEN_VIRT flag set */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5026,23 +5041,23 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Now try setting extent manually */
/* Shrink to 18 */
dims[1] = 18;
if (H5Dset_extent(vdset, dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5052,27 +5067,27 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Shrink to 15 */
dims[1] = 15;
if (H5Dset_extent(vdset, dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5082,63 +5097,63 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
}
/* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_FIRST_MISSING) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 15)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5148,36 +5163,36 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Now test reopening virtual dataset without calling H5Dget_space, if
* REOPEN_VIRT flag set */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5186,28 +5201,28 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Now try setting extent manually */
/* Grow to 18 */
dims[1] = 18;
if (H5Dset_extent(vdset, dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5217,27 +5232,27 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Grow to 20 */
dims[1] = 20;
if (H5Dset_extent(vdset, dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5247,50 +5262,50 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
else if (!(config & TEST_IO_DIFFERENT_FILE)) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
/*
@@ -5298,21 +5313,21 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
dims[0] = 10;
dims[1] = 10;
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[1] = 5;
mdims[1] = 10;
if ((srcspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
mdims[1] = 20;
/* Select hyperslab in source space */
@@ -5321,7 +5336,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 10;
count[1] = H5S_UNLIMITED;
if (H5Sselect_hyperslab(srcspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
stride[0] = 1;
@@ -5331,46 +5346,46 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 10;
block[1] = 1;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 1;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 0;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, srcdcpl,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, srcdcpl,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -5387,11 +5402,11 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 10;
count[1] = 5;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write first dataset */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -5405,7 +5420,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write second dataset */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -5415,15 +5430,15 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -5431,40 +5446,40 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5472,62 +5487,62 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_FIRST_MISSING) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5535,32 +5550,32 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcdset[0] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Extend srcdset[0] */
dims[1] = 7;
if (H5Dset_extent(srcdset[0], dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -5570,17 +5585,17 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to new area of srcdset */
count[1] = 2;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((filespace = H5Dget_space(srcdset[0])) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 5;
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 0;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf to reflect only new data that is now visible under
* H5D_VDS_FIRST_MISSING (first slice) */
@@ -5590,12 +5605,12 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[0] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -5603,42 +5618,42 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions. Note that since we are using
* H5D_VDS_FIRST_MISSING and we only extended one source dataset the
* dimension will only have changed to add one more slice. */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 11)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5646,38 +5661,38 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_LAST_AVAILABLE) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf to reflect new data that is now visible due to the change to
* H5D_VDS_LAST_AVAILABLE (second new slice) */
@@ -5686,27 +5701,27 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 13)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5714,36 +5729,36 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Extend srcdset[1] */
dims[1] = 10;
if (H5Dset_extent(srcdset[1], dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -5753,17 +5768,17 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to new area of srcdset */
count[1] = 5;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((filespace = H5Dget_space(srcdset[1])) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 5;
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 0;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -5773,12 +5788,12 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -5786,40 +5801,40 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5827,17 +5842,17 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Now just read middle 2 rows */
HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -5845,10 +5860,10 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 2;
count[1] = 20;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 0;
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, memspace, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data - algorithmically check for only 2 middle rows being
* read so we don't have to wipe out erbuf and then restore it afterwards */
@@ -5856,26 +5871,26 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
for (j = 0; j < (int)mdims[1]; j++)
if ((i == 4) || (i == 5)) {
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_FIRST_MISSING) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf to reflect new data that is no longer visible due to the
* change to H5D_VDS_FIRST_MISSING */
@@ -5885,27 +5900,27 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 14)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -5913,54 +5928,54 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
else if (!(config & TEST_IO_DIFFERENT_FILE)) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
/*
@@ -5968,31 +5983,31 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
dims[0] = 10;
dims[1] = 10;
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[2] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspaces */
dims[1] = 4;
mdims[1] = 8;
if ((srcspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dims[1] = 4;
mdims[1] = 6;
if ((srcspace[1] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dims[1] = 2;
mdims[1] = 6;
if ((srcspace[2] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
mdims[1] = 20;
/* Select hyperslab in source spaces */
@@ -6001,11 +6016,11 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 10;
count[1] = H5S_UNLIMITED;
if (H5Sselect_hyperslab(srcspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sselect_hyperslab(srcspace[1], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sselect_hyperslab(srcspace[2], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
stride[0] = 1;
@@ -6015,55 +6030,55 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 10;
block[1] = 2;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 2;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 4;
if (H5Sselect_hyperslab(vspace[2], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 0;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2",
srcspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[2], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset3",
srcspace[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, srcdcpl,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2", H5T_NATIVE_INT, srcspace[1], H5P_DEFAULT, srcdcpl,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[2] = H5Dcreate2(srcfile[0], "src_dset3", H5T_NATIVE_INT, srcspace[2], H5P_DEFAULT, srcdcpl,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -6080,11 +6095,11 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 10;
count[1] = 4;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write first dataset */
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -6100,7 +6115,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write second dataset */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -6118,11 +6133,11 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 10;
count[1] = 2;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write third dataset */
if (H5Dwrite(srcdset[2], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++) {
@@ -6133,18 +6148,18 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Dclose(srcdset[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[2] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -6152,40 +6167,40 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -6193,62 +6208,62 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_FIRST_MISSING) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -6256,32 +6271,32 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcdset[0] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Extend srcdset[0] */
dims[1] = 7;
if (H5Dset_extent(srcdset[0], dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -6291,27 +6306,27 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to new area of srcdset */
count[1] = 3;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((filespace = H5Dget_space(srcdset[0])) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 4;
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 0;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcdset[0] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -6319,41 +6334,41 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions. Note that since we are using
* H5D_VDS_FIRST_MISSING the size will not have changed. */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -6361,38 +6376,38 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_LAST_AVAILABLE) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf to reflect new data that is now visible due to the change to
* H5D_VDS_LAST_AVAILABLE */
@@ -6404,27 +6419,27 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 19)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -6432,36 +6447,36 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcdset[2] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[2] = H5Dopen2(srcfile[0], "src_dset3", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Extend srcdset[2] */
dims[1] = 5;
if (H5Dset_extent(srcdset[2], dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -6471,17 +6486,17 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to new area of srcdset */
count[1] = 3;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((filespace = H5Dget_space(srcdset[2])) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 2;
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 0;
if (H5Dwrite(srcdset[2], H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++) {
@@ -6493,12 +6508,12 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[2] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[2] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -6506,41 +6521,41 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions. Note that the dimensions will not have
* changed. */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 19)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -6548,62 +6563,62 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_FIRST_MISSING) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 14)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -6611,36 +6626,36 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Extend srcdset[1] */
dims[1] = 6;
if (H5Dset_extent(srcdset[1], dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -6650,17 +6665,17 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to new area of srcdset */
count[1] = 2;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((filespace = H5Dget_space(srcdset[1])) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 4;
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 0;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++) {
@@ -6671,12 +6686,12 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -6684,40 +6699,40 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 17)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -6725,58 +6740,58 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_LAST_AVAILABLE) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 19)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -6784,21 +6799,21 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Now just read middle 2 rows */
@@ -6807,16 +6822,16 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 2;
count[1] = 19;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 0;
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data - algorithmically check for only 2 middle rows being
* read */
@@ -6824,55 +6839,55 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
for (j = 0; j < (int)mdims[1]; j++)
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if ((i == 4) || (i == 5)) {
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Dclose(srcdset[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[2] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
else if (!(config & TEST_IO_DIFFERENT_FILE)) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(srcspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[1] = -1;
if (H5Sclose(srcspace[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[2] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
/*
@@ -6880,23 +6895,23 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspaces */
dims[0] = 5;
dims[1] = 0;
mdims[0] = 5;
if ((srcspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dims[1] = 5;
if ((srcspace[1] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
mdims[0] = 10;
/* Select hyperslab in source spaces */
@@ -6905,53 +6920,53 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 5;
count[1] = H5S_UNLIMITED;
if (H5Sselect_hyperslab(srcspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sselect_hyperslab(srcspace[1], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
start[1] = 10;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 5;
start[1] = 0;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1",
srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2",
srcspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, srcdcpl,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset2", H5T_NATIVE_INT, srcspace[1], H5P_DEFAULT, srcdcpl,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -6970,11 +6985,11 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 5;
count[1] = 5;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Write second dataset */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++)
@@ -6984,15 +6999,15 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -7000,40 +7015,40 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 5)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -7043,62 +7058,62 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_FIRST_MISSING) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 5)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -7106,33 +7121,33 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcdset[0] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Extend srcdset[0] */
dims[0] = 5;
dims[1] = 5;
if (H5Dset_extent(srcdset[0], dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -7145,9 +7160,9 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
count[0] = 5;
count[1] = 5;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++)
@@ -7157,12 +7172,12 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[0] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -7170,40 +7185,40 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 5)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -7213,62 +7228,62 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_LAST_AVAILABLE) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 15)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -7278,71 +7293,71 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
else if (!(config & TEST_IO_DIFFERENT_FILE)) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[0] = -1;
if (H5Sclose(srcspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[1] = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
/* Close */
if (H5Pclose(dcpl) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dcpl = -1;
if (H5Pclose(srcdcpl) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dcpl = -1;
if (H5Pclose(dapl) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dapl = -1;
if (H5Sclose(memspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
memspace = -1;
PASSED_SUPPRESSED();
@@ -7419,7 +7434,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
hsize_t gap_size; /* Gap size property */
int i, j;
- TESTING_2_SUPPRESSED("virtual dataset I/O with printf source")
+ TESTING_2_SUPPRESSED("virtual dataset I/O with printf source");
if ((srcfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
TEST_ERROR_SUPPRESSED;
@@ -7449,35 +7464,35 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Create DCPL */
if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Set fill value */
if (H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fill) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create DAPL */
if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create memory space */
if ((memspace = H5Screate_simple(2, mdims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/*
* Test 1: 1 Source dataset mapping, 10x5 blocks
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspace */
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[1] = 5;
if ((srcspace = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual space */
stride[0] = 1;
@@ -7487,91 +7502,91 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 10;
block[1] = 5;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset%b",
srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 2 source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset0", H5T_NATIVE_INT, srcspace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -7585,9 +7600,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[0] */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -7601,7 +7616,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[1] */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -7611,15 +7626,15 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -7627,40 +7642,40 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -7668,32 +7683,32 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcfile if config option specified */
if ((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 3rd source dataset */
if ((srcdset[2] = H5Dcreate2(srcfile[0], "src_dset2", H5T_NATIVE_INT, srcspace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -7702,9 +7717,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[2] */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[2], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -7714,12 +7729,12 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[2] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[2] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -7727,36 +7742,36 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 15)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -7764,21 +7779,21 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Now try with different selections */
@@ -7790,25 +7805,25 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslab in file space */
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if ((j < (int)start[1]) || (j >= (int)(start[1] + count[1]))) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
}
start[1] = 0;
@@ -7816,11 +7831,11 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Now try writing through VDS */
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslab in file space */
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -7829,83 +7844,83 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write data through VDS */
if (H5Dwrite(vdset, H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dopen2(srcfile[0], "src_dset0", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[2] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Read srcdset[0] */
count[0] = 10;
count[1] = 5;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dread(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < 10; i++)
for (j = 0; j < 5; j++)
if (rbuf[i][j] != buf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read srcdset[1] */
if (H5Dread(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < 10; i++)
for (j = 0; j < 5; j++)
if (rbuf[i][j] != buf[i][j + 5])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read srcdset[2] */
if (H5Dread(srcdset[2], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < 10; i++)
for (j = 0; j < 5; j++)
if (rbuf[i][j] != buf[i][j + 10])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Dclose(srcdset[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[2] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
/*
@@ -7914,16 +7929,16 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[1] = 1;
if ((srcspace = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual space */
stride[0] = 1;
@@ -7933,104 +7948,104 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 10;
block[1] = 1;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilenamepct_map : ".",
"src_dset%b", srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilenamepct, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilenamepct, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source datasets in a pattern with increasing gaps:
* XX-X--X---X----X */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset0", H5T_NATIVE_INT, srcspace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[2] = H5Dcreate2(srcfile[0], "src_dset3", H5T_NATIVE_INT, srcspace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[3] = H5Dcreate2(srcfile[0], "src_dset6", H5T_NATIVE_INT, srcspace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[4] = H5Dcreate2(srcfile[0], "src_dset10", H5T_NATIVE_INT, srcspace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[5] = H5Dcreate2(srcfile[0], "src_dset15", H5T_NATIVE_INT, srcspace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -8044,9 +8059,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[0] */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -8059,7 +8074,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[1] */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -8072,7 +8087,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[2] */
if (H5Dwrite(srcdset[2], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -8085,7 +8100,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[3] */
if (H5Dwrite(srcdset[3], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -8098,7 +8113,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[4] */
if (H5Dwrite(srcdset[4], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -8111,7 +8126,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[5] */
if (H5Dwrite(srcdset[5], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -8121,13 +8136,13 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
if (config & TEST_IO_CLOSE_SRC) {
for (i = 0; i < 6; i++) {
if (H5Dclose(srcdset[i]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[i] = -1;
}
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -8135,40 +8150,40 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -8176,74 +8191,74 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Test H5Pget_virtual_printf_gap() */
if (H5Pget_virtual_printf_gap(dapl, &gap_size) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (gap_size != (hsize_t)0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close VDS and reopen with printf gap set to 1, reopen file as well if
* config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_printf_gap(dapl, (hsize_t)1) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Test H5Pget_virtual_printf_gap() */
if (H5Pget_virtual_printf_gap(dapl, &gap_size) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (gap_size != (hsize_t)1)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 4)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -8251,68 +8266,68 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with printf gap set to 2, reopen file as well if
* config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_printf_gap(dapl, (hsize_t)2) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Test H5Pget_virtual_printf_gap() */
if (H5Pget_virtual_printf_gap(dapl, &gap_size) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (gap_size != (hsize_t)2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 7)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -8320,68 +8335,68 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with printf gap set to 3, reopen file as well if
* config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_printf_gap(dapl, (hsize_t)3) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Test H5Pget_virtual_printf_gap() */
if (H5Pget_virtual_printf_gap(dapl, &gap_size) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (gap_size != (hsize_t)3)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 11)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -8389,68 +8404,68 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with printf gap set to 4, reopen file as well if
* config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_printf_gap(dapl, (hsize_t)4) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Test H5Pget_virtual_printf_gap() */
if (H5Pget_virtual_printf_gap(dapl, &gap_size) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (gap_size != (hsize_t)4)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 16)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -8458,62 +8473,62 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_FIRST_MISSING) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -8521,56 +8536,56 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reset dapl */
if (H5Pset_virtual_printf_gap(dapl, (hsize_t)0) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_LAST_AVAILABLE) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
for (i = 0; i < 6; i++) {
if (H5Dclose(srcdset[i]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[i] = -1;
}
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
else if (!(config & TEST_IO_DIFFERENT_FILE)) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
/* Next 2 tests are always run with a different source file, so only run if
@@ -8586,16 +8601,16 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[1] = 5;
if ((srcspace = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual space */
stride[0] = 1;
@@ -8605,66 +8620,66 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 10;
block[1] = 5;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[0], printf_srcfilename_map, "src_dset", srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 2 source files, one source dataset */
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcfile[1] = H5Fcreate(srcfilename2, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -8678,9 +8693,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[0] */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -8690,53 +8705,53 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset and srcfiles if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(srcfile[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[1] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 5)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -8744,32 +8759,32 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcfile[1] if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if ((srcfile[1] = H5Fopen(srcfilename2, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 2nd source dataset */
if ((srcdset[1] = H5Dcreate2(srcfile[1], "src_dset", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -8778,9 +8793,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[1] */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -8790,50 +8805,50 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[1] and srcfile[1] if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Fclose(srcfile[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[1] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -8841,49 +8856,49 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(srcfile[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[1] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
/*
@@ -8896,16 +8911,16 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[1] = 5;
if ((srcspace = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual space */
stride[0] = 1;
@@ -8915,66 +8930,66 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 10;
block[1] = 5;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[0], printf_srcfilename_map, "%%src%%_dset%%%b", srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 2 source files, one source dataset */
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[0] = H5Dcreate2(srcfile[0], "%src%_dset%0", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcfile[1] = H5Fcreate(srcfilename2, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -8988,9 +9003,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[0] */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -9000,53 +9015,53 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset and srcfiles if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(srcfile[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[1] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 5)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -9054,32 +9069,32 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcfile[1] if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if ((srcfile[1] = H5Fopen(srcfilename2, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 2nd source dataset */
if ((srcdset[1] = H5Dcreate2(srcfile[1], "%src%_dset%1", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -9088,9 +9103,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[1] */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -9100,50 +9115,50 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[1] and srcfile[1] if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Fclose(srcfile[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[1] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -9151,49 +9166,49 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
if (H5Fclose(srcfile[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[1] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
}
@@ -9203,26 +9218,26 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
dims[0] = 10;
dims[1] = 10;
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace (2 elements wide) */
dims[1] = 2;
if ((srcspace = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslab in source space */
count[0] = 10;
count[1] = 1;
if (H5Sselect_hyperslab(srcspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
stride[0] = 1;
@@ -9232,98 +9247,98 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 10;
block[1] = 1;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 1;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[1] = 0;
/* Add virtual layout mappings */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".",
"%bsrc_dset_a%b%%", srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".",
"src_dset_b%b%%%%", srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 2 source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "0src_dset_a0%", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset_b0%%", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -9339,9 +9354,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 10;
block[1] = 2;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -9354,7 +9369,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[1] */
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -9363,15 +9378,15 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -9379,40 +9394,40 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -9420,32 +9435,32 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcfile if config option specified */
if ((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 3rd source dataset */
if ((srcdset[2] = H5Dcreate2(srcfile[0], "src_dset_b1%%", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -9454,9 +9469,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[2] */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[2], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -9465,12 +9480,12 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[2] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[2] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -9478,40 +9493,40 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 4)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -9519,63 +9534,63 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_FIRST_MISSING) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions. Make sure that the 4th slice is no longer
* visible due to the change to H5D_VDS_FIRST_MISSING. */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -9583,32 +9598,32 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcfile if config option specified */
if ((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 4th source dataset */
if ((srcdset[3] = H5Dcreate2(srcfile[0], "2src_dset_a2%", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -9617,9 +9632,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[3] */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[3], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -9628,12 +9643,12 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[3] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[3]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[3] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -9641,40 +9656,40 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -9682,63 +9697,63 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_LAST_AVAILABLE) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions. Make sure that the 4th slice is now visible
* due to the change to H5D_VDS_LAST_AVAILABLE. */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 4)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -9746,63 +9761,63 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with printf_gap set to 1, reopen file as well if
* config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_printf_gap(dapl, (hsize_t)1) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions. Make sure that the 6th slice is now visible
* due to the change to printf_gap. */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 5)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -9810,59 +9825,59 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reset dapl */
if (H5Pset_virtual_printf_gap(dapl, (hsize_t)0) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_LAST_AVAILABLE) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
for (i = 0; i < 4; i++) {
if (H5Dclose(srcdset[i]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[i] = -1;
}
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
else if (!(config & TEST_IO_DIFFERENT_FILE)) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
/*
@@ -9870,25 +9885,25 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
dims[0] = 10;
dims[1] = 10;
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vspace[1] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace (1 dimensional) */
dims[0] = 50;
if ((srcspace = H5Screate_simple(1, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslab in source space */
count[0] = 25;
if (H5Sselect_hyperslab(srcspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual spaces */
stride[0] = 1;
@@ -9898,103 +9913,103 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 5;
block[1] = 5;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 5;
stride[1] = 10;
block[1] = 10;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 0;
/* Add virtual layout mappings (select ALL in source space for second
* mapping) */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".",
"src_dset_a%b", srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sselect_all(srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".",
"src_dset_b%b", srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 2 source datasets */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset_a0", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dcreate2(srcfile[0], "src_dset_b0", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -10010,12 +10025,12 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 5;
block[1] = 5;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
count[0] = 25;
if (H5Sselect_hyperslab(srcspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, srcspace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++)
@@ -10030,11 +10045,11 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[1] */
block[1] = 10;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sselect_all(srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, srcspace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++)
@@ -10044,15 +10059,15 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdsets and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -10060,40 +10075,40 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10101,63 +10116,63 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_FIRST_MISSING) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions. Make sure that the 4th slice is no longer
* visible due to the change to H5D_VDS_FIRST_MISSING. */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 5)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10165,32 +10180,32 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcfile if config option specified */
if ((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 3rd source dataset */
if ((srcdset[2] = H5Dcreate2(srcfile[0], "src_dset_a1", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -10200,11 +10215,11 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[2] */
block[1] = 5;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sselect_hyperslab(srcspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[2], H5T_NATIVE_INT, memspace, srcspace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++)
@@ -10214,12 +10229,12 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[2] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[2] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -10227,40 +10242,40 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10268,62 +10283,62 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_LAST_AVAILABLE) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions. There should be no change. */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10331,32 +10346,32 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcfile if config option specified */
if ((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
if ((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 4th source dataset */
if ((srcdset[3] = H5Dcreate2(srcfile[0], "src_dset_a2", H5T_NATIVE_INT, srcspace, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -10365,9 +10380,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[3] */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[3], H5T_NATIVE_INT, memspace, srcspace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 5; i++)
@@ -10377,12 +10392,12 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[3] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[3]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[3] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -10390,40 +10405,40 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 15)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10431,36 +10446,36 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Now test reopening virtual dataset without calling H5Dget_space, if
* REOPEN_VIRT flag set */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10468,28 +10483,28 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Now try setting extent manually */
/* Shrink to 12 */
dims[1] = 12;
if (H5Dset_extent(vdset, dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10497,27 +10512,27 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Shrink to 10 */
dims[1] = 12;
if (H5Dset_extent(vdset, dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10525,63 +10540,63 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
}
/* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
* as well if config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_view(dapl, H5D_VDS_FIRST_MISSING) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10589,36 +10604,36 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Now test reopening virtual dataset without calling H5Dget_space, if
* REOPEN_VIRT flag set */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10626,28 +10641,28 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Now try setting extent manually */
/* Grow to 12 */
dims[1] = 12;
if (H5Dset_extent(vdset, dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10655,27 +10670,27 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Grow to 15 */
dims[1] = 15;
if (H5Dset_extent(vdset, dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10683,58 +10698,58 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
}
/* Reset dapl */
if (H5Pset_virtual_view(dapl, H5D_VDS_LAST_AVAILABLE) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
for (i = 0; i < 4; i++) {
if (H5Dclose(srcdset[i]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[i] = -1;
}
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
else if (!(config & TEST_IO_DIFFERENT_FILE)) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
if (H5Sclose(vspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[1] = -1;
/*
@@ -10743,16 +10758,16 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
*/
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual dataspaces */
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source dataspace */
dims[1] = 1;
if ((srcspace = H5Screate_simple(2, dims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Select hyperslabs in virtual space */
stride[0] = 1;
@@ -10762,88 +10777,88 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 10;
block[1] = 1;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Add virtual layout mapping */
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilenamepct_map : ".",
"src_dset%b", srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile[0] = H5Fcreate(srcfilenamepct, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile[0] = vfile;
if (H5Iinc_ref(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile[0] = H5Fopen(srcfilenamepct, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create 1 source dataset */
if ((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset0", H5T_NATIVE_INT, srcspace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -10857,9 +10872,9 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Write to srcdset[0] */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 10; i++)
@@ -10868,12 +10883,12 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[0] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
}
@@ -10881,40 +10896,40 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 1)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10922,62 +10937,62 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Close VDS and reopen with printf gap set to 127, reopen file as well if
* config option specified */
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual_printf_gap(dapl, (hsize_t)127) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
if ((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 1)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 20)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -10985,63 +11000,63 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Select hyperslab in memory space */
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reset dapl */
if (H5Pset_virtual_printf_gap(dapl, (hsize_t)0) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
if (H5Dclose(srcdset[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[0] = -1;
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
else if (!(config & TEST_IO_DIFFERENT_FILE)) {
if (H5Fclose(srcfile[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile[0] = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if (H5Sclose(srcspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace = -1;
if (H5Sclose(vspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[0] = -1;
/* Close */
if (H5Pclose(dcpl) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dcpl = -1;
if (H5Pclose(dapl) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dapl = -1;
if (H5Sclose(memspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
memspace = -1;
HDfree(srcfilename);
@@ -11127,7 +11142,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
int fill = -1; /* Fill value */
int i, j;
- TESTING_2_SUPPRESSED("virtual dataset I/O with mixed selection types")
+ TESTING_2_SUPPRESSED("virtual dataset I/O with mixed selection types");
h5_fixname(FILENAME[0], vds_fapl, vfilename, sizeof vfilename);
h5_fixname(FILENAME[2], src_fapl, srcfilename, sizeof srcfilename);
@@ -11135,44 +11150,44 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Create DCPLs */
if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Set fill value */
if (H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fill) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Set chunk dimensions */
if (H5Pset_chunk(srcdcpl, 2, cdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create memory space */
if ((memspace = H5Screate_simple(2, mdims, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Clear virtual layout in DCPL */
if (H5Pset_layout(dcpl, H5D_VIRTUAL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create fixed mapping */
if ((vspace[0] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 3;
start[1] = 3;
count[0] = 3;
count[1] = 3;
if (H5Sselect_hyperslab(vspace[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcspace[0] = H5Screate_simple(2, count, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".",
"src_dset_fixed", srcspace[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create unlimited mapping */
if ((vspace[1] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 3;
start[1] = 0;
count[0] = 1;
@@ -11180,21 +11195,21 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = H5S_UNLIMITED;
block[1] = 3;
if (H5Sselect_hyperslab(vspace[1], H5S_SELECT_SET, start, NULL, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dims[0] = 0;
dims[1] = 3;
if ((srcspace[1] = H5Screate_simple(2, dims, block)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 0;
if (H5Sselect_hyperslab(srcspace[1], H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".",
"src_dset_unlim", srcspace[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create printf mapping */
if ((vspace[2] = H5Screate_simple(2, dims, mdims)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 0;
start[1] = 2;
stride[0] = 1;
@@ -11204,93 +11219,93 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 3;
block[1] = 2;
if (H5Sselect_hyperslab(vspace[2], H5S_SELECT_SET, start, stride, count, block) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcspace[2] = H5Screate_simple(2, block, NULL)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Pset_virtual(dcpl, vspace[2], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".",
"src_dset_printf_%b", srcspace[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create virtual file */
if ((vfile = H5Fcreate(vfilename, H5F_ACC_TRUNC, H5P_DEFAULT, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create source file if requested */
if (config & TEST_IO_DIFFERENT_FILE) {
if ((srcfile = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else {
srcfile = vfile;
if (H5Iinc_ref(srcfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Create virtual dataset */
if ((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile = -1;
}
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 6)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 6)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Reopen srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC)
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create fixed source dataset */
if ((srcdset[0] = H5Dcreate2(srcfile, "src_dset_fixed", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, srcdcpl,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create unlimited source_dataset */
if ((srcdset[1] = H5Dcreate2(srcfile, "src_dset_unlim", H5T_NATIVE_INT, srcspace[1], H5P_DEFAULT, srcdcpl,
H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Populate write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -11308,9 +11323,9 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 3;
block[1] = 3;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 3; i++)
@@ -11321,13 +11336,13 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
if (config & TEST_IO_CLOSE_SRC) {
for (i = 0; i < 2; i++) {
if (H5Dclose(srcdset[i]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[i] = -1;
}
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile = -1;
}
}
@@ -11335,40 +11350,40 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 6)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 6)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -11378,37 +11393,37 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if ((i >= (int)dims[0]) || (j >= (int)dims[1])) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile, "src_dset_unlim", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Extend srcdset[1] */
dims[0] = 2;
dims[1] = 3;
if (H5Dset_extent(srcdset[1], dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -11419,9 +11434,9 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 2; i++)
@@ -11431,11 +11446,11 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile = -1;
}
}
@@ -11443,40 +11458,40 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 6)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 6)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -11486,32 +11501,32 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if ((i >= (int)dims[0]) || (j >= (int)dims[1])) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcfile if config option specified */
if ((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
if ((srcfile = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create first printf source dataset */
if ((srcdset[2] = H5Dcreate2(srcfile, "src_dset_printf_0", H5T_NATIVE_INT, srcspace[2], H5P_DEFAULT,
srcdcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -11524,9 +11539,9 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 3;
block[1] = 2;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[2], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 3; i++)
@@ -11536,11 +11551,11 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[2] srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[2]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[2] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile = -1;
}
}
@@ -11548,40 +11563,40 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 6)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 6)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -11591,37 +11606,37 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if ((i >= (int)dims[0]) || (j >= (int)dims[1])) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile, "src_dset_unlim", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Extend srcdset[1] */
dims[0] = 3;
dims[1] = 3;
if (H5Dset_extent(srcdset[1], dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -11634,17 +11649,17 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 1;
block[1] = 3;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((filespace = H5Dget_space(srcdset[1])) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 2;
start[1] = 0;
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 3; i++)
@@ -11653,11 +11668,11 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile = -1;
}
}
@@ -11665,40 +11680,40 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 6)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 6)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -11708,32 +11723,32 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if ((i >= (int)dims[0]) || (j >= (int)dims[1])) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcfile if config option specified */
if ((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
if ((srcfile = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create second printf source dataset, this time without using srcdcpl */
if ((srcdset[3] = H5Dcreate2(srcfile, "src_dset_printf_1", H5T_NATIVE_INT, srcspace[2], H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -11746,9 +11761,9 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 3;
block[1] = 2;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[3], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 3; i++)
@@ -11758,11 +11773,11 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[3] srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[3]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[3] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile = -1;
}
}
@@ -11770,40 +11785,40 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 6)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 7)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -11813,37 +11828,37 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if ((i >= (int)dims[0]) || (j >= (int)dims[1])) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (config & TEST_IO_DIFFERENT_FILE)
if ((srcfile = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((srcdset[1] = H5Dopen2(srcfile, "src_dset_unlim", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Extend srcdset[1] */
dims[0] = 7;
dims[1] = 3;
if (H5Dset_extent(srcdset[1], dims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -11856,17 +11871,17 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 4;
block[1] = 3;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((filespace = H5Dget_space(srcdset[1])) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
start[0] = 3;
start[1] = 0;
if (H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[1], H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 4; i++)
@@ -11876,11 +11891,11 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[1] and srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[1]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[1] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile = -1;
}
}
@@ -11888,40 +11903,40 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 7)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -11931,32 +11946,32 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++) {
if (j >= (int)dims[1]) {
if (rbuf[i][j] != 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
else if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Reopen srcfile if config option specified */
if ((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
if ((srcfile = H5Fopen(srcfilename, H5F_ACC_RDWR, src_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Create third printf source dataset */
if ((srcdset[4] = H5Dcreate2(srcfile, "src_dset_printf_2", H5T_NATIVE_INT, srcspace[2], H5P_DEFAULT,
srcdcpl, H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Adjust write buffer */
for (i = 0; i < (int)mdims[0]; i++)
@@ -11969,9 +11984,9 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
block[0] = 3;
block[1] = 2;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, block, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Dwrite(srcdset[4], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, buf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Update erbuf */
for (i = 0; i < 3; i++)
@@ -11981,11 +11996,11 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Close srcdset[4] srcfile if config option specified */
if (config & TEST_IO_CLOSE_SRC) {
if (H5Dclose(srcdset[4]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[4] = -1;
if (config & TEST_IO_DIFFERENT_FILE) {
if (H5Fclose(srcfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile = -1;
}
}
@@ -11993,40 +12008,40 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
/* Reopen virtual dataset and file if config option specified */
if (config & TEST_IO_REOPEN_VIRT) {
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
if ((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, vds_fapl)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if ((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
}
/* Get VDS space */
if ((filespace = H5Dget_space(vdset)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Get VDS space dimensions */
if ((ndims = H5Sget_simple_extent_ndims(filespace)) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (ndims != 2)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (H5Sget_simple_extent_dims(filespace, dims, mdims) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (dims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[0] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
if (mdims[1] != 10)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close filespace */
if (H5Sclose(filespace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data through virtual dataset */
/* Reset rbuf */
@@ -12036,58 +12051,58 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
start[0] = 0;
start[1] = 0;
if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Read data */
if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Verify read data */
for (i = 0; i < (int)mdims[0]; i++)
for (j = 0; j < (int)mdims[1]; j++)
if (rbuf[i][j] != erbuf[i][j])
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
/* Close */
if (!(config & TEST_IO_CLOSE_SRC)) {
for (i = 0; i < 5; i++) {
if (H5Dclose(srcdset[i]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdset[i] = -1;
}
if (H5Fclose(srcfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile = -1;
}
else if (!(config & TEST_IO_DIFFERENT_FILE)) {
if (H5Fclose(srcfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcfile = -1;
}
if (H5Dclose(vdset) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vdset = -1;
if (H5Fclose(vfile) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vfile = -1;
for (i = 0; i < (int)(sizeof(srcspace) / sizeof(srcspace[0])); i++) {
if (H5Sclose(srcspace[i]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcspace[i] = -1;
}
for (i = 0; i < (int)(sizeof(vspace) / sizeof(vspace[0])); i++) {
if (H5Sclose(vspace[i]) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
vspace[i] = -1;
}
if (H5Pclose(dcpl) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
dcpl = -1;
if (H5Pclose(srcdcpl) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
srcdcpl = -1;
if (H5Sclose(memspace) < 0)
- TEST_ERROR_SUPPRESSED
+ TEST_ERROR_SUPPRESSED;
memspace = -1;
PASSED_SUPPRESSED();
@@ -12150,29 +12165,29 @@ test_dapl_values(hid_t fapl_id)
/* Create the file */
h5_fixname(FILENAME[5], fapl_id, filename, sizeof(filename));
if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
/* Create the dcpl and set up VDS mapping */
if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
/* source */
dims = 42;
if ((src_sid = H5Screate_simple(1, &dims, NULL)) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
/* vds */
dims = 0;
max_dims = H5S_UNLIMITED;
if ((vds_sid = H5Screate_simple(1, &dims, &max_dims)) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
start = 0;
stride = 42;
count = H5S_UNLIMITED;
block = 42;
if (H5Sselect_hyperslab(vds_sid, H5S_SELECT_SET, &start, &stride, &count, &block) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
/* map */
if (H5Pset_virtual(dcpl_id, vds_sid, "f-%b.h5", "/dset1", src_sid) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
/* Create the dapls and set values
* There are two of them. The reason for this is that the only way
@@ -12181,71 +12196,71 @@ test_dapl_values(hid_t fapl_id)
*/
/* dapl 1 */
if ((dapl_id1 = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (H5Pset_virtual_view(dapl_id1, H5D_VDS_FIRST_MISSING) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
/* dapl 2 */
if ((dapl_id2 = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
/* default but we set it explicitly to be sure */
if (H5Pset_virtual_view(dapl_id2, H5D_VDS_LAST_AVAILABLE) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (H5Pset_virtual_printf_gap(dapl_id2, 123) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
/* Create the datasets */
if ((did1 = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, vds_sid, H5P_DEFAULT, dcpl_id, dapl_id1)) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if ((did2 = H5Dcreate2(fid, "dset2", H5T_NATIVE_INT, vds_sid, H5P_DEFAULT, dcpl_id, dapl_id2)) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
/* Close the dapls */
if (H5Pclose(dapl_id1) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
dapl_id1 = -1;
if (H5Pclose(dapl_id2) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
dapl_id2 = -1;
/* Get a data access property lists from the dataset */
if ((dapl_id1 = H5Dget_access_plist(did1)) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if ((dapl_id2 = H5Dget_access_plist(did2)) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
/* Check the values from the dapls */
/* dapl 1 */
if (H5Pget_virtual_view(dapl_id1, &view) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (H5D_VDS_FIRST_MISSING != view)
- TEST_ERROR
+ TEST_ERROR;
/* dapl 2 */
if (H5Pget_virtual_view(dapl_id2, &view) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (H5D_VDS_LAST_AVAILABLE != view)
- TEST_ERROR
+ TEST_ERROR;
if (H5Pget_virtual_printf_gap(dapl_id2, &gap_size) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (gap_size != 123)
- TEST_ERROR
+ TEST_ERROR;
/* Close everything */
if (H5Sclose(vds_sid) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (H5Sclose(src_sid) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (H5Dclose(did1) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (H5Dclose(did2) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (H5Pclose(dapl_id1) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (H5Pclose(dapl_id2) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (H5Pclose(dcpl_id) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
if (H5Fclose(fid) < 0)
- FAIL_STACK_ERROR
+ FAIL_STACK_ERROR;
PASSED();
return 0;
@@ -12314,9 +12329,9 @@ main(void)
/* Create FAPLs for VDS and source files */
if ((vds_fapl = H5Pcopy(fapl)) < 0)
- TEST_ERROR
+ TEST_ERROR;
if ((src_fapl = H5Pcopy(fapl)) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Loop through all the combinations of low/high version bounds */
for (low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) {
@@ -12338,9 +12353,9 @@ main(void)
/* Set the low/high version bounds */
if (H5Pset_libver_bounds(vds_fapl, low, high) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (H5Pset_libver_bounds(src_fapl, low, high) < 0)
- TEST_ERROR
+ TEST_ERROR;
/* Display testing info */
low_string = h5_get_version_string(low);
@@ -12354,7 +12369,7 @@ main(void)
test_api_config++)
nerrors += test_api((test_api_config_t)test_api_config, vds_fapl, low);
- TESTING_2("Virtual dataset I/O")
+ TESTING_2("Virtual dataset I/O");
#ifdef VDS_TEST_VERBOSE
HDputs("");
#else /* VDS_TEST_VERBOSE */
@@ -12379,15 +12394,15 @@ main(void)
/* Set file close degree */
if (bit_config & TEST_IO_FCLOSE_SEMI) {
if (H5Pset_fclose_degree(vds_fapl, H5F_CLOSE_SEMI) < 0)
- TEST_ERROR
+ TEST_ERROR;
}
else if (bit_config & TEST_IO_FCLOSE_STRONG) {
if (H5Pset_fclose_degree(vds_fapl, H5F_CLOSE_STRONG) < 0)
- TEST_ERROR
+ TEST_ERROR;
}
else {
if (H5Pset_fclose_degree(vds_fapl, H5F_CLOSE_WEAK) < 0)
- TEST_ERROR
+ TEST_ERROR;
}
/* Run tests */
@@ -12412,9 +12427,9 @@ main(void)
} /* end for low */
if (H5Pclose(vds_fapl) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (H5Pclose(src_fapl) < 0)
- TEST_ERROR
+ TEST_ERROR;
if (nerrors)
goto error;
generated by cgit v0.12 at 2024-11-19 03:41:24 (GMT)