[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1b1-91-gda5d554

[mysql vizuser]

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  da5d55417f26f263d7c94233fce0c25d68e2c26d (commit)
      from  307e5fc6a7fc64cccd6956e18470008df71d2a77 (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/da5d55417f26f263d7c94233fce0c25d68e2c26d

commit da5d55417f26f263d7c94233fce0c25d68e2c26d
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Wed Oct 9 14:43:56 2013 -0500

    Disable xfail test from running by default
    
    xfails are primarily for our consumption, so we disable them by
    default. This will result in cleaner test output for the average
    user.
    
    Also note that if the testsuite is configured in strict MPI mode,
    all strict tests, regardless of xfail, will run.
    
    Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>

diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac
index 574411d..b63ee20 100644
--- a/test/mpi/configure.ac
+++ b/test/mpi/configure.ac
@@ -172,6 +172,11 @@ AC_ARG_ENABLE(threads,
 	requiring a specific --enable-threads argument.],,
 	[enable_threads=default])
 
+AC_ARG_ENABLE(xfail,
+	[AC_HELP_STRING([--enable-xfail],
+		[Run tests marked for expected failure])],,
+	[enable_xfail=no])
+
 AC_ARG_WITH(mpi,
 	[AC_HELP_STRING([--with-mpi=dir],
 		[Use the selected MPI; compilation scripts for mpicc,
@@ -351,6 +356,14 @@ if test "$enable_checkpointing" = "yes" ; then
 fi
 AC_SUBST(ckpointdir)
 
+#
+# Only run xfail tests if enabled
+RUN_XFAIL=false
+if test "$enable_xfail" = "yes" ; then
+    RUN_XFAIL=true
+fi
+AC_SUBST(RUN_XFAIL)
+
 PAC_LOAD_BASE_CACHE
 PAC_VPATH_CHECK()
 PAC_PROG_MAKE
diff --git a/test/mpi/runtests.in b/test/mpi/runtests.in
index 8f8ea0a..ad15bb5 100644
--- a/test/mpi/runtests.in
+++ b/test/mpi/runtests.in
@@ -45,6 +45,7 @@ $MPIMinorVersion = "@MPI_SUBVERSION@";
 $mpiexec = "@MPIEXEC@";    # Name of mpiexec program (including path, if necessary)
 $testIsStrict = "@MPI_IS_STRICT@";
 $MPIhasMPIX   = "@MPI_HAS_MPIX@";
+$runxfail     = "@RUN_XFAIL@";
 $np_arg  = "-n";         # Name of argument to specify the number of processes
 $err_count = 0;          # Number of programs that failed.
 $total_run = 0;          # Number of programs tested
@@ -456,6 +457,15 @@ sub RunList {
             $xfail = '';
         }
 
+	if ($xfail ne '' && $runxfail eq "false") {
+	    # Skip xfail tests if they are not configured. Strict MPI tests that are
+	    # marked xfail will still run with --enable-strictmpi.
+            unless (-d $programname) {
+		SkippedTest($programname, $np, $workdir, "xfail tests disabled");
+	    }
+	    next;
+	}
+
         if (lc($requiresMPIX) eq "true" && lc($MPIHasMPIX) eq "no") {
             unless (-d $programname) {
                 SkippedTest($programname, $np, $workdir, "tests MPIX extensions, MPIX testing disabled");

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

Summary of changes:
 test/mpi/configure.ac |   13 +++++++++++++
 test/mpi/runtests.in  |   10 ++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
MPICH primary repository