summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Arber <larber@ncsa.uiuc.edu>2006-10-02 17:45:53 (GMT)
committerLeon Arber <larber@ncsa.uiuc.edu>2006-10-02 17:45:53 (GMT)
commit9da1caea1527bf06a8c1fedd49992f49c5f2afaf (patch)
tree25e3e1d7f988d7debd276ac641410a60981e54bc
parent79bc4a9b03a86fa58edc0abf8e83fce6e68bab38 (diff)
downloadhdf5-9da1caea1527bf06a8c1fedd49992f49c5f2afaf.zip
hdf5-9da1caea1527bf06a8c1fedd49992f49c5f2afaf.tar.gz
hdf5-9da1caea1527bf06a8c1fedd49992f49c5f2afaf.tar.bz2
[svn-r12704] Purpose: Bug fix
Description: Fix copper failures by adding MPI_Finalize call and also close the dataset and file in case of failure prior to exiting.
-rw-r--r--testpar/t_pflush1.c3
-rw-r--r--testpar/t_pflush2.c40
2 files changed, 28 insertions, 15 deletions
diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c
index f2292b2..6ab04d8 100644
--- a/testpar/t_pflush1.c
+++ b/testpar/t_pflush1.c
@@ -164,7 +164,8 @@ main(int argc, char* argv[])
SKIPPED();
puts(" Test not compatible with current Virtual File Driver");
}
-
+
+ MPI_Finalize();
HD_exit(0);
error:
diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c
index 8d1a257..f53b440 100644
--- a/testpar/t_pflush2.c
+++ b/testpar/t_pflush2.c
@@ -57,7 +57,6 @@ int check_file(char* name, hid_t fapl)
plist = H5Pcreate(H5P_DATASET_XFER);
H5Pset_dxpl_mpio(plist, H5FD_MPIO_COLLECTIVE);
-
if ((file=H5Fopen(name, H5F_ACC_RDONLY, fapl))<0) goto error;
/* Open the dataset */
@@ -97,11 +96,14 @@ int check_file(char* name, hid_t fapl)
}
if (H5Gclose(groups)<0) goto error;
- if (H5Pclose(plist)<0) goto error;
if (H5Dclose(dset)<0) goto error;
if (H5Fclose(file)<0) goto error;
+ if (H5Pclose(plist)<0) goto error;
return 0;
error:
+ if (H5Fclose(file)<0) goto error;
+ if (H5Pclose(plist)<0) goto error;
+
return 1;
@@ -128,7 +130,7 @@ error:
int
main(int argc, char* argv[])
{
- hid_t fapl;
+ hid_t fapl1, fapl2;
H5E_auto_stack_t func;
char name[1024];
@@ -142,27 +144,32 @@ main(int argc, char* argv[])
MPI_Comm_size(comm, &mpi_size);
MPI_Comm_rank(comm, &mpi_rank);
- fapl = H5Pcreate(H5P_FILE_ACCESS);
- H5Pset_fapl_mpio(fapl, comm, info);
+ fapl1 = H5Pcreate(H5P_FILE_ACCESS);
+ H5Pset_fapl_mpio(fapl1, comm, info);
- if(mpi_rank == 0)
- TESTING("H5Fflush (part2 with flush)");
+ fapl2 = H5Pcreate(H5P_FILE_ACCESS);
+ H5Pset_fapl_mpio(fapl2, comm, info);
+
+ if(mpi_rank == 0)
+ TESTING("H5Fflush (part2 with flush)");
+
/* Don't run this test using the core or split file drivers */
envval = HDgetenv("HDF5_DRIVER");
if (envval == NULL)
envval = "nomatch";
if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split")) {
/* Check the case where the file was flushed */
- h5_fixname(FILENAME[0], fapl, name, sizeof name);
- if(check_file(name, fapl))
+ h5_fixname(FILENAME[0], fapl1, name, sizeof name);
+ if(check_file(name, fapl1))
{
H5_FAILED()
goto error;
}
else if(mpi_rank == 0)
- PASSED();
-
+ {
+ PASSED()
+ }
/* Check the case where the file was not flushed. This should give an error
* so we turn off the error stack temporarily */
@@ -171,11 +178,13 @@ main(int argc, char* argv[])
H5Eget_auto_stack(H5E_DEFAULT,&func,NULL);
H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
- h5_fixname(FILENAME[1], fapl, name, sizeof name);
- if(check_file(name, fapl))
+ h5_fixname(FILENAME[1], fapl2, name, sizeof name);
+ if(check_file(name, fapl2))
{
if(mpi_rank == 0)
+ {
PASSED()
+ }
}
else
{
@@ -185,13 +194,16 @@ main(int argc, char* argv[])
H5Eset_auto_stack(H5E_DEFAULT, func, NULL);
- h5_cleanup(FILENAME, fapl);
+ h5_cleanup(&FILENAME[0], fapl1);
+ h5_cleanup(&FILENAME[1], fapl2);
}
else
{
SKIPPED();
puts(" Test not compatible with current Virtual File Driver");
}
+
+ MPI_Finalize();
return 0;
error: