Merge pull request #14 from hppritcha/topic/sessions_tests_cleanup

sessions tests - some cleanup

Author: hppritcha

.gitignore

@@ -0,0 +1,22 @@
+sessions/sessions_ex1.o
+sessions/sessions_ex2
+sessions/sessions_ex3
+sessions/sessions_ex4
+sessions/sessions_test
+sessions/sessions_test1
+sessions/sessions_test10
+sessions/sessions_test11
+sessions/sessions_test12
+sessions/sessions_test13
+sessions/sessions_test14
+sessions/sessions_test15
+sessions/sessions_test16
+sessions/sessions_test2
+sessions/sessions_test3
+sessions/sessions_test4
+sessions/sessions_test5
+sessions/sessions_test6
+sessions/sessions_test7
+sessions/sessions_test8
+sessions/sessions_test9
+

sessions/Makefile

@@ -41,7 +41,6 @@ EXAMPLES = \
 	 sessions_test1 \
 	 sessions_test2 \
 	 sessions_test3 \
-	 sessions_test4 \
 	 sessions_test5 \
 	 sessions_test6 \
 	 sessions_test7 \
@@ -51,7 +50,6 @@ EXAMPLES = \
 	 sessions_test11 \
 	 sessions_test12 \
 	 sessions_test13 \
-	 sessions_test14 \
 	 sessions_test15 \
 	 sessions_test16
 
@@ -60,9 +58,9 @@ EXAMPLES = \
 # others if we have the appropriate Open MPI / OpenSHMEM language
 # bindings.
 
-all: sessions_ex1.o sessions_ex2 sessions_test sessions_test1 sessions_test2 sessions_test3 sessions_test4 sessions_test5 \
+all: sessions_ex1.o sessions_ex2 sessions_test sessions_test1 sessions_test2 sessions_test3  sessions_test5 \
 	 sessions_test6 sessions_test7 sessions_test8 sessions_test9 sessions_test10 sessions_test11 sessions_test12 sessions_test13 \
-	 sessions_test14 sessions_test15 sessions_test16
+	 sessions_test15 sessions_test16
 	@ if which ompi_info >/dev/null 2>&1 ; then \
 		$(MAKE) mpi; \
 	fi
@@ -99,8 +97,6 @@ sessions_test2: sessions_test2.c
 	$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
 sessions_test3: sessions_test3.c
 	$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
-sessions_test4: sessions_test4.c
-	$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
 sessions_test5: sessions_test5.c
 	$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
 sessions_test6: sessions_test6.c
@@ -119,8 +115,6 @@ sessions_test12: sessions_test12.c
 	$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
 sessions_test13: sessions_test13.c
 	$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
-sessions_test14: sessions_test14.c
-	$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
 sessions_test15: sessions_test15.c
 	$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
 sessions_test16: sessions_test16.c

sessions/sessions_test14.c

@@ -1,3 +1,6 @@
+/*
+ *  this test disabled for now, has numerous bugs
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

sessions/sessions_test15.c

@@ -24,7 +24,8 @@ int main (int argc, char *argv[])
     MPI_Group group, group1;
     MPI_Comm comm_world, comm_world1;
     MPI_Info info;
-    int rc, npsets, npsets1, one = 1, i;
+    int rc, npsets, npsets1, one = 1, i, nprocs;
+    int rank, buffer;
 
     rc = MPI_Session_create_errhandler (my_session_errhandler, &errhandler);
     if (MPI_SUCCESS != rc) {
@@ -87,10 +88,18 @@ int main (int argc, char *argv[])
     MPI_Comm_create_from_group (group, "my_world", MPI_INFO_NULL, MPI_ERRORS_RETURN, &comm_world);
     MPI_Group_free (&group);
 
+    MPI_Comm_size(comm_world, &nprocs);
+    MPI_Comm_rank(comm_world, &rank);
+    if (nprocs < 4) {
+        if (rank ==0) {
+            fprintf(stderr, "Test requires at least 4 processes\n");
+        }
+        MPI_Abort(comm_world, -1);
+    }
+
     MPI_Comm_create_from_group (group1, "my_world", MPI_INFO_NULL, MPI_ERRORS_RETURN, &comm_world1);
     MPI_Group_free (&group1);
 
-    int rank, buffer;
     MPI_Comm_rank(comm_world, &rank);
 
     /* Check MPI_Waitall */

sessions/sessions_test4.c

@@ -1,3 +1,8 @@
+/*
+ * this test brought up an issue with the MPI-4 Standard.
+ * See issue https://github.com/mpi-forum/mpi-issues/issues/534
+ * Disable this test till the Forum decided how to handle use of MPI_GROUP_NULL.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -76,4 +81,4 @@ int main (int argc, char *argv[])
     }
 
 
-}
+}