change some tests to avoid useless global variables

diff --git a/teshsuite/smpi/mpich3-test/rma/contention_put.c b/teshsuite/smpi/mpich3-test/rma/contention_put.c
index b549c9b..28b9952 100644 (file)
--- a/teshsuite/smpi/mpich3-test/rma/contention_put.c
+++ b/teshsuite/smpi/mpich3-test/rma/contention_put.c
@@ -19,13 +19,23 @@
 #define MAXELEMS      6400
 #define COUNT         1000
 
 #define MAXELEMS      6400
 #define COUNT         1000
 

-static int me, nproc;

 static const int verbose = 0;
 
 int test_put(void);
 
 int test_put(void)
 {
 static const int verbose = 0;
 
 int test_put(void);
 
 int test_put(void)
 {

+    int me, nproc;
+    MPI_Comm_size(MPI_COMM_WORLD, &nproc);
+    MPI_Comm_rank(MPI_COMM_WORLD, &me);
+
+    assert(COUNT <= MAXELEMS);
+
+    if (me == 0 && verbose) {
+        printf("Test starting on %d processes\n", nproc);
+        fflush(stdout);
+    }
+

     MPI_Win dst_win;
     double *dst_buf;
     double src_buf[MAXELEMS];
     MPI_Win dst_win;
     double *dst_buf;
     double src_buf[MAXELEMS];


@@ -87,15 +97,6 @@ int main(int argc, char *argv[])
     int errs = 0;
 
     MTest_Init(&argc, &argv);
     int errs = 0;
 
     MTest_Init(&argc, &argv);

-    MPI_Comm_size(MPI_COMM_WORLD, &nproc);
-    MPI_Comm_rank(MPI_COMM_WORLD, &me);
-
-    assert(COUNT <= MAXELEMS);
-
-    if (me == 0 && verbose) {
-        printf("Test starting on %d processes\n", nproc);
-        fflush(stdout);
-    }

 
     errs = test_put();
 
 
     errs = test_put();
 

diff --git a/teshsuite/smpi/mpich3-test/rma/contention_putget.c b/teshsuite/smpi/mpich3-test/rma/contention_putget.c
index 312cf31..abfdb2b 100644 (file)
--- a/teshsuite/smpi/mpich3-test/rma/contention_putget.c
+++ b/teshsuite/smpi/mpich3-test/rma/contention_putget.c
@@ -18,12 +18,15 @@
 #define MAXELEMS      6400
 #define COUNT         1000
 
 #define MAXELEMS      6400
 #define COUNT         1000
 

-static int me, nproc;
+

 static const int verbose = 0;
 
 void test_put(void);
 void test_put(void)
 {
 static const int verbose = 0;
 
 void test_put(void);
 void test_put(void)
 {

+    int me, nproc;
+    MPI_Comm_size(MPI_COMM_WORLD, &nproc);
+    MPI_Comm_rank(MPI_COMM_WORLD, &me);

     MPI_Win dst_win;
     double *dst_buf;
     double src_buf[MAXELEMS];
     MPI_Win dst_win;
     double *dst_buf;
     double src_buf[MAXELEMS];


@@ -77,6 +80,7 @@ void test_put(void)
 int main(int argc, char *argv[])
 {
     MPI_Init(&argc, &argv);
 int main(int argc, char *argv[])
 {
     MPI_Init(&argc, &argv);

+    int me, nproc;

     MPI_Comm_size(MPI_COMM_WORLD, &nproc);
     MPI_Comm_rank(MPI_COMM_WORLD, &me);
 
     MPI_Comm_size(MPI_COMM_WORLD, &nproc);
     MPI_Comm_rank(MPI_COMM_WORLD, &me);