[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-48-gfcbf526
Service Account
noreply at mpich.org
Mon Mar 17 11:15:52 CDT 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 fcbf5261262070b327aa329ae6b7f9c76cf879dd (commit)
from e45b4c853e02a0d702a3eea800967903a3bad419 (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/fcbf5261262070b327aa329ae6b7f9c76cf879dd
commit fcbf5261262070b327aa329ae6b7f9c76cf879dd
Author: Huiwei Lu <huiweilu at mcs.anl.gov>
Date: Thu Mar 13 10:50:31 2014 -0500
Fixes test scripts in test/mpi
Supports 'make dist', 'make -j' and others.
1. Several tests has been added to test/mpi since the ticket 1720 was
created. These new tests are added to corresponding Makefile.am.
2. There is one minor thing I am not sure in this fix. I don't know the
different of noinst_HEADERS and nodist_noinst_HEADERS, so I just put all
head files under noinst_HEADERS (in test/mpi/Makefile.am).
3. Windows project files like adapt.vcproj were deleted in commit
ba3badffa335a4e8841b02ad377241b271f27528, they should be removed in
test/mpi/basic/Makefile.am too.
4. MPICH ABI removed support for MPI::Distgraphcomm, so distgraphcxx.cxx
is changed to be not compiled in cxx/topo.
5. One minor change in help description in test/mpi/runtests.in. So when you
run './runtests -batch', you will get help message directing you to
README.
Fixes #1720
Signed-off-by: Antonio J. Pena <apenya at mcs.anl.gov>
diff --git a/test/mpi/Makefile.am b/test/mpi/Makefile.am
index 218aaed..d7ddbb6 100644
--- a/test/mpi/Makefile.am
+++ b/test/mpi/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/Makefile.mtest
ACLOCAL_AMFLAGS = -I confdb
static_subdirs = util attr basic datatype coll comm errhan group info init \
- pt2pt rma topo errors manual perf mpi_t impls
+ pt2pt rma topo errors manual perf mpi_t impls ckpoint ft
all_lang_subdirs = f77 cxx f90
# DIST_SUBDIRS must be a superset of SUBDIRS, and automake must be able to
@@ -26,7 +26,7 @@ EXTRA_DIST = maint/common.defn maint/f77tof90.in maint/testmerge.in maint/update
DISTCLEANFILES = config.system
## here are automakefile entries for the test/mpi/include dir
-noinst_HEADERS = include/mpitest.h include/mpitestcxx.h include/mpithreadtest.h
+noinst_HEADERS = include/mpitest.h include/mpitestcxx.h include/mpithreadtest.h include/dtypes.h rma/squelch.h errors/rma/win_sync.h
nodist_noinst_HEADERS = include/mpitestconf.h
# Need to patch some things up:
diff --git a/test/mpi/basic/Makefile.am b/test/mpi/basic/Makefile.am
index 19c21af..64b296a 100644
--- a/test/mpi/basic/Makefile.am
+++ b/test/mpi/basic/Makefile.am
@@ -23,7 +23,3 @@ noinst_PROGRAMS = \
noinst_HEADERS = GetOpt.h
netpipe_SOURCES = netmpi.c GetOpt.c
adapt_SOURCES = adapt.c GetOpt.c
-
-EXTRA_DIST = adapt.vcproj netpipe.vcproj patterns.vcproj \
- sendrecv.vcproj simple.vcproj srtest.vcproj
-
diff --git a/test/mpi/cxx/Makefile.am b/test/mpi/cxx/Makefile.am
index 641ff7d..490684d 100644
--- a/test/mpi/cxx/Makefile.am
+++ b/test/mpi/cxx/Makefile.am
@@ -9,6 +9,6 @@ include $(top_srcdir)/Makefile_cxx.mtest
EXTRA_DIST = testlist.in
-static_subdirs = util attr pt2pt init info comm coll datatype errhan
+static_subdirs = util attr pt2pt init info comm coll datatype errhan topo
SUBDIRS = $(static_subdirs) $(iodir) $(rmadir) $(spawndir)
DIST_SUBDIRS = $(static_subdirs) io rma spawn
diff --git a/test/mpi/cxx/topo/Makefile.am b/test/mpi/cxx/topo/Makefile.am
index 1729ba5..7df4fd8 100644
--- a/test/mpi/cxx/topo/Makefile.am
+++ b/test/mpi/cxx/topo/Makefile.am
@@ -7,11 +7,8 @@
include $(top_srcdir)/Makefile_cxx.mtest
-EXTRA_DIST = testlist
+EXTRA_DIST = testlist distgraphcxx.cxx
# avoid having to write many "foo_SOURCES = foo.cxx" lines because
# automake is too limited to figure this out for itself
AM_DEFAULT_SOURCE_EXT = .cxx
-
-noinst_PROGRAMS = distgraphcxx
-
diff --git a/test/mpi/f90/Makefile.am b/test/mpi/f90/Makefile.am
index 14d851e..f18ae2d 100644
--- a/test/mpi/f90/Makefile.am
+++ b/test/mpi/f90/Makefile.am
@@ -10,6 +10,6 @@ include $(top_srcdir)/Makefile_f90.mtest
EXTRA_DIST = testlist.in
static_subdirs = util timer attr coll datatype pt2pt info comm topo ext init \
- misc f90types
+ misc f90types profile
SUBDIRS = $(static_subdirs) $(rmadir) $(spawndir) $(iodir)
DIST_SUBDIRS = $(static_subdirs) rma spawn io
diff --git a/test/mpi/runtests.in b/test/mpi/runtests.in
index 05379b9..9976d33 100644
--- a/test/mpi/runtests.in
+++ b/test/mpi/runtests.in
@@ -255,7 +255,7 @@ else {
# Process any files
if ($listfiles eq "") {
if ($batchRun) {
- print STDERR "An implicit list of tests is not permitted in batch mode\n";
+ print STDERR "An implicit list of tests is not permitted in batch mode. See README for more details\n";
exit(1);
}
else {
diff --git a/test/mpi/util/Makefile.am b/test/mpi/util/Makefile.am
index 770c81f..9f33fdd 100644
--- a/test/mpi/util/Makefile.am
+++ b/test/mpi/util/Makefile.am
@@ -6,7 +6,7 @@ dtypes.$(OBJEXT): dtypes.c
nbc_pmpi_adapter.$(OBJEXT): nbc_pmpi_adapter.c
all-local: mtest.$(OBJEXT) dtypes.$(OBJEXT) nbc_pmpi_adapter.$(OBJEXT)
-EXTRA_PROGRAMS = mtestcheck
+EXTRA_PROGRAMS = mtestcheck dtypes
mtestcheck_SOURCES = mtestcheck.c mtest.c
# exploiting the NBC PMPI adapter is still very much a manual process...
-----------------------------------------------------------------------
Summary of changes:
test/mpi/Makefile.am | 4 ++--
test/mpi/basic/Makefile.am | 4 ----
test/mpi/cxx/Makefile.am | 2 +-
test/mpi/cxx/topo/Makefile.am | 5 +----
test/mpi/f90/Makefile.am | 2 +-
test/mpi/runtests.in | 2 +-
test/mpi/util/Makefile.am | 2 +-
7 files changed, 7 insertions(+), 14 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list