summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
Diffstat (limited to 'testpar')
-rw-r--r--testpar/t_cache.c19
-rw-r--r--testpar/t_dset.c2
-rw-r--r--testpar/t_shapesame.c4
-rw-r--r--testpar/testphdf5.c4
4 files changed, 12 insertions, 17 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index e91ee4e..5b6b44f 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -7508,15 +7508,6 @@ main(int argc, char **argv)
}
}
- if ( H5Pset_coll_metadata_read(fapl, 1) < 0 ) {
-
- nerrors++;
- if ( verbose ) {
- HDfprintf(stdout, "%d:%s: H5Pset_coll_metadata_read() failed 1.\n",
- world_mpi_rank, FUNC);
- }
- }
-
/* fix the file names */
for ( u = 0; u < sizeof(FILENAME) / sizeof(FILENAME[0]) - 1; ++u )
{
@@ -7561,6 +7552,7 @@ main(int argc, char **argv)
world_mpi_rank, FUNC);
}
}
+
}
setup_rand();
@@ -7599,6 +7591,10 @@ main(int argc, char **argv)
smoke_check_4(H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY);
smoke_check_4(H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
#endif
+#if 1
+ smoke_check_5(H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY);
+ smoke_check_5(H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
+#endif
/* enable the collective metadata read property */
if ( world_mpi_rank != world_server_mpi_rank ) {
if ( H5Pset_coll_metadata_read(fapl, 1) < 0 ) {
@@ -7611,11 +7607,6 @@ main(int argc, char **argv)
}
}
#if 1
- smoke_check_5(H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY);
- smoke_check_5(H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
-#endif
-
-#if 1
smoke_check_6(H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY);
smoke_check_6(H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED);
#endif
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index ae022fb..2e1005c 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -457,7 +457,7 @@ dataset_readInd(void)
VRFY((acc_tpl >= 0), "");
/* open the file collectively */
- fid=H5Fopen(filename,H5F_ACC_RDONLY,acc_tpl);
+ fid = H5Fopen(filename, H5F_ACC_RDONLY, acc_tpl);
VRFY((fid >= 0), "");
/* Release file-access template */
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index 5152408..1b856d0 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -4948,7 +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, 1);
+ ret = H5Pset_coll_metadata_read(ret_pl, true);
+ VRFY((ret >= 0), "");
+ 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 b652ef4..7ab479d 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -272,7 +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, 1);
+ ret = H5Pset_coll_metadata_read(ret_pl, true);
+ VRFY((ret >= 0), "");
+ ret = H5Pset_coll_metadata_write(ret_pl, true);
VRFY((ret >= 0), "");
return(ret_pl);
}