[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-284-g5e791c1

[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  5e791c1d151812036d15459205e87693ceac67df (commit)
      from  defc9d25d88e14e9191db9a1baa4b2498d34b426 (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/5e791c1d151812036d15459205e87693ceac67df

commit 5e791c1d151812036d15459205e87693ceac67df
Author: Pavan Balaji <balaji at anl.gov>
Date:   Wed Jul 22 12:40:40 2015 -0500

    Setup a configure option to disable comm_overlap tests.
    
    These tests fail with ch3:sock.  We are not planning to support such
    capability.  This configure option gives us an easy way to disable
    those tests in our testing for that configuration.
    
    Refs #2108
    
    Signed-off-by: Huiwei Lu <huiweilu at mcs.anl.gov>

diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac
index acc04bf..785423e 100644
--- a/test/mpi/configure.ac
+++ b/test/mpi/configure.ac
@@ -174,6 +174,11 @@ AC_ARG_ENABLE(ft-tests,
 		[Include tests for fault tolerance (default)])],,
 	[enable_ft_tests=yes])
 
+AC_ARG_ENABLE(comm-overlap-tests,
+	[AC_HELP_STRING([--enable-comm-overlap-tests],
+		[Include tests for communicator overlap (default)])],,
+	[enable_comm_overlap_tests=yes])
+
 AC_ARG_ENABLE(checkfaults,
 	[AC_HELP_STRING([--enable-checkfaults],
 		[Add some tests for checking on handling of faults in user programs])],,
@@ -370,6 +375,15 @@ if test "$first_pm" = "hydra" -a  "$enable_strictmpi" = "no" -a "$enable_ft_test
 fi
 AC_SUBST(ftdir)
 
+# Setup "comm_overlap" variable based on whether comm_overlap tests
+# are enabled or not
+if test "${enable_comm_overlap_tests}" = "yes" ; then
+   comm_overlap=""
+else
+   comm_overlap="#"
+fi
+AC_SUBST(comm_overlap)
+
 # 
 # Only run the threads tests if multiple is specified
 if test "$enable_threads" = "multiple" -o "$enable_threads" = "runtime" ; then
@@ -1620,11 +1634,13 @@ AC_OUTPUT(maint/testmerge \
           threads/pt2pt/Makefile \
           threads/util/Makefile \
           threads/comm/Makefile \
+          threads/comm/testlist \
           threads/init/Makefile \
           threads/mpi_t/Makefile \
           threads/spawn/Makefile \
           threads/rma/Makefile \
           threads/coll/Makefile \
+          threads/coll/testlist \
           errors/Makefile \
           errors/attr/Makefile \
           errors/basic/Makefile \
diff --git a/test/mpi/threads/coll/Makefile.am b/test/mpi/threads/coll/Makefile.am
index 82c994e..70549f6 100644
--- a/test/mpi/threads/coll/Makefile.am
+++ b/test/mpi/threads/coll/Makefile.am
@@ -7,7 +7,7 @@
 
 include $(top_srcdir)/threads/Makefile_threads.mtest
 
-EXTRA_DIST = testlist
+EXTRA_DIST = testlist.in
 
 noinst_PROGRAMS = iallred allred
 
diff --git a/test/mpi/threads/coll/testlist b/test/mpi/threads/coll/testlist
deleted file mode 100644
index ef60079..0000000
--- a/test/mpi/threads/coll/testlist
+++ /dev/null
@@ -1,2 +0,0 @@
-allred 2 xfail=ticket2108
-iallred 2 mpiversion=3.0 xfail=ticket2108
diff --git a/test/mpi/threads/coll/testlist.in b/test/mpi/threads/coll/testlist.in
new file mode 100644
index 0000000..885434c
--- /dev/null
+++ b/test/mpi/threads/coll/testlist.in
@@ -0,0 +1,2 @@
+ at comm_overlap@ allred 2 xfail=ticket2108
+ at comm_overlap@ iallred 2 mpiversion=3.0 xfail=ticket2108
diff --git a/test/mpi/threads/comm/Makefile.am b/test/mpi/threads/comm/Makefile.am
index 38831f2..efc7545 100644
--- a/test/mpi/threads/comm/Makefile.am
+++ b/test/mpi/threads/comm/Makefile.am
@@ -7,7 +7,7 @@
 
 include $(top_srcdir)/threads/Makefile_threads.mtest
 
-EXTRA_DIST = testlist
+EXTRA_DIST = testlist.in
 
 noinst_PROGRAMS = ctxdup dup_leak_test comm_dup_deadlock comm_create_threads comm_create_group_threads comm_idup ctxidup idup_nb idup_comm_gen
 
diff --git a/test/mpi/threads/comm/testlist b/test/mpi/threads/comm/testlist.in
similarity index 61%
rename from test/mpi/threads/comm/testlist
rename to test/mpi/threads/comm/testlist.in
index a29993d..9378505 100644
--- a/test/mpi/threads/comm/testlist
+++ b/test/mpi/threads/comm/testlist.in
@@ -3,7 +3,7 @@ dup_leak_test 2
 comm_dup_deadlock 4
 comm_create_threads 4
 comm_create_group_threads 4
-comm_idup 4 mpiversion=3.0 xfail=ticket2108
-ctxidup 4 mpiversion=3.0 xfail=ticket2108
+ at comm_overlap@ comm_idup 4 mpiversion=3.0 xfail=ticket2108
+ at comm_overlap@ ctxidup 4 mpiversion=3.0 xfail=ticket2108
 idup_nb 4 mpiversion=3.0 xfail=ticket2283
 idup_comm_gen 4 mpiversion=3.0 xfail=ticket2286

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

Summary of changes:
 test/mpi/configure.ac                           |   16 ++++++++++++++++
 test/mpi/threads/coll/Makefile.am               |    2 +-
 test/mpi/threads/coll/testlist                  |    2 --
 test/mpi/threads/coll/testlist.in               |    2 ++
 test/mpi/threads/comm/Makefile.am               |    2 +-
 test/mpi/threads/comm/{testlist => testlist.in} |    4 ++--
 6 files changed, 22 insertions(+), 6 deletions(-)
 delete mode 100644 test/mpi/threads/coll/testlist
 create mode 100644 test/mpi/threads/coll/testlist.in
 rename test/mpi/threads/comm/{testlist => testlist.in} (61%)


hooks/post-receive
-- 
MPICH primary repository