1 files changed, 26 insertions, 29 deletions

diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 4a3af2e..57c3012 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -368,6 +368,8 @@ int main(int argc, char **argv)
     int mpi_size, mpi_rank;				/* mpi variables */
     H5Ptest_param_t ndsets_params, ngroups_params;
     H5Ptest_param_t collngroups_params;
+    int		Summary = 0;
+    int		CleanUp = 1;
 
     /* Un-buffer the stdout and stderr */
     setbuf(stderr, NULL);
@@ -385,28 +387,6 @@ int main(int argc, char **argv)
     H5open();
     h5_show_hostname();
 
-    fapl = H5Pcreate (H5P_FILE_ACCESS);
-    H5Pset_fapl_mpio(fapl, MPI_COMM_WORLD, MPI_INFO_NULL);
-
-    if (parse_options(argc, argv) != 0){
-	if (MAINPROCESS)
-	    usage();
-	goto finish;
-    }
-
-    if (facc_type == FACC_MPIPOSIX && MAINPROCESS){
-	printf("===================================\n"
-	       "   Using MPIPOSIX driver\n"
-	       "===================================\n");
-    }
-
-    {
-    int                     Summary = 0;
-    int                     CleanUp = 1;
-
-
-
-
     /* Initialize testing framework */
     TestInit();
 
@@ -485,16 +465,34 @@ int main(int argc, char **argv)
     AddTest("coll_chunked4", coll_chunk4,NULL,
 	    "collective to independent chunk io",filenames[13]);
 
-    /* Argument requests */
-    if (dobig && sizeof(MPI_Offset)>4){
-	SetTest("bigdataset", ONLYTEST);
-    }
-
     /* 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,&Summary,&CleanUp); */
+    TestParseCmdLine(argc, argv, &Summary, &CleanUp, parse_options);
+
+    /*
+    if (parse_options(argc, argv) != 0){
+	if (MAINPROCESS)
+	    usage();
+	goto finish;
+    }
+    */
+
+    if (facc_type == FACC_MPIPOSIX && MAINPROCESS){
+	printf("===================================\n"
+	       "   Using MPIPOSIX driver\n"
+	       "===================================\n");
+    }
+
+    /* Argument requests */
+    if (dobig && sizeof(MPI_Offset)>4){
+	SetTest("bigdataset", ONLYTEST);
+    }
 
     /* Perform requested testing */
     PerformTests();
@@ -509,7 +507,6 @@ int main(int argc, char **argv)
 
     nerrors += GetTestNumErrs();
 
-    }
 
     if (!(dowrite || doread || ndatasets || ngroups || docompact || donull || doindependent || dobig )){
 	usage();