[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.3-160-g457e379

Service Account noreply at mpich.org
Mon Nov 10 09:27:11 CST 2014


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  457e3795e5b70187cda06a2807486b36fc851988 (commit)
       via  75aa4e32bfb145fd1bec71844ccc4bba1047a444 (commit)
      from  4743a3bab1157f51dee30ff6111d6c0f9ec4c28b (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/457e3795e5b70187cda06a2807486b36fc851988

commit 457e3795e5b70187cda06a2807486b36fc851988
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date:   Fri Nov 7 10:15:00 2014 -0600

    Fix: be able to skip MPIX tests for Aint_add/diff
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/test/mpi/.gitignore b/test/mpi/.gitignore
index 3a62aca..6a193c7 100644
--- a/test/mpi/.gitignore
+++ b/test/mpi/.gitignore
@@ -264,6 +264,7 @@
 /f77/io/ioaint.h
 /f77/pt2pt/attr1aints.h
 /f77/rma/addsize.h
+/f77/rma/testlist
 /f77/spawn/type1aint.h
 /f77/spawn/connaccf
 /f77/spawn/namepubf
@@ -361,6 +362,7 @@
 /f90/pt2pt/statusesf90
 /f90/rma/Makefile.sm
 /f90/rma/testlist
+/f90/rma/testlist.in
 /f90/rma/winaccf90.f90
 /f90/rma/winerrf90.f90
 /f90/rma/winfencef90.f90
@@ -377,6 +379,7 @@
 /f90/rma/winnamef90
 /f90/rma/winscale1f90
 /f90/rma/winscale2f90
+/f90/rma/aintf90.f90
 /f90/rma/c2f2cwinf90.f90
 /f90/rma/c2f902cwin.c
 /f90/spawn/Makefile.sm
@@ -438,6 +441,7 @@
 /f08/datatype/trf08
 /f08/datatype/get_elem_d
 /f08/datatype/get_elem_u
+/f08/rma/testlist
 /group/errstring
 /group/grouptest
 /group/groupcreate
diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac
index 70c05f5..d8f0ef8 100644
--- a/test/mpi/configure.ac
+++ b/test/mpi/configure.ac
@@ -1648,6 +1648,9 @@ AC_OUTPUT(maint/testmerge \
           errors/f77/testlist \
           errors/f90/testlist \
           impls/testlist \
+          f77/rma/testlist \
+          f90/rma/testlist \
+          f08/rma/testlist \
           impls/Makefile \
 	  impls/hydra/Makefile \
 	  impls/hydra/proc_binding.sh \
diff --git a/test/mpi/f08/rma/Makefile.am b/test/mpi/f08/rma/Makefile.am
index d12e47a..4c7a3eb 100644
--- a/test/mpi/f08/rma/Makefile.am
+++ b/test/mpi/f08/rma/Makefile.am
@@ -27,8 +27,12 @@ noinst_PROGRAMS = \
     c2f2cwinf08     \
     baseattrwinf08  \
     winattrf08      \
-    winattr2f08	    \
-    aintf08
+    winattr2f08
+
+if BUILD_MPIX_TESTS
+noinst_PROGRAMS += aintf08
+endif
+
 ## this test was commented out in the simplemake version...
 ##    allocmem
 
diff --git a/test/mpi/f08/rma/testlist b/test/mpi/f08/rma/testlist.in
similarity index 84%
rename from test/mpi/f08/rma/testlist
rename to test/mpi/f08/rma/testlist.in
index a1f3d01..3ae2013 100644
--- a/test/mpi/f08/rma/testlist
+++ b/test/mpi/f08/rma/testlist.in
@@ -10,4 +10,4 @@ c2f2cwinf08 1
 baseattrwinf08 1
 winattrf08 1
 winattr2f08 1
-aintf08 2 strict=false
+ at mpix@ aintf08 2 strict=false
diff --git a/test/mpi/f77/rma/Makefile.am b/test/mpi/f77/rma/Makefile.am
index 6c82c44..06acf65 100644
--- a/test/mpi/f77/rma/Makefile.am
+++ b/test/mpi/f77/rma/Makefile.am
@@ -25,8 +25,12 @@ noinst_PROGRAMS = \
     c2f2cwinf     \
     baseattrwinf  \
     winattrf      \
-    winattr2f	  \
-    aintf
+    winattr2f
+
+if BUILD_MPIX_TESTS
+noinst_PROGRAMS += aintf
+endif
+
 ## this test was commented out in the simplemake version...
 ##    allocmem
 
diff --git a/test/mpi/f77/rma/testlist b/test/mpi/f77/rma/testlist.in
similarity index 76%
rename from test/mpi/f77/rma/testlist
rename to test/mpi/f77/rma/testlist.in
index 20112b8..4884257 100644
--- a/test/mpi/f77/rma/testlist
+++ b/test/mpi/f77/rma/testlist.in
@@ -10,4 +10,4 @@ c2f2cwinf 1
 baseattrwinf 1
 winattrf 1
 winattr2f 1
-aintf 2 strict=false xfail=ticket1877
+ at mpix@ aintf 2 strict=false xfail=ticket1877
diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am
index 10ab17c..2a02b67 100644
--- a/test/mpi/rma/Makefile.am
+++ b/test/mpi/rma/Makefile.am
@@ -138,8 +138,11 @@ noinst_PROGRAMS =          \
     get-struct             \
     rput_local_comp        \
     racc_local_comp        \
-    at_complete            \
-    aint
+    at_complete
+
+if BUILD_MPIX_TESTS
+noinst_PROGRAMS += aint
+endif
 
 strided_acc_indexed_LDADD       = $(LDADD) -lm
 strided_acc_onelock_LDADD       = $(LDADD) -lm
diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in
index d5d35dc..9a6a7d5 100644
--- a/test/mpi/rma/testlist.in
+++ b/test/mpi/rma/testlist.in
@@ -124,7 +124,7 @@ win_shared_zerobyte 4 mpiversion=3.0
 win_shared_put_flush_get 4 mpiversion=3.0
 get-struct 2
 at_complete 2
-aint 2 strict=false
+ at mpix@ aint 2 strict=false
 
 ## This test is not strictly correct.  This was meant to test out the
 ## case when MPI_Test is not nonblocking.  However, we ended up

http://git.mpich.org/mpich.git/commitdiff/75aa4e32bfb145fd1bec71844ccc4bba1047a444

commit 75aa4e32bfb145fd1bec71844ccc4bba1047a444
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date:   Fri Nov 7 09:58:12 2014 -0600

    Add support for skipping individual MPIX tests
    
    If --enable_strictmpi is passed to configure, we need to skip non-MPI-standard tests.
    Here is how you can do that. Suppose you have an MPIX test foobar, you need
    
    1) In Makefile.am, to skip building foobar, add
    
        if BUILD_MPIX_TESTS
        noinst_PROGRAMS += foobar
        endif
    
      Note: There is no tab indentions before noinst_PROGRAMS
    
    2) In testlist.in (please convert testlist to testlist.in if necessary), to skip
       running foobar, add
    
        @mpix@ foobar 2
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac
index 1bf4a62..70c05f5 100644
--- a/test/mpi/configure.ac
+++ b/test/mpi/configure.ac
@@ -464,6 +464,18 @@ if test "$FROM_MPICH" = "yes" -a "$enable_strictmpi" = "no" ; then
 fi
 AC_SUBST(MPI_HAS_MPIX)
 
+# Prepend @mpix@ to lines of tests in testlist.in which are MPIX tests so that
+# we can skip running these tests when we do strict MPI test.
+mpix="#"
+if test "$enable_strictmpi" = "no"; then
+    mpix=""
+fi
+AC_SUBST(mpix)
+
+# Use the conditional variable BUILD_MPIX_TESTS to conditionally add MPIX tests
+# to noninst_PROGRAMS to skip building the tests when we do strict MPI test
+AM_CONDITIONAL([BUILD_MPIX_TESTS], [test "$enable_strictmpi" = "no"])
+
 # preserve these values across a reconfigure
 AC_ARG_VAR([WRAPPER_CFLAGS],[])
 AC_ARG_VAR([WRAPPER_CPPFLAGS],[])

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

Summary of changes:
 test/mpi/.gitignore                        |    4 ++++
 test/mpi/configure.ac                      |   15 +++++++++++++++
 test/mpi/f08/rma/Makefile.am               |    8 ++++++--
 test/mpi/f08/rma/{testlist => testlist.in} |    2 +-
 test/mpi/f77/rma/Makefile.am               |    8 ++++++--
 test/mpi/f77/rma/{testlist => testlist.in} |    2 +-
 test/mpi/rma/Makefile.am                   |    7 +++++--
 test/mpi/rma/testlist.in                   |    2 +-
 8 files changed, 39 insertions(+), 9 deletions(-)
 rename test/mpi/f08/rma/{testlist => testlist.in} (84%)
 rename test/mpi/f77/rma/{testlist => testlist.in} (76%)


hooks/post-receive
-- 
MPICH primary repository


More information about the commits mailing list