[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b2-19-g9fee068
Service Account
noreply at mpich.org
Tue Apr 28 21:19:23 CDT 2015
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 9fee068ca22d54d4c0b6d205f6214cfdb4174e14 (commit)
from 7c0f2967f758e25000bbaba9181726cbf8864357 (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/9fee068ca22d54d4c0b6d205f6214cfdb4174e14
commit 9fee068ca22d54d4c0b6d205f6214cfdb4174e14
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date: Tue Apr 28 09:56:24 2015 -0500
tsuite: disable namepub tests when not configured
The random configuration tests revealed that MPI name publishing
features could be disabled at configure time, but the test suite
would still run tests for them.
Signed-off-by: Sangmin Seo <sseo at anl.gov>
diff --git a/configure.ac b/configure.ac
index 1dd4e30..7a5c461 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2747,6 +2747,7 @@ fi
if test -n "$nameserv_name" ; then
AC_DEFINE(HAVE_NAMEPUB_SERVICE,1,[Define if a name publishing service is available])
fi
+export nameserv_name
AM_CONDITIONAL([BUILD_NAMEPUB_FILE],[test "X$nameserv_name" = "Xfile"])
AM_CONDITIONAL([BUILD_NAMEPUB_PMI],[test "X$nameserv_name" = "Xpmi"])
diff --git a/test/mpi/.gitignore b/test/mpi/.gitignore
index d1c2967..5c3bd05 100644
--- a/test/mpi/.gitignore
+++ b/test/mpi/.gitignore
@@ -187,6 +187,7 @@
/cxx/io/writeatallbenosx
/cxx/io/writeallbenosx
/cxx/pt2pt/bsend1cxx
+/cxx/spawn/testlist
/cxx/spawn/namepubx
/cxx/spawn/spawnintrax
/cxx/spawn/spawnintrax
@@ -231,6 +232,7 @@
/errors/pt2pt/proberank
/errors/pt2pt/truncmsg2
/errors/spawn/badport
+/errors/spawn/testlist
/errors/topo/cartsmall
/f77/testlist
/f77/attr/baseattr
@@ -451,6 +453,7 @@
/f08/datatype/get_elem_d
/f08/datatype/get_elem_u
/f08/rma/testlist
+/f08/spawn/testlist
/f08/io/iwriteatallf90.f90
/f08/io/iwriteatallf90
/f08/io/i_fcoll_test
@@ -1030,6 +1033,7 @@
/rma/win_shared_noncontig_put
/rma/wincall
/rma/window_creation
+/spawn/testlist
/spawn/concurrent_spawns
/spawn/disconnect
/spawn/disconnect2
diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac
index 02ea53c..4e9f418 100644
--- a/test/mpi/configure.ac
+++ b/test/mpi/configure.ac
@@ -415,6 +415,11 @@ if test "$FROM_MPICH" = yes ; then
if test -n "$MPICH_ENABLE_CXX" ; then
enable_cxx=$MPICH_ENABLE_CXX
fi
+ namepub_tests="#"
+ if test -n "$nameserv_name" ; then
+ namepub_tests=""
+ fi
+ AC_SUBST(namepub_tests)
fi
# Some MPI-2 implementations (including some of the MPICH shared-memory
@@ -1521,6 +1526,7 @@ AC_OUTPUT(maint/testmerge \
rma/Makefile \
rma/testlist \
spawn/Makefile \
+ spawn/testlist \
topo/Makefile \
io/Makefile \
io/testlist \
@@ -1587,6 +1593,7 @@ AC_OUTPUT(maint/testmerge \
f08/init/Makefile \
f08/info/Makefile \
f08/spawn/Makefile \
+ f08/spawn/testlist \
f08/timer/Makefile \
f08/ext/Makefile \
f08/misc/Makefile \
@@ -1604,6 +1611,7 @@ AC_OUTPUT(maint/testmerge \
cxx/init/Makefile \
cxx/rma/Makefile \
cxx/spawn/Makefile \
+ cxx/spawn/testlist \
cxx/topo/Makefile \
threads/Makefile \
threads/pt2pt/Makefile \
@@ -1624,6 +1632,7 @@ AC_OUTPUT(maint/testmerge \
errors/pt2pt/Makefile \
errors/rma/Makefile \
errors/spawn/Makefile \
+ errors/spawn/testlist \
errors/topo/Makefile \
errors/io/Makefile \
errors/cxx/Makefile \
diff --git a/test/mpi/cxx/spawn/testlist b/test/mpi/cxx/spawn/testlist.in
similarity index 68%
rename from test/mpi/cxx/spawn/testlist
rename to test/mpi/cxx/spawn/testlist.in
index 449fc1d..1dac780 100644
--- a/test/mpi/cxx/spawn/testlist
+++ b/test/mpi/cxx/spawn/testlist.in
@@ -1,4 +1,4 @@
-namepubx 2
+ at namepub_tests@namepubx 2
spawnintrax 1
spawnintrax 2
spawnargvx 1
diff --git a/test/mpi/errors/spawn/testlist b/test/mpi/errors/spawn/testlist
deleted file mode 100644
index 42e6293..0000000
--- a/test/mpi/errors/spawn/testlist
+++ /dev/null
@@ -1,3 +0,0 @@
-badport 2
-unpub 1
-lookup_name 1
diff --git a/test/mpi/errors/spawn/testlist.in b/test/mpi/errors/spawn/testlist.in
new file mode 100644
index 0000000..e8ba5e3
--- /dev/null
+++ b/test/mpi/errors/spawn/testlist.in
@@ -0,0 +1,3 @@
+badport 2
+ at namepub_tests@unpub 1
+ at namepub_tests@lookup_name 1
diff --git a/test/mpi/f08/spawn/testlist b/test/mpi/f08/spawn/testlist.in
similarity index 60%
rename from test/mpi/f08/spawn/testlist
rename to test/mpi/f08/spawn/testlist.in
index 6bc64d0..8232e91 100644
--- a/test/mpi/f08/spawn/testlist
+++ b/test/mpi/f08/spawn/testlist.in
@@ -1,7 +1,7 @@
-namepubf90 2
+ at namepub_tests@namepubf90 2
spawnf90 1
spawnargvf90 1
-connaccf90 2
+ at namepub_tests@connaccf90 2
spawnmultf90 1
spawnmult2f90 2
spawnargvf03 1
diff --git a/test/mpi/f77/spawn/testlist.in b/test/mpi/f77/spawn/testlist.in
index 251c4d0..c521a92 100644
--- a/test/mpi/f77/spawn/testlist.in
+++ b/test/mpi/f77/spawn/testlist.in
@@ -1,6 +1,6 @@
-namepubf 2
+ at namepub_tests@namepubf 2
spawnf 1
@F77SPAWNARGTEST at spawnargvf 1
-connaccf 2
+ at namepub_tests@connaccf 2
@F77SPAWNARGTEST at spawnmultf 1
spawnmult2f 2
diff --git a/test/mpi/spawn/testlist b/test/mpi/spawn/testlist.in
similarity index 94%
rename from test/mpi/spawn/testlist
rename to test/mpi/spawn/testlist.in
index 799162a..94c4d5b 100644
--- a/test/mpi/spawn/testlist
+++ b/test/mpi/spawn/testlist.in
@@ -1,4 +1,4 @@
-namepub 2
+ at namepub_tests@namepub 2
spawn1 1
spawn2 1
spawninfo1 1
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 +
test/mpi/.gitignore | 4 ++++
test/mpi/configure.ac | 9 +++++++++
test/mpi/cxx/spawn/{testlist => testlist.in} | 2 +-
test/mpi/errors/spawn/testlist | 3 ---
test/mpi/errors/spawn/testlist.in | 3 +++
test/mpi/f08/spawn/{testlist => testlist.in} | 4 ++--
test/mpi/f77/spawn/testlist.in | 4 ++--
test/mpi/spawn/{testlist => testlist.in} | 2 +-
9 files changed, 23 insertions(+), 9 deletions(-)
rename test/mpi/cxx/spawn/{testlist => testlist.in} (68%)
delete mode 100644 test/mpi/errors/spawn/testlist
create mode 100644 test/mpi/errors/spawn/testlist.in
rename test/mpi/f08/spawn/{testlist => testlist.in} (60%)
rename test/mpi/spawn/{testlist => testlist.in} (94%)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list