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
rename option smpi/privatize-global-variables to smpi/privatization
[simgrid.git]
/
teshsuite
/
smpi
/
mpich3-test
/
runtests
diff --git
a/teshsuite/smpi/mpich3-test/runtests
b/teshsuite/smpi/mpich3-test/runtests
index
695f23a
..
4bd97a2
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";
@@
-73,6
+73,8
@@
$batrundir = "."; # Set to the directory into which to run the examples
$execarg="";
$wrapparg="";
$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 = '';
@@
-155,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; }
@@
-163,8
+165,9
@@
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 (/--?setenv/) { }
- elsif (/--?enable-coverage/) { }
+ elsif (/--?privatization=(.*)/) {
+print STDERR "privatization called\n";
+$enabled_privatization = $1; }
elsif (/VALGRIND_COMMAND=(.*)/) {
$valgrind = $1; }
elsif (/VALGRIND_OPTIONS=(.*)/) {
elsif (/VALGRIND_COMMAND=(.*)/) {
$valgrind = $1; }
elsif (/VALGRIND_OPTIONS=(.*)/) {
@@
-214,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
@@
-275,6
+270,7
@@
if ($batchRun) {
else {
if ($err_count) {
print "$err_count tests failed out of $total_run\n";
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";
}
if ($xmloutput) {
print "Details in $xmlfullfile\n";
}
@@
-373,6
+369,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
@@
-401,6
+398,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
}
@@
-422,6
+422,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; }
@@
-651,6
+658,8
@@
sub RunMPIProgram {
print STDERR "Unexpected output in $programname: $_";
if (!$found_error) {
$found_error = 1;
print STDERR "Unexpected output in $programname: $_";
if (!$found_error) {
$found_error = 1;
+ $failed_tests .= $programname;
+ $failed_tests .= " ";
$err_count ++;
}
}
$err_count ++;
}
}
@@
-659,6
+668,8
@@
sub RunMPIProgram {
print STDERR "Program $programname exited without No Errors\n";
if (!$found_error) {
$found_error = 1;
print STDERR "Program $programname exited without No Errors\n";
if (!$found_error) {
$found_error = 1;
+ $failed_tests .= $programname;
+ $failed_tests .= " ";
$err_count ++;
}
}
$err_count ++;
}
}
@@
-674,6
+685,8
@@
sub RunMPIProgram {
if ($signal_num != 0) {
print STDERR "Program $programname exited with signal $signal_num\n";
}
if ($signal_num != 0) {
print STDERR "Program $programname exited with signal $signal_num\n";
}
+ $failed_tests .= $programname;
+ $failed_tests .= " ";
$found_error = 1;
$err_count ++;
}
$found_error = 1;
$err_count ++;
}