[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-103-g320af6c

[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  320af6c9d31ff7086be34440dd6ebc8c70a72e64 (commit)
       via  57fc987eef769d803dcc921572ff48b135004708 (commit)
      from  a80086ab827272f7ada033ff3fb216652bdfc634 (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/320af6c9d31ff7086be34440dd6ebc8c70a72e64

commit 320af6c9d31ff7086be34440dd6ebc8c70a72e64
Author: Min Si <msi at il.is.s.u-tokyo.ac.jp>
Date:   Sun Jan 17 15:19:37 2016 +0900

    Added timeout info in junit/tap output for failed tests.
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/test/mpi/runtests.in b/test/mpi/runtests.in
index 2f3f3e3..32ad45b 100644
--- a/test/mpi/runtests.in
+++ b/test/mpi/runtests.in
@@ -800,7 +800,7 @@ sub RunMPIProgram {
 	}
     }
     if ($found_error) {
-	&RunTestFailed( $programname, $np, $curdir, $inline, $xfail );
+	&RunTestFailed( $programname, $np, $timeout, $curdir, $inline, $xfail );
     }
     else { 
 	&RunTestPassed( $programname, $np, $curdir, $xfail );
@@ -920,7 +920,7 @@ sub BuildMPIProgram {
 	# in the summary file (which is otherwise written by the
 	# RunMPIProgram step)
 	&RunPreMsg( $programname, $np, $curdir );
-	&RunTestFailed( $programname, $np, $curdir, "Failed to build $programname; $output", $xfail );
+	&RunTestFailed( $programname, $np, $timeout, $curdir, "Failed to build $programname; $output", $xfail );
 	&RunPostMsg( $programname, $np, $curdir );
     }
     return $rc;
@@ -1198,6 +1198,7 @@ sub RunTestPassed {
 sub RunTestFailed {
     my $programname = shift;
     my $np = shift;
+    my $timeout = shift;
     my $workdir = shift;
     my $output = shift;
     my $xfail = shift;
@@ -1225,6 +1226,7 @@ sub RunTestFailed {
         print TAPOUT "  Directory: $workdir\n";
         print TAPOUT "  File: $programname\n";
         print TAPOUT "  Num-procs: $np\n";
+        print TAPOUT "  Timeout: $timeout\n";
         print TAPOUT "  Date: \"" . localtime() . "\"\n";
 
         # The following would be nice, but it leads to unfortunate formatting in
@@ -1267,6 +1269,7 @@ sub RunTestFailed {
         print JUNITOUT "  Directory: $workdir\n";
         print JUNITOUT "  File: $programname\n";
         print JUNITOUT "  Num-procs: $np\n";
+        print JUNITOUT "  Timeout: $timeout\n";
         print JUNITOUT "  Date: \"" . localtime() . "\"\n";
 
         print JUNITOUT "  ...\n";

http://git.mpich.org/mpich.git/commitdiff/57fc987eef769d803dcc921572ff48b135004708

commit 57fc987eef769d803dcc921572ff48b135004708
Author: Min Si <msi at il.is.s.u-tokyo.ac.jp>
Date:   Sun Jan 17 14:55:02 2016 +0900

    Added timeout multiplier in test suite.
    
    Use environment variable MPITEST_TIMEOUT_MULTIPLIER (default 1) to
    change timeout value for all tests (timeout *= multiplier).
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/test/mpi/runtests.in b/test/mpi/runtests.in
index 185e90f..2f3f3e3 100644
--- a/test/mpi/runtests.in
+++ b/test/mpi/runtests.in
@@ -65,6 +65,7 @@ $np_default = 2;         # Default number of processes to use
 $np_max     = -1;        # Maximum number of processes to use (overrides any
                          # value in the test list files.  -1 is Infinity
 $defaultTimeLimit = 180; # default timeout
+$defaultTimeLimitMultiplier = 1.0; # default multiplier for timeout limit
 
 $srcdir = ".";           # Used to set the source dir for testlist files
 
@@ -112,6 +113,7 @@ my $program_wrapper = '';
 #   RUNTESTS_SHOWPROGRESS
 #   MPITEST_STOPTEST
 #   MPITEST_TIMEOUT
+#   MPITEST_TIMEOUT_MULTIPLIER
 #   MPITEST_PROGRAM_WRAPPER (Value is added after -np but before test
 #                            executable.  Tools like valgrind may be inserted
 #                            this way.)
@@ -134,6 +136,10 @@ if (defined($ENV{"MPITEST_TIMEOUT"})) {
     $defaultTimeLimit = $ENV{"MPITEST_TIMEOUT"};
 }
  
+if (defined($ENV{"MPITEST_TIMEOUT_MULTIPLIER"})) {
+    $defaultTimeLimitMultiplier = $ENV{"MPITEST_TIMEOUT_MULTIPLIER"};
+}
+
 # Define this to leave the XML output file open to receive additional data
 if (defined($ENV{'NOXMLCLOSE'}) && $ENV{'NOXMLCLOSE'} eq 'YES') {
     $closeXMLOutput = 0;
@@ -694,6 +700,7 @@ sub RunMPIProgram {
     if (defined($timeLimit) && $timeLimit =~ /^\d+$/) {
 	$timeout = $timeLimit;
     }
+    $timeout *= $defaultTimeLimitMultiplier;
     $ENV{"MPIEXEC_TIMEOUT"} = $timeout;
 
     # Handle the ppn (processes per node) option.
@@ -826,6 +833,7 @@ sub AddMPIProgram {
 	# want to treat these also as "run manually".
 	$timeout = $timeLimit;
     }
+    $timeout *= $defaultTimeLimitMultiplier;
     print BATOUT "export MPIEXEC_TIMEOUT=$timeout\n";
     
     # Run the optional setup routine. For example, the timeout tests could

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

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


hooks/post-receive
-- 
MPICH primary repository