Pretend we support MPI 3.1.

[simgrid.git] / teshsuite / smpi / mpich3-test / runtests

diff --git a/teshsuite/smpi/mpich3-test/runtests b/teshsuite/smpi/mpich3-test/runtests
index 8793198..d2fb8c8 100755 (executable)
--- a/teshsuite/smpi/mpich3-test/runtests
+++ b/teshsuite/smpi/mpich3-test/runtests
@@ -40,8 +40,8 @@
 use File::Path;
 
 # Global variables
-$MPIMajorVersion = "2";
-$MPIMinorVersion = "2";
+$MPIMajorVersion = "3";
+$MPIMinorVersion = "1";
 $mpiexec = "smpirun";    # Name of mpiexec program (including path, if necessary)
 $testIsStrict = "true";
 $MPIhasMPIX   = "no";
@@ -168,10 +168,9 @@ foreach $_ (@ARGV) {
     elsif (/--?privatization=(.*)/) { 
 print STDERR "privatization called\n";
 $enabled_privatization = $1; }
-    elsif (/VALGRIND_COMMAND=(.*)/) { 
-        $valgrind = $1; }
-    elsif (/VALGRIND_OPTIONS=(.*)/) {
-         $wrapparg = "-wrapper \"$valgrind $1\""; }
+    elsif (/--?wrapper=(.*)/) {
+         $wrapparg = "-wrapper \"$1\"" if $1 ne "";
+    }
     elsif (/--?xmlfile=(.*)/) {
        $xmlfile   = $1;
        if (! ($xmlfile =~ /^\//)) {
@@ -652,6 +651,9 @@ sub RunMPIProgram {
            # Skip FORTRAN STOP
            if (/FORTRAN STOP/) { next; }
            $inline .= $_;
+           if (/^==[0-9]+== ?WARNING: ASan doesn't fully support/) {
+               next;
+           }
            if (/^\s*No [Ee]rrors\s*$/ && $found_noerror == 0) {
                $found_noerror = 1;
            }