Actually tell the testsuite that we are claiming to support MPI 2.2.

.. And deactivate the tests that disprove that claim.

diff --git a/teshsuite/smpi/mpich3-test/coll/testlist b/teshsuite/smpi/mpich3-test/coll/testlist
index d434849..6158b7a 100644 (file)
--- a/teshsuite/smpi/mpich3-test/coll/testlist
+++ b/teshsuite/smpi/mpich3-test/coll/testlist
@@ -73,8 +73,8 @@ red_scat_block2 5 mpiversion=2.2
 red_scat_block2 10 mpiversion=2.2
 redscatblk3 8 mpiversion=2.2
 redscatblk3 10 mpiversion=2.2
 red_scat_block2 10 mpiversion=2.2
 redscatblk3 8 mpiversion=2.2
 redscatblk3 10 mpiversion=2.2

-redscatbkinter 8 mpiversion=2.2
-redscatbkinter 10 mpiversion=2.2
+#redscatbkinter 8 mpiversion=2.2
+#redscatbkinter 10 mpiversion=2.2

 scantst 4
 exscan 10
 exscan2 5
 scantst 4
 exscan 10
 exscan2 5

diff --git a/teshsuite/smpi/mpich3-test/f77/coll/testlist b/teshsuite/smpi/mpich3-test/f77/coll/testlist
index 61b5b03..dfdd15c 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/coll/testlist
+++ b/teshsuite/smpi/mpich3-test/f77/coll/testlist
@@ -3,10 +3,10 @@ exscanf 5
 #alltoallwf 7
 alltoallvf 7
 inplacef 4
 #alltoallwf 7
 alltoallvf 7
 inplacef 4

-reducelocalf 2 mpiversion=2.2
+#reducelocalf 2 mpiversion=2.2

 redscatf 4
 split_typef 4 mpiversion=3.0
 nonblockingf 4 mpiversion=3.0
 redscatf 4
 split_typef 4 mpiversion=3.0
 nonblockingf 4 mpiversion=3.0

-vw_inplacef 4 mpiversion=2.2
-red_scat_blockf 4 mpiversion=2.2
+#vw_inplacef 4 mpiversion=2.2
+#red_scat_blockf 4 mpiversion=2.2

 nonblocking_inpf 4 mpiversion=3.0
 nonblocking_inpf 4 mpiversion=3.0

diff --git a/teshsuite/smpi/mpich3-test/f77/topo/testlist b/teshsuite/smpi/mpich3-test/f77/topo/testlist
index 7e041d8..bcfcbcd 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/topo/testlist
+++ b/teshsuite/smpi/mpich3-test/f77/topo/testlist
@@ -1,3 +1,3 @@
 cartcrf 4
 cartcrf 4

-dgraph_wgtf 4 mpiversion=2.2
-dgraph_unwgtf 4 mpiversion=3.0
+#dgraph_wgtf 4 mpiversion=2.2
+#dgraph_unwgtf 4 mpiversion=3.0

diff --git a/teshsuite/smpi/mpich3-test/f90/coll/testlist b/teshsuite/smpi/mpich3-test/f90/coll/testlist
index 522e1a1..a85a50c 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/coll/testlist
+++ b/teshsuite/smpi/mpich3-test/f90/coll/testlist
@@ -4,10 +4,10 @@ exscanf90 5
 #alltoallwf90 7
 alltoallvf90 7
 inplacef90 4
 #alltoallwf90 7
 alltoallvf90 7
 inplacef90 4

-reducelocalf90 2 mpiversion=2.2
+#reducelocalf90 2 mpiversion=2.2

 redscatf90 4
 split_typef90 4 mpiversion=3.0
 #nonblockingf90 4 mpiversion=3.0
 redscatf90 4
 split_typef90 4 mpiversion=3.0
 #nonblockingf90 4 mpiversion=3.0

-vw_inplacef90 4 mpiversion=2.2
-red_scat_blockf90 4 mpiversion=2.2
+#vw_inplacef90 4 mpiversion=2.2
+#red_scat_blockf90 4 mpiversion=2.2

 #nonblocking_inpf90 4 mpiversion=3.0
 #nonblocking_inpf90 4 mpiversion=3.0

diff --git a/teshsuite/smpi/mpich3-test/runtests b/teshsuite/smpi/mpich3-test/runtests
index 5b0f88e..c51bc2a 100755 (executable)
--- a/teshsuite/smpi/mpich3-test/runtests
+++ b/teshsuite/smpi/mpich3-test/runtests
@@ -40,8 +40,8 @@
 use File::Path;
 
 # Global variables
 use File::Path;
 
 # Global variables

-$MPIMajorVersion = "1";
-$MPIMinorVersion = "1";
+$MPIMajorVersion = "2";
+$MPIMinorVersion = "2";

 $mpiexec = "smpirun";    # Name of mpiexec program (including path, if necessary)
 $testIsStrict = "true";
 $MPIhasMPIX   = "no";
 $mpiexec = "smpirun";    # Name of mpiexec program (including path, if necessary)
 $testIsStrict = "true";
 $MPIhasMPIX   = "no";