activate some tests for cancel

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
index fe83c0d..7325d85 100644 (file)
--- a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
@@ -10,9 +10,9 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
   foreach(file anyall bottom eagerdt huge_anysrc huge_underflow inactivereq isendself isendirecv isendselfprobe issendselfcancel cancelanysrc pingping probenull
-          dtype_send probe-unexp sendall sendflood sendrecv1 sendrecv2 sendrecv3 waitany-null waittestnull many_isend manylmt recv_any)
+          dtype_send probe-unexp sendall sendflood sendrecv1 sendrecv2 sendrecv3 waitany-null waittestnull many_isend manylmt recv_any scancel scancel2 rcancel)
     # not compiled files: big_count_status bsend1 bsend2 bsend3 bsend4 bsend5 bsendalign bsendfrag bsendpending mprobe
-    # cancelrecv greq1 icsend large_message pscancel rcancel rqfreeb rqstatus scancel2 scancel sendself scancel_unmatch
+    # cancelrecv greq1 icsend large_message pscancel  rqfreeb rqstatus  sendself scancel_unmatch
     add_executable(${file} ${file}.c)
     target_link_libraries(${file} simgrid mtest_c)
   endforeach()

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/cancelrecv.c b/teshsuite/smpi/mpich3-test/pt2pt/cancelrecv.c
index d78a4d9..1770167 100644 (file)
--- a/teshsuite/smpi/mpich3-test/pt2pt/cancelrecv.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/cancelrecv.c
@@ -100,11 +100,11 @@ int main(int argc, char *argv[])
              * may be changed */
             if ((s[0].MPI_ERROR) != -3) {
                 errs++;
-                printf("Send request status 0 modified. s[0].MPI_ERROR = %x\n", s[0].MPI_ERROR);
+                printf("Send request status 0 modified. s[0].MPI_ERROR = %d\n", s[0].MPI_ERROR);
             }
             if ((s[1].MPI_ERROR) != -3) {
                 errs++;
-                printf("Send request status 1 modified. s[1].MPI_ERROR = %x\n", s[1].MPI_ERROR);
+                printf("Send request status 1 modified. s[1].MPI_ERROR = %d\n", s[1].MPI_ERROR);
             }
         }
         MPI_Barrier(comm);

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/pscancel.c b/teshsuite/smpi/mpich3-test/pt2pt/pscancel.c
index 1938dad..c4afadc 100644 (file)
--- a/teshsuite/smpi/mpich3-test/pt2pt/pscancel.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/pscancel.c
@@ -15,7 +15,7 @@ static char MTEST_Descrip[] = "Test of various send cancel calls";
 int main(int argc, char *argv[])
 {
     int errs = 0;
-    int rank, size, source, dest;
+    int rank, size, dest;
     MPI_Comm comm;
     MPI_Status status;
     MPI_Request req;
@@ -33,7 +33,6 @@ int main(int argc, char *argv[])
     MPI_Comm_rank(comm, &rank);
     MPI_Comm_size(comm, &size);
 
-    source = 0;
     dest = size - 1;
 
     for (cs = 0; cs < 4; cs++) {

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/scancel.c b/teshsuite/smpi/mpich3-test/pt2pt/scancel.c
index 23e1bb4..41ff232 100644 (file)
--- a/teshsuite/smpi/mpich3-test/pt2pt/scancel.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/scancel.c
@@ -15,7 +15,7 @@ static char MTEST_Descrip[] = "Test of various send cancel calls";
 int main(int argc, char *argv[])
 {
     int errs = 0;
-    int rank, size, source, dest;
+    int rank, size, dest;
     MPI_Comm comm;
     MPI_Status status;
     MPI_Request req;
@@ -33,7 +33,6 @@ int main(int argc, char *argv[])
     MPI_Comm_rank(comm, &rank);
     MPI_Comm_size(comm, &size);
 
-    source = 0;
     dest = size - 1;
 
     MTestPrintfMsg(1, "Starting scancel test\n");
@@ -83,7 +82,7 @@ int main(int argc, char *argv[])
             }
         }
         MPI_Barrier(comm);
-
+#ifdef TEST_IRSEND
         if (rank == 0) {
             char *bsendbuf;
             int bsendbufsize;
@@ -143,7 +142,7 @@ int main(int argc, char *argv[])
 
         /* Because this test is erroneous, we do not perform it unless
          * TEST_IRSEND is defined.  */
-#ifdef TEST_IRSEND
+
         /* We avoid ready send to self because an implementation
          * is free to detect the error in delivering a message to
          * itself without a pending receive; we could also check

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/testlist b/teshsuite/smpi/mpich3-test/pt2pt/testlist
index 131ae76..80e84cd 100644 (file)
--- a/teshsuite/smpi/mpich3-test/pt2pt/testlist
+++ b/teshsuite/smpi/mpich3-test/pt2pt/testlist
@@ -33,13 +33,11 @@ isendirecv 10
 probe-unexp 4
 probenull 1
 # For testing, scancel will run with 1 process as well
-#needs MPI_Cancel, MPI_Test_cancelled, MPI_Ibsend
-#scancel 2 xfail=ticket287
-#needs MPI_Cancel, MPI_Test_cancelled
-#scancel2 2
+scancel 2 xfail=ticket287
+scancel2 2
+#Needs MPI_Buffer_attach
 #pscancel 2 xfail=ticket287
-#needs MPI_Cancel
-#rcancel 2
+rcancel 2
 #cancelrecv 2 xfail=ticket287
 isendselfprobe 1
 inactivereq 1