diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-02-10 17:55:55 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-02-10 17:55:55 (GMT) |
| commit | c8a6c6030a768952bc4161b2bf30c948b8b58723 (patch) | |
| tree | 064e57faf3f85c030d70900c3354fee2fbffd8ac /testpar | |
| parent | f1283d59b061cde641f2c24d23f01efbca46ad2f (diff) | |
| download | hdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.zip hdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.tar.gz hdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.tar.bz2 | |
[svn-r29077] Description:
Normalize against the trunk, in preparation for final merge.
Tested on:
MacOSX/64 10.11.3 (amazon) w/serial & parallel
(h5committest not required on this branch)
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_cache.c | 2 | ||||
| -rw-r--r-- | testpar/t_mdset.c | 2 | ||||
| -rw-r--r-- | testpar/t_shapesame.c | 4 | ||||
| -rw-r--r-- | testpar/testphdf5.c | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index d7a12fe..48beb80 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -7595,7 +7595,7 @@ main(int argc, char **argv) #endif /* enable the collective metadata read property */ if ( world_mpi_rank != world_server_mpi_rank ) { - if ( H5Pset_coll_metadata_read(fapl, 1) < 0 ) { + if ( H5Pset_coll_metadata_read(fapl, TRUE) < 0 ) { nerrors++; if ( verbose ) { diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c index f718f5b..66d6f49 100644 --- a/testpar/t_mdset.c +++ b/testpar/t_mdset.c @@ -888,7 +888,7 @@ void independent_group_read(void) MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type); - H5Pset_coll_metadata_read(plist, 0); + H5Pset_coll_metadata_read(plist, FALSE); fid = H5Fopen(filename, H5F_ACC_RDONLY, plist); H5Pclose(plist); diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index 1b856d0..106dd7b 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -4948,9 +4948,9 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type) /* set Parallel access with communicator */ ret = H5Pset_fapl_mpio(ret_pl, comm, info); VRFY((ret >= 0), ""); - ret = H5Pset_coll_metadata_read(ret_pl, true); + ret = H5Pset_coll_metadata_read(ret_pl, TRUE); VRFY((ret >= 0), ""); - ret = H5Pset_coll_metadata_write(ret_pl, true); + ret = H5Pset_coll_metadata_write(ret_pl, TRUE); VRFY((ret >= 0), ""); return(ret_pl); } diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index b5ebb98..8ff0dc6 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -272,9 +272,9 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type) /* set Parallel access with communicator */ ret = H5Pset_fapl_mpio(ret_pl, comm, info); VRFY((ret >= 0), ""); - ret = H5Pset_coll_metadata_read(ret_pl, true); + ret = H5Pset_coll_metadata_read(ret_pl, TRUE); VRFY((ret >= 0), ""); - ret = H5Pset_coll_metadata_write(ret_pl, true); + ret = H5Pset_coll_metadata_write(ret_pl, TRUE); VRFY((ret >= 0), ""); return(ret_pl); } @@ -536,6 +536,7 @@ int main(int argc, char **argv) AddTest("denseattr", test_dense_attr, NULL, "Store Dense Attributes", PARATESTFILE); + /* Display testing information */ TestInfo(argv[0]); |