[svn-r25665] - fix core driver eof initialization.

- merge from trunk.
- fix expected output for multi VFD h5extend tests after merging in
the change for multi vfd memb addr settings from trunk.

3 files changed, 15 insertions, 11 deletions

diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 2bc3b09..281b1c0 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -4365,6 +4365,11 @@ test_dense_attr(void)
     hid_t atFileSpace, atid;
     hsize_t atDims[1] = {10000};
     herr_t status;
+    const char *filename;
+
+    /* get filename */
+    filename = (const char *)GetTestParameters();
+    HDassert( filename != NULL );
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD,&mpi_size);
@@ -4376,7 +4381,7 @@ test_dense_attr(void)
     VRFY((status >= 0), "H5Pset_libver_bounds succeeded");
     status = H5Pset_fapl_mpio(fpid, MPI_COMM_WORLD, MPI_INFO_NULL);
     VRFY((status >= 0), "H5Pset_fapl_mpio succeeded");
-    fid = H5Fcreate("ph5Dense.h5", H5F_ACC_TRUNC, H5P_DEFAULT, fpid);
+    fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fpid);
     VRFY((fid > 0), "H5Fcreate succeeded");
     status = H5Pclose(fpid);
     VRFY((status >= 0), "H5Pclose succeeded");
diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c
index a570d4c..59be9e1 100644
--- a/testpar/t_pflush2.c
+++ b/testpar/t_pflush2.c
@@ -133,9 +133,7 @@ error:
 int
 main(int argc, char* argv[])
 {
-    hid_t fapl1, fapl2;
     H5E_auto2_t func;
-
     char	name[1024];
     const char *envval = NULL;
 
@@ -147,13 +145,6 @@ main(int argc, char* argv[])
     MPI_Comm_size(comm, &mpi_size);
     MPI_Comm_rank(comm, &mpi_rank);
 
-    fapl1 = H5Pcreate(H5P_FILE_ACCESS);
-    H5Pset_fapl_mpio(fapl1, comm, info);
-
-    fapl2 = H5Pcreate(H5P_FILE_ACCESS);
-    H5Pset_fapl_mpio(fapl2, comm, info);
-
-
     if(mpi_rank == 0)
 	TESTING("H5Fflush (part2 with flush)");
 
@@ -162,6 +153,14 @@ main(int argc, char* argv[])
     if (envval == NULL)
         envval = "nomatch";
     if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split")) {
+        hid_t fapl1, fapl2;
+
+        fapl1 = H5Pcreate(H5P_FILE_ACCESS);
+        H5Pset_fapl_mpio(fapl1, comm, info);
+
+        fapl2 = H5Pcreate(H5P_FILE_ACCESS);
+        H5Pset_fapl_mpio(fapl2, comm, info);
+
 	/* Check the case where the file was flushed */
 	h5_fixname(FILENAME[0], fapl1, name, sizeof name);
 	if(check_file(name, fapl1))
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 8180fb5..8f6aced 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -531,7 +531,7 @@ int main(int argc, char **argv)
     }
 
     AddTest("denseattr", test_dense_attr, NULL,
-	    "Store Dense Attributes", NULL);
+	    "Store Dense Attributes", PARATESTFILE);
 
 
     /* Display testing information */