A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix dist n°37
[simgrid.git]
/
teshsuite
/
smpi
/
mpich3-test
/
runtests
diff --git
a/teshsuite/smpi/mpich3-test/runtests
b/teshsuite/smpi/mpich3-test/runtests
index
721da48
..
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";
@@
-72,6
+72,9
@@
$testCount = 0; # Used with batchRun to count tests.
$batrundir = "."; # Set to the directory into which to run the examples
$execarg="";
$batrundir = "."; # Set to the directory into which to run the examples
$execarg="";
+$wrapparg="";
+
+$enabled_privatization = 1; # disable tests that need SMPI privatization to run
# TAP (Test Anything Protocol) output
my $tapoutput = 0;
my $tapfile = '';
# TAP (Test Anything Protocol) output
my $tapoutput = 0;
my $tapfile = '';
@@
-154,7
+157,7
@@
foreach $_ (@ARGV) {
elsif (/--?maxnp=(.*)/) { $np_max = $1; }
elsif (/--?tests=(.*)/) { $listfiles = $1; }
elsif (/--?srcdir=(.*)/) { $srcdir = $1;
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/running
-power:1e9 --cfg=smpi/async-small-
thresh:65536"; }
elsif (/--?verbose/) { $verbose = 1; }
elsif (/--?showprogress/) { $showProgress = 1; }
elsif (/--?debug/) { $debug = 1; }
elsif (/--?verbose/) { $verbose = 1; }
elsif (/--?showprogress/) { $showProgress = 1; }
elsif (/--?debug/) { $debug = 1; }
@@
-162,6
+165,13
@@
foreach $_ (@ARGV) {
elsif (/--?batchdir=(.*)/) { $batrundir = $1; }
elsif (/--?timeoutarg=(.*)/) { $timeoutArgPattern = $1; }
elsif (/--?execarg=(.*)/) { $execarg = "$execarg $1"; }
elsif (/--?batchdir=(.*)/) { $batrundir = $1; }
elsif (/--?timeoutarg=(.*)/) { $timeoutArgPattern = $1; }
elsif (/--?execarg=(.*)/) { $execarg = "$execarg $1"; }
+ elsif (/--?privatization=(.*)/) {
+print STDERR "privatization called\n";
+$enabled_privatization = $1; }
+ elsif (/VALGRIND_COMMAND=(.*)/) {
+ $valgrind = $1; }
+ elsif (/VALGRIND_OPTIONS=(.*)/) {
+ $wrapparg = "-wrapper \"$valgrind $1\""; }
elsif (/--?xmlfile=(.*)/) {
$xmlfile = $1;
if (! ($xmlfile =~ /^\//)) {
elsif (/--?xmlfile=(.*)/) {
$xmlfile = $1;
if (! ($xmlfile =~ /^\//)) {
@@
-207,14
+217,6
@@
foreach $_ (@ARGV) {
# we do not know at this point how many tests will be run, so do
# not print a test plan line like "1..450" until the very end
}
# we do not know at this point how many tests will be run, so do
# not print a test plan line like "1..450" until the very end
}
- else {
- print STDERR "Unrecognized argument $_\n";
- print STDERR "runtests [-tests=testfile] [-np=nprocesses] \
- [-maxnp=max-nprocesses] [-srcdir=location-of-tests] \
- [-xmlfile=filename ] [-noxmlclose] \
- [-verbose] [-showprogress] [-debug] [-batch]\n";
- exit(1);
- }
}
# Perform any post argument processing
}
# Perform any post argument processing
@@
-366,6
+368,7
@@
sub RunList {
my $requiresMPIX = "";
my $progEnv = "";
my $mpiVersion = "";
my $requiresMPIX = "";
my $progEnv = "";
my $mpiVersion = "";
+ my $needs_privatization = 0;
my $xfail = "";
if ($#args >= 1) { $np = $args[1]; }
# Process the key=value arguments
my $xfail = "";
if ($#args >= 1) { $np = $args[1]; }
# Process the key=value arguments
@@
-394,6
+397,9
@@
sub RunList {
elsif ($key eq "mpiversion") {
$mpiVersion = $value;
}
elsif ($key eq "mpiversion") {
$mpiVersion = $value;
}
+ elsif ($key eq "needs_privatization") {
+ $needs_privatization = $value;
+ }
elsif ($key eq "strict") {
$requiresStrict = $value
}
elsif ($key eq "strict") {
$requiresStrict = $value
}
@@
-415,6
+421,13
@@
sub RunList {
# skip empty lines
if ($programname eq "") { next; }
# skip empty lines
if ($programname eq "") { next; }
+ #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");
+ next;
+ }
+
if ($np eq "") { $np = $np_default; }
if ($np_max > 0 && $np > $np_max) { $np = $np_max; }
if ($np eq "") { $np = $np_default; }
if ($np_max > 0 && $np > $np_max) { $np = $np_max; }
@@
-602,7
+615,7
@@
sub RunMPIProgram {
&$InitForTest();
}
print STDOUT "Env includes $progEnv\n" if $verbose;
&$InitForTest();
}
print STDOUT "Env includes $progEnv\n" if $verbose;
- print STDOUT "$mpiexec $mpiexecArgs $np_arg $np $program_wrapper ./$programname $progArgs\n" if $verbose;
+ print STDOUT "$mpiexec $
wrapparg $
mpiexecArgs $np_arg $np $program_wrapper ./$programname $progArgs\n" if $verbose;
print STDOUT "." if $showProgress;
# Save and restore the environment if necessary before running mpiexec.
if ($progEnv ne "") {
print STDOUT "." if $showProgress;
# Save and restore the environment if necessary before running mpiexec.
if ($progEnv ne "") {
@@
-616,7
+629,7
@@
sub RunMPIProgram {
}
}
}
}
}
}
- open ( MPIOUT, "$mpiexec $np_arg $np $mpiexecArgs $program_wrapper ./$programname $progArgs 2>&1 |" ) ||
+ open ( MPIOUT, "$mpiexec $
wrapparg $
np_arg $np $mpiexecArgs $program_wrapper ./$programname $progArgs 2>&1 |" ) ||
die "Could not run ./$programname\n";
if ($progEnv ne "") {
%ENV = %saveEnv;
die "Could not run ./$programname\n";
if ($progEnv ne "") {
%ENV = %saveEnv;
@@
-627,7
+640,7
@@
sub RunMPIProgram {
}
else {
if ($verbose) {
}
else {
if ($verbose) {
- $inline = "$mpiexec $np_arg $np $program_wrapper ./$programname\n";
+ $inline = "$mpiexec $
wrapparg $
np_arg $np $program_wrapper ./$programname\n";
}
else {
$inline = "";
}
else {
$inline = "";