Merge pull request #237 from oar-team/upstream

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

diff --git a/teshsuite/smpi/mpich3-test/runtests b/teshsuite/smpi/mpich3-test/runtests
index 5b0f88e..8793198 100755 (executable)
--- a/teshsuite/smpi/mpich3-test/runtests
+++ b/teshsuite/smpi/mpich3-test/runtests
@@ -40,8 +40,8 @@
 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";
@@ -157,7 +157,7 @@ foreach $_ (@ARGV) {
     elsif (/--?maxnp=(.*)/) { $np_max = $1; }
     elsif (/--?tests=(.*)/) { $listfiles = $1; }
     elsif (/--?srcdir=(.*)/) { $srcdir = $1;
-       $mpiexec="$mpiexec  -platform ${srcdir}/../../../../examples/platforms/small_platform_with_routers.xml -hostfile ${srcdir}/../../hostfile_coll --log=root.thr:critical --cfg=smpi/running-power:1e9  --cfg=smpi/async-small-thresh:65536"; }
+       $mpiexec="$mpiexec  -platform ${srcdir}/../../../../examples/platforms/small_platform_with_routers.xml -hostfile ${srcdir}/../../hostfile_coll --log=root.thr:critical --cfg=smpi/host-speed:1e9  --cfg=smpi/async-small-thresh:65536"; }
     elsif (/--?verbose/) { $verbose = 1; }
     elsif (/--?showprogress/) { $showProgress = 1; }
     elsif (/--?debug/) { $debug = 1; }
@@ -270,6 +270,7 @@ if ($batchRun) {
 else {
     if ($err_count) {
        print "$err_count tests failed out of $total_run\n";
+       print "Failing tests : $failed_tests\n";
        if ($xmloutput) {
            print "Details in $xmlfullfile\n";
        }
@@ -281,6 +282,7 @@ else {
         print "TAP formatted results in $tapfullfile\n";
     }
 }
+exit ($err_count > 0);
 #\f
 # ---------------------------------------------------------------------------
 # Routines
@@ -421,7 +423,7 @@ sub RunList {
        # skip empty lines
        if ($programname eq "") { next; }
 
-       #if privatization is disabled, and if the test needs it, ignore it
+       # if privatization is disabled, and if the test needs it, ignore it
        if ($needs_privatization == 1 &&
                $enabled_privatization != 1) {
                 SkippedTest($programname, $np, $workdir, "requires SMPI privatization");
@@ -657,6 +659,8 @@ sub RunMPIProgram {
                print STDERR "Unexpected output in $programname: $_";
                if (!$found_error) {
                    $found_error = 1;
+                   $failed_tests .= $programname;
+                   $failed_tests .= " ";
                    $err_count ++;
                }
            }
@@ -665,6 +669,8 @@ sub RunMPIProgram {
            print STDERR "Program $programname exited without No Errors\n";
            if (!$found_error) {
                $found_error = 1;
+               $failed_tests .= $programname;
+               $failed_tests .= " ";
                $err_count ++;
            }
        }
@@ -680,6 +686,8 @@ sub RunMPIProgram {
                if ($signal_num != 0) {
                    print STDERR "Program $programname exited with signal $signal_num\n";
                }
+               $failed_tests .= $programname;
+               $failed_tests .= " ";
                $found_error = 1;
                $err_count ++;
            }