Commit d2680c3c authored by Sangmin Seo's avatar Sangmin Seo
Browse files

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's avatarPavan Balaji <balaji@anl.gov>
parent e7142a23
......@@ -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";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment