[svn-r22652] bring 22651 to branch

fix a bug that would skip or include the parallel atomicity test with cmd arguments -o or -x
This commit is contained in:
Mohamad Chaarawi
2012-08-09 13:10:47 -05:00
parent e7561408fb
commit 4e22de6e90
2 changed files with 15 additions and 11 deletions

View File

@@ -3088,8 +3088,12 @@ dataset_atomicity(void)
dim0 = 64; dim1 = 32;
filename = GetTestParameters();
if (facc_type != FACC_MPIO) {
printf("Atomicity tests will not work without the MPIO VFD\n");
return;
}
if(VERBOSE_MED)
printf("Independent write test on file %s\n", filename);
printf("atomic writes to file %s\n", filename);
/* set up MPI parameters */
MPI_Comm_size(MPI_COMM_WORLD,&mpi_size);

View File

@@ -513,16 +513,6 @@ int main(int argc, char **argv)
AddTest((mpi_size < 2)? "-fiodc" : "fiodc", file_image_daisy_chain_test, NULL,
"file image ops daisy chain", NULL);
/* Display testing information */
TestInfo(argv[0]);
/* setup file access property list */
fapl = H5Pcreate (H5P_FILE_ACCESS);
H5Pset_fapl_mpio(fapl, MPI_COMM_WORLD, MPI_INFO_NULL);
/* Parse command line arguments */
TestParseCmdLine(argc, argv);
if((mpi_size < 2)&& MAINPROCESS ) {
printf("Atomicity tests need at least 2 processes to participate\n");
printf("8 is more recommended.. Atomicity tests will be skipped \n");
@@ -535,6 +525,16 @@ int main(int argc, char **argv)
"dataset atomic updates", PARATESTFILE);
}
/* Display testing information */
TestInfo(argv[0]);
/* setup file access property list */
fapl = H5Pcreate (H5P_FILE_ACCESS);
H5Pset_fapl_mpio(fapl, MPI_COMM_WORLD, MPI_INFO_NULL);
/* Parse command line arguments */
TestParseCmdLine(argc, argv);
if (facc_type == FACC_MPIPOSIX && MAINPROCESS){
printf("===================================\n"
" Using MPIPOSIX driver\n"