Fix umpire issues : MPI_Comm cannot be safely put inside an int

Fix/Ignore some warnings as well

diff --git a/teshsuite/smpi/isp/umpire/CMakeLists.txt b/teshsuite/smpi/isp/umpire/CMakeLists.txt
index 3eda492..d881695 100644 (file)
--- a/teshsuite/smpi/isp/umpire/CMakeLists.txt
+++ b/teshsuite/smpi/isp/umpire/CMakeLists.txt
@@ -208,7 +208,7 @@ if(enable_smpi AND enable_model-checking AND enable_smpi_ISP_testsuite)
   foreach (test ${umpire_tests_passing} ${umpire_tests_deadlock} ${umpire_tests_problematic} )
     add_executable(${test} ${test}.c)
     target_link_libraries(${test} simgrid)
-    set_source_files_properties(${test}.c PROPERTIES COMPILE_FLAGS "-Wno-error")
+    set_source_files_properties(${test}.c PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-return-type")
     set(umpire_tesh ${umpire_tesh} ${test})
     set(files_to_clean ${files_to_clean} ${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh)
   endforeach(test)

diff --git a/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c b/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c
index 40d3ccd..e3503a1 100644 (file)
--- a/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c
+++ b/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c
@@ -40,7 +40,7 @@ main (int argc, char **argv)
 
       MPI_Irecv (buf1, buf_size, MPI_INT, 
                 MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &req);
-      printf("Proc 0:  Request number - %d\n",req);
+      printf("Proc 0:  Request number - %p\n",req);
       
       MPI_Send (buf0, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD);
        
@@ -49,7 +49,7 @@ main (int argc, char **argv)
       MPI_Send (buf0, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD);
 
       MPI_Wait (&req, &status);
-      printf("Proc 0:  Request number after wait test- %d\n",req);
+      printf("Proc 0:  Request number after wait test- %p\n",req);
     }
   else if (rank == 1)
     {
@@ -57,7 +57,7 @@ main (int argc, char **argv)
 
       MPI_Irecv (buf1, buf_size, MPI_INT, 
                 MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &req);
-      printf("Proc 1:  Request number - %d\n",req);
+      printf("Proc 1:  Request number - %p\n",req);
 
       MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD);
 
@@ -66,7 +66,7 @@ main (int argc, char **argv)
       MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD);
 
       MPI_Wait (&req, &status);
-      printf("Proc 1:  Request number after wait test- %d\n",req);
+      printf("Proc 1:  Request number after wait test- %p\n",req);
     }
 
   MPI_Barrier (MPI_COMM_WORLD);

diff --git a/teshsuite/smpi/isp/umpire/bcast-deadlock.c b/teshsuite/smpi/isp/umpire/bcast-deadlock.c
index eb1d7ba..6798490 100644 (file)
--- a/teshsuite/smpi/isp/umpire/bcast-deadlock.c
+++ b/teshsuite/smpi/isp/umpire/bcast-deadlock.c
@@ -10,7 +10,7 @@ int
 main (int argc, char **argv)
 {
   int rank;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf0[buf_size];

diff --git a/teshsuite/smpi/isp/umpire/change-send-buffer-exhaustive.c b/teshsuite/smpi/isp/umpire/change-send-buffer-exhaustive.c
index 3b1945d..661ba0a 100644 (file)
--- a/teshsuite/smpi/isp/umpire/change-send-buffer-exhaustive.c
+++ b/teshsuite/smpi/isp/umpire/change-send-buffer-exhaustive.c
@@ -24,7 +24,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int bbuf[(BUF_SIZE + MPI_BSEND_OVERHEAD) * 2 * NUM_BSEND_TYPES];

diff --git a/teshsuite/smpi/isp/umpire/change-send-buffer-type-exhaustive.c b/teshsuite/smpi/isp/umpire/change-send-buffer-type-exhaustive.c
index 06735db..f95139a 100644 (file)
--- a/teshsuite/smpi/isp/umpire/change-send-buffer-type-exhaustive.c
+++ b/teshsuite/smpi/isp/umpire/change-send-buffer-type-exhaustive.c
@@ -52,7 +52,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int i, j, k, basic_extent;

diff --git a/teshsuite/smpi/isp/umpire/change-send-buffer.c b/teshsuite/smpi/isp/umpire/change-send-buffer.c
index 5a85ace..4d21ed5 100644 (file)
--- a/teshsuite/smpi/isp/umpire/change-send-buffer.c
+++ b/teshsuite/smpi/isp/umpire/change-send-buffer.c
@@ -18,7 +18,7 @@ main (int argc, char **argv)
   int rank = -1;
   int tag1 = 0;
   int tag2 = 0;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf0[128];

diff --git a/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.c b/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.c
index 5611247..66d774b 100644 (file)
--- a/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.c
+++ b/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.c
@@ -18,7 +18,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int sbuf[buf_size];

diff --git a/teshsuite/smpi/isp/umpire/collective-misorder.c b/teshsuite/smpi/isp/umpire/collective-misorder.c
index b5e0b5b..4cade73 100644 (file)
--- a/teshsuite/smpi/isp/umpire/collective-misorder.c
+++ b/teshsuite/smpi/isp/umpire/collective-misorder.c
@@ -18,7 +18,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf0[buf_size];

diff --git a/teshsuite/smpi/isp/umpire/collective-misorder2.c b/teshsuite/smpi/isp/umpire/collective-misorder2.c
index 403c493..a6da78d 100644 (file)
--- a/teshsuite/smpi/isp/umpire/collective-misorder2.c
+++ b/teshsuite/smpi/isp/umpire/collective-misorder2.c
@@ -18,7 +18,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf0[buf_size];

diff --git a/teshsuite/smpi/isp/umpire/comm-bcast-deadlock.c b/teshsuite/smpi/isp/umpire/comm-bcast-deadlock.c
index 8c1b86c..342e3b0 100644 (file)
--- a/teshsuite/smpi/isp/umpire/comm-bcast-deadlock.c
+++ b/teshsuite/smpi/isp/umpire/comm-bcast-deadlock.c
@@ -17,7 +17,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   MPI_Comm inverted_comm;

diff --git a/teshsuite/smpi/isp/umpire/comm-deadlock.c b/teshsuite/smpi/isp/umpire/comm-deadlock.c
index dcc2289..30b297e 100644 (file)
--- a/teshsuite/smpi/isp/umpire/comm-deadlock.c
+++ b/teshsuite/smpi/isp/umpire/comm-deadlock.c
@@ -17,7 +17,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   MPI_Comm nc1;

diff --git a/teshsuite/smpi/isp/umpire/comm-dup-no-free.c b/teshsuite/smpi/isp/umpire/comm-dup-no-free.c
index b497948..2042d21 100644 (file)
--- a/teshsuite/smpi/isp/umpire/comm-dup-no-free.c
+++ b/teshsuite/smpi/isp/umpire/comm-dup-no-free.c
@@ -19,7 +19,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   MPI_Comm newcomm;

diff --git a/teshsuite/smpi/isp/umpire/comm-simple.c b/teshsuite/smpi/isp/umpire/comm-simple.c
index 274769a..d5946a7 100644 (file)
--- a/teshsuite/smpi/isp/umpire/comm-simple.c
+++ b/teshsuite/smpi/isp/umpire/comm-simple.c
@@ -17,7 +17,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   MPI_Comm newcomm;
@@ -45,7 +45,7 @@ main (int argc, char **argv)
 
     MPI_Comm_size (newcomm, &nsize);
     MPI_Comm_rank (newcomm, &nrank);
-    printf ("world task %d/%d/%d maps to new comm task %d/%d/%d\n",
+    printf ("world task %p/%d/%d maps to new comm task %p/%d/%d\n",
            comm, nprocs, rank, newcomm, nsize, nrank);
 
     if (nrank == 0)
@@ -55,7 +55,7 @@ main (int argc, char **argv)
 
     MPI_Bcast (&dat, 1, MPI_INT, 0, newcomm);
 
-    printf ("world task %d/%d/%d maps to new comm task %d/%d/%d --> %d\n",
+    printf ("world task %p/%d/%d maps to new comm task %p/%d/%d --> %d\n",
            comm, nprocs, rank, newcomm, nsize, nrank, dat);
   }
 

diff --git a/teshsuite/smpi/isp/umpire/comm-split-no-free.c b/teshsuite/smpi/isp/umpire/comm-split-no-free.c
index cd9fb8a..bfcaaa5 100644 (file)
--- a/teshsuite/smpi/isp/umpire/comm-split-no-free.c
+++ b/teshsuite/smpi/isp/umpire/comm-split-no-free.c
@@ -17,7 +17,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   MPI_Comm newcomm;

diff --git a/teshsuite/smpi/isp/umpire/comm-translate-ranks.c b/teshsuite/smpi/isp/umpire/comm-translate-ranks.c
index f3d09bd..c6e54ca 100644 (file)
--- a/teshsuite/smpi/isp/umpire/comm-translate-ranks.c
+++ b/teshsuite/smpi/isp/umpire/comm-translate-ranks.c
@@ -17,7 +17,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   MPI_Comm newcomm;
@@ -45,7 +45,7 @@ main (int argc, char **argv)
 
     MPI_Comm_size (newcomm, &nsize);
     MPI_Comm_rank (newcomm, &nrank);
-    printf ("world task %d/%d/%d maps to new comm task %d/%d/%d\n",
+    printf ("world task %p/%d/%d maps to new comm task %p/%d/%d\n",
            comm, nprocs, rank, newcomm, nsize, nrank);
   }
 

diff --git a/teshsuite/smpi/isp/umpire/deadlock-config.c b/teshsuite/smpi/isp/umpire/deadlock-config.c
index 0b9b410..497c9d3 100644 (file)
--- a/teshsuite/smpi/isp/umpire/deadlock-config.c
+++ b/teshsuite/smpi/isp/umpire/deadlock-config.c
@@ -5,6 +5,7 @@
 
 #define buf_size 32000
 
+int
 main (int argc, char **argv)
 {
   int nprocs = -1;

diff --git a/teshsuite/smpi/isp/umpire/errhandler-no-error.c b/teshsuite/smpi/isp/umpire/errhandler-no-error.c
index fdb3053..10239d4 100644 (file)
--- a/teshsuite/smpi/isp/umpire/errhandler-no-error.c
+++ b/teshsuite/smpi/isp/umpire/errhandler-no-error.c
@@ -41,7 +41,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   int i;
   char processor_name[128];
   int namelen = 128;

diff --git a/teshsuite/smpi/isp/umpire/errhandler-no-free.c b/teshsuite/smpi/isp/umpire/errhandler-no-free.c
index 3870ad5..2d55368 100644 (file)
--- a/teshsuite/smpi/isp/umpire/errhandler-no-free.c
+++ b/teshsuite/smpi/isp/umpire/errhandler-no-free.c
@@ -41,7 +41,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   int i;
   char processor_name[128];
   int namelen = 128;

diff --git a/teshsuite/smpi/isp/umpire/group-no-error-exhaustive.c b/teshsuite/smpi/isp/umpire/group-no-error-exhaustive.c
index a2bdbd3..01e7b75 100644 (file)
--- a/teshsuite/smpi/isp/umpire/group-no-error-exhaustive.c
+++ b/teshsuite/smpi/isp/umpire/group-no-error-exhaustive.c
@@ -22,7 +22,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int i;

diff --git a/teshsuite/smpi/isp/umpire/group-no-free-exhaustive.c b/teshsuite/smpi/isp/umpire/group-no-free-exhaustive.c
index be2f596..d2c9a74 100644 (file)
--- a/teshsuite/smpi/isp/umpire/group-no-free-exhaustive.c
+++ b/teshsuite/smpi/isp/umpire/group-no-free-exhaustive.c
@@ -22,7 +22,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int i;

diff --git a/teshsuite/smpi/isp/umpire/hello.c b/teshsuite/smpi/isp/umpire/hello.c
index fa0e706..20832d3 100644 (file)
--- a/teshsuite/smpi/isp/umpire/hello.c
+++ b/teshsuite/smpi/isp/umpire/hello.c
@@ -11,13 +11,14 @@
    hello.c -- simple hello world app
 
  */
-
+#include <stdio.h>
 #ifndef lint
 static char *rcsid = "$Header: /usr/gapps/asde/cvs-vault/umpire/tests/hello.c,v 1.2 2000/12/04 19:09:46 bronis Exp $";
 #endif
 
 #include "mpi.h"
 
+int
 main (int argc, char **argv)
 {
   int nprocs = -1;

diff --git a/teshsuite/smpi/isp/umpire/lost-request-waitall.c b/teshsuite/smpi/isp/umpire/lost-request-waitall.c
index cf7da83..4a6051b 100644 (file)
--- a/teshsuite/smpi/isp/umpire/lost-request-waitall.c
+++ b/teshsuite/smpi/isp/umpire/lost-request-waitall.c
@@ -14,7 +14,7 @@ static char *rcsid =
 
 #define buf_size 128
 
-mydelay ()                     /* about 6 seconds */
+int mydelay ()                 /* about 6 seconds */
 {
   int i;
   int val;
@@ -32,7 +32,7 @@ main (int argc, char **argv)
   int rank = -1;
   int tag1 = 31;
   int tag2 = 32;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf0[buf_size];

diff --git a/teshsuite/smpi/isp/umpire/no-error-interleaved-isend.c b/teshsuite/smpi/isp/umpire/no-error-interleaved-isend.c
index 762ce39..e40a9c4 100644 (file)
--- a/teshsuite/smpi/isp/umpire/no-error-interleaved-isend.c
+++ b/teshsuite/smpi/isp/umpire/no-error-interleaved-isend.c
@@ -19,7 +19,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf[buf_size];

diff --git a/teshsuite/smpi/isp/umpire/no-error-persistent-all-completions.c b/teshsuite/smpi/isp/umpire/no-error-persistent-all-completions.c
index 03267e3..eb77c9c 100644 (file)
--- a/teshsuite/smpi/isp/umpire/no-error-persistent-all-completions.c
+++ b/teshsuite/smpi/isp/umpire/no-error-persistent-all-completions.c
@@ -20,7 +20,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf[BUF_SIZE * 2];

diff --git a/teshsuite/smpi/isp/umpire/no-error-persistent-test.c b/teshsuite/smpi/isp/umpire/no-error-persistent-test.c
index 1fac72d..930178c 100644 (file)
--- a/teshsuite/smpi/isp/umpire/no-error-persistent-test.c
+++ b/teshsuite/smpi/isp/umpire/no-error-persistent-test.c
@@ -19,7 +19,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf[BUF_SIZE * 2];

diff --git a/teshsuite/smpi/isp/umpire/no-error-persistent-testpartial.c b/teshsuite/smpi/isp/umpire/no-error-persistent-testpartial.c
index 9f0323e..fd2a82e 100644 (file)
--- a/teshsuite/smpi/isp/umpire/no-error-persistent-testpartial.c
+++ b/teshsuite/smpi/isp/umpire/no-error-persistent-testpartial.c
@@ -19,7 +19,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf[BUF_SIZE * 2];

diff --git a/teshsuite/smpi/isp/umpire/no-error-persistent-waitpartial.c b/teshsuite/smpi/isp/umpire/no-error-persistent-waitpartial.c
index d64207b..1ff4276 100644 (file)
--- a/teshsuite/smpi/isp/umpire/no-error-persistent-waitpartial.c
+++ b/teshsuite/smpi/isp/umpire/no-error-persistent-waitpartial.c
@@ -19,7 +19,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf[BUF_SIZE * 2];

diff --git a/teshsuite/smpi/isp/umpire/no-error-persistent.c b/teshsuite/smpi/isp/umpire/no-error-persistent.c
index 10f502d..8b157b3 100644 (file)
--- a/teshsuite/smpi/isp/umpire/no-error-persistent.c
+++ b/teshsuite/smpi/isp/umpire/no-error-persistent.c
@@ -19,7 +19,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf[BUF_SIZE * 2];

diff --git a/teshsuite/smpi/isp/umpire/no-error-vector-isend.c b/teshsuite/smpi/isp/umpire/no-error-vector-isend.c
index e217177..0c1fc09 100644 (file)
--- a/teshsuite/smpi/isp/umpire/no-error-vector-isend.c
+++ b/teshsuite/smpi/isp/umpire/no-error-vector-isend.c
@@ -19,7 +19,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf[buf_size];

diff --git a/teshsuite/smpi/isp/umpire/op-no-error.c b/teshsuite/smpi/isp/umpire/op-no-error.c
index 1cf7bb7..6f4cf31 100644 (file)
--- a/teshsuite/smpi/isp/umpire/op-no-error.c
+++ b/teshsuite/smpi/isp/umpire/op-no-error.c
@@ -44,7 +44,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   int i;
   char processor_name[128];
   int namelen = 128;

diff --git a/teshsuite/smpi/isp/umpire/op-no-free.c b/teshsuite/smpi/isp/umpire/op-no-free.c
index 21cd5ae..f611504 100644 (file)
--- a/teshsuite/smpi/isp/umpire/op-no-free.c
+++ b/teshsuite/smpi/isp/umpire/op-no-free.c
@@ -44,7 +44,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   int i;
   char processor_name[128];
   int namelen = 128;

diff --git a/teshsuite/smpi/isp/umpire/partial-recv-exhaustive.c b/teshsuite/smpi/isp/umpire/partial-recv-exhaustive.c
index f942daa..03bcddd 100644 (file)
--- a/teshsuite/smpi/isp/umpire/partial-recv-exhaustive.c
+++ b/teshsuite/smpi/isp/umpire/partial-recv-exhaustive.c
@@ -27,7 +27,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int bbuf[(BUF_SIZE + MPI_BSEND_OVERHEAD) * 2 * NUM_BSEND_TYPES];

diff --git a/teshsuite/smpi/isp/umpire/partial-recv-persistent.c b/teshsuite/smpi/isp/umpire/partial-recv-persistent.c
index c97dfb5..81fbd8a 100644 (file)
--- a/teshsuite/smpi/isp/umpire/partial-recv-persistent.c
+++ b/teshsuite/smpi/isp/umpire/partial-recv-persistent.c
@@ -21,7 +21,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf[BUF_SIZE * 2 + SLOP];

diff --git a/teshsuite/smpi/isp/umpire/partial-recv-persistent2.c b/teshsuite/smpi/isp/umpire/partial-recv-persistent2.c
index 25786ea..336da22 100644 (file)
--- a/teshsuite/smpi/isp/umpire/partial-recv-persistent2.c
+++ b/teshsuite/smpi/isp/umpire/partial-recv-persistent2.c
@@ -21,7 +21,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf[BUF_SIZE * 2 + SLOP];

diff --git a/teshsuite/smpi/isp/umpire/partial-recv-persistent3.c b/teshsuite/smpi/isp/umpire/partial-recv-persistent3.c
index 547ace9..ef15c1c 100644 (file)
--- a/teshsuite/smpi/isp/umpire/partial-recv-persistent3.c
+++ b/teshsuite/smpi/isp/umpire/partial-recv-persistent3.c
@@ -21,7 +21,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf[BUF_SIZE * 2 + SLOP];

diff --git a/teshsuite/smpi/isp/umpire/partial-recv-persistent4.c b/teshsuite/smpi/isp/umpire/partial-recv-persistent4.c
index d63c5b5..1a7f292 100644 (file)
--- a/teshsuite/smpi/isp/umpire/partial-recv-persistent4.c
+++ b/teshsuite/smpi/isp/umpire/partial-recv-persistent4.c
@@ -21,7 +21,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int buf[BUF_SIZE * 2 + SLOP];

diff --git a/teshsuite/smpi/isp/umpire/partial-recv.c b/teshsuite/smpi/isp/umpire/partial-recv.c
index 669021d..59835fb 100644 (file)
--- a/teshsuite/smpi/isp/umpire/partial-recv.c
+++ b/teshsuite/smpi/isp/umpire/partial-recv.c
@@ -39,11 +39,13 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
-  int i, basic_extent;
-  int blocklens[3], displs[3];
+  int i;
+  MPI_Aint basic_extent;
+  int blocklens[3];
+  MPI_Aint displs[3];
   MPI_Datatype structtypes[3]; 
   MPI_Datatype newtype[2]; 
   MPI_Request aReq[2];
@@ -79,13 +81,13 @@ main (int argc, char **argv)
   
   MPI_Type_extent (newtype[0], &basic_extent);
   if (basic_extent != sizeof (test_small_struct_t)) {
-    fprintf (stderr, "(%d): Unexpected extent for small struct\n");
+    fprintf (stderr, "(%d): Unexpected extent for small struct\n", rank);
     MPI_Abort (MPI_COMM_WORLD, 666);
   }
   
   MPI_Type_extent (newtype[1], &basic_extent);
   if (basic_extent != sizeof (test_big_struct_t)) {
-    fprintf (stderr, "(%d): Unexpected extent for big struct\n");
+    fprintf (stderr, "(%d): Unexpected extent for big struct\n", rank);
     MPI_Abort (MPI_COMM_WORLD, 666);
   }
 

diff --git a/teshsuite/smpi/isp/umpire/pt2pt-byte-int-mismatch.c b/teshsuite/smpi/isp/umpire/pt2pt-byte-int-mismatch.c
index 36c71f5..13fbd55 100644 (file)
--- a/teshsuite/smpi/isp/umpire/pt2pt-byte-int-mismatch.c
+++ b/teshsuite/smpi/isp/umpire/pt2pt-byte-int-mismatch.c
@@ -26,7 +26,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int bbuf[(BUF_SIZE + MPI_BSEND_OVERHEAD) * 2 * NUM_BSEND_TYPES];

diff --git a/teshsuite/smpi/isp/umpire/remote_group-no-error.c b/teshsuite/smpi/isp/umpire/remote_group-no-error.c
index 0b01269..a93eff6 100644 (file)
--- a/teshsuite/smpi/isp/umpire/remote_group-no-error.c
+++ b/teshsuite/smpi/isp/umpire/remote_group-no-error.c
@@ -21,7 +21,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int i;

diff --git a/teshsuite/smpi/isp/umpire/type-commit-twice.c b/teshsuite/smpi/isp/umpire/type-commit-twice.c
index 4d25326..76debc3 100644 (file)
--- a/teshsuite/smpi/isp/umpire/type-commit-twice.c
+++ b/teshsuite/smpi/isp/umpire/type-commit-twice.c
@@ -19,7 +19,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   MPI_Datatype newtype;

diff --git a/teshsuite/smpi/isp/umpire/type-no-error-exhaustive-with-isends.c b/teshsuite/smpi/isp/umpire/type-no-error-exhaustive-with-isends.c
index b2ceace..8826ce2 100644 (file)
--- a/teshsuite/smpi/isp/umpire/type-no-error-exhaustive-with-isends.c
+++ b/teshsuite/smpi/isp/umpire/type-no-error-exhaustive-with-isends.c
@@ -54,7 +54,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int i, j, k, basic_extent;

diff --git a/teshsuite/smpi/isp/umpire/type-no-error-exhaustive.c b/teshsuite/smpi/isp/umpire/type-no-error-exhaustive.c
index 22e2eb2..6515ea2 100644 (file)
--- a/teshsuite/smpi/isp/umpire/type-no-error-exhaustive.c
+++ b/teshsuite/smpi/isp/umpire/type-no-error-exhaustive.c
@@ -20,7 +20,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int i;

diff --git a/teshsuite/smpi/isp/umpire/type-no-error.c b/teshsuite/smpi/isp/umpire/type-no-error.c
index 2cac143..35333a1 100644 (file)
--- a/teshsuite/smpi/isp/umpire/type-no-error.c
+++ b/teshsuite/smpi/isp/umpire/type-no-error.c
@@ -19,7 +19,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   MPI_Datatype newtype, newtype2;

diff --git a/teshsuite/smpi/isp/umpire/type-no-free-exhaustive.c b/teshsuite/smpi/isp/umpire/type-no-free-exhaustive.c
index a321842..7cd7c0c 100644 (file)
--- a/teshsuite/smpi/isp/umpire/type-no-free-exhaustive.c
+++ b/teshsuite/smpi/isp/umpire/type-no-free-exhaustive.c
@@ -20,7 +20,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   int i;

diff --git a/teshsuite/smpi/isp/umpire/type-no-free.c b/teshsuite/smpi/isp/umpire/type-no-free.c
index 19abfd9..f8dab6e 100644 (file)
--- a/teshsuite/smpi/isp/umpire/type-no-free.c
+++ b/teshsuite/smpi/isp/umpire/type-no-free.c
@@ -19,7 +19,7 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
   MPI_Datatype newtype;