[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-58-gd2680c3

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  d2680c3c91a5508a934de4169960f8589740e235 (commit)
      from  e7142a23e39c5c35943431913779ebd5c1bc3bfc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/d2680c3c91a5508a934de4169960f8589740e235

commit d2680c3c91a5508a934de4169960f8589740e235
Author: Sangmin Seo <sseo at anl.gov>
Date:   Thu Jun 11 01:07:14 2015 -0500

    tsuite: add MPI version setting to runtests.
    
    To specify the MPI version to use in runtests, -mpiversion option and
    the environment variable MPITEST_MPIVERSION were added to runtests.
    If neither -mpiversion nor MPITEST_MPIVERSION is set, the default MPI
    version, which has been detected by configure, is used for testing.
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/test/mpi/runtests.in b/test/mpi/runtests.in
index a6d05f3..185e90f 100644
--- a/test/mpi/runtests.in
+++ b/test/mpi/runtests.in
@@ -167,6 +167,15 @@ if (defined($ENV{'MPITEST_TIMELIMITARG'})) {
     $timelimitArg = $ENV{'MPITEST_TIMELIMITARG'};
 }
 
+# MPI version for testing
+if (defined($ENV{'MPITEST_MPIVERSION'})) {
+    $_ = $ENV{'MPITEST_MPIVERSION'};
+    if (/(\d+)\.(\d+)/) {
+        $MPIMajorVersion = $1;
+        $MPIMinorVersion = $2;
+    }
+}
+
 #---------------------------------------------------------------------------
 # Process arguments and override any defaults
 #---------------------------------------------------------------------------
@@ -176,6 +185,8 @@ foreach $_ (@ARGV) {
 	# we don't want to bother to try and find it.
 	$mpiexec = $1; 
     }
+    elsif (/--?mpiversion=(\d+)\.(\d+)/) { $MPIMajorVersion = $1;
+                                           $MPIMinorVersion = $2; }
     elsif (/--?np=(\d+)/)   { $np_default = $1; }
     elsif (/--?maxnp=(\d+)/) { $np_max = $1; }
     elsif (/--?ppn=(\d+)/)  { $ppnMax = $1; }
@@ -252,7 +263,7 @@ foreach $_ (@ARGV) {
 	print STDERR "runtests [-tests=testfile] [-np=nprocesses] \
         [-maxnp=max-nprocesses] [-srcdir=location-of-tests] \
         [-ppn=max-proc-per-node] [-ppnarg=string] \
-        [-timelimitarg=string] \
+        [-timelimitarg=string] [-mpiversion=major.minor] \
         [-xmlfile=filename ] [-tapfile=filename ] \
         [-junitfile=filename ] [-noxmlclose] \
         [-verbose] [-showprogress] [-debug] [-batch]\n";

-----------------------------------------------------------------------

Summary of changes:
 test/mpi/runtests.in |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
MPICH primary repository