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 fa09f8e3f18eb59cfc95e4dbc79bc6be930bb129 (commit) via fe2bec0fa9f06cb2dc583c2307326813ffad7a70 (commit) from 644714d0a5ba1b8a21cb2f557714f99bd2e6a1df (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/fa09f8e3f18eb59cfc95e4dbc79bc6be93... commit fa09f8e3f18eb59cfc95e4dbc79bc6be930bb129 Author: Ken Raffenetti <[email protected]> Date: Thu Aug 14 14:27:30 2014 -0500 testsuite: add library dependencies for tests Fixes dependency issues in the testsuite. Some tests use functions that might be located in additional libraries (e.g. on Solaris). Use AC_SEARCH_LIBS to find and add them when necessary. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac index 0af3ba0..81cbd95 100644 --- a/test/mpi/configure.ac +++ b/test/mpi/configure.ac @@ -664,6 +664,18 @@ if test "x$enable_long_double" = "xyes" && \ AC_DEFINE(USE_LONG_DOUBLE_COMPLEX,1,[Define if tests with long double complex should be included]) fi +# extra libraries may be necessary on some platforms (solaris) for spawn/join +if test "$spawndir" = "spawn" ; then + PAC_PUSH_FLAG(LIBS) + AC_SEARCH_LIBS(socket,socket,socklib=$LIBS) + PAC_POP_FLAG(LIBS) + PAC_PUSH_FLAG(LIBS) + AC_SEARCH_LIBS(gethostbyname,nsl,nslib=$LIBS) + PAC_POP_FLAG(LIBS) + AC_SUBST(socklib) + AC_SUBST(nslib) +fi + # Headers needed for threads tests if test "$threadsdir" = "threads" ; then # Check for needed threads headers and needed and optional routines diff --git a/test/mpi/manual/Makefile.am b/test/mpi/manual/Makefile.am index 4ba8d9e..040a021 100644 --- a/test/mpi/manual/Makefile.am +++ b/test/mpi/manual/Makefile.am @@ -18,5 +18,7 @@ noinst_HEADERS = connectstuff.h testconnectserial_SOURCES = testconnectserial.c tchandlers.c tcutil.c testconnectserial_LDADD = $(LDADD) -lm +singjoin_LDADD = $(LDADD) @socklib@ @nslib@ + CLEANFILES += test-port diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am index 67a99b1..99f928a 100644 --- a/test/mpi/rma/Makefile.am +++ b/test/mpi/rma/Makefile.am @@ -182,3 +182,5 @@ mutex_bench_shm_ordered_SOURCES = mutex_bench.c mcs-mutex.c mcs-mutex.h linked_list_bench_lock_shr_nocheck_SOURCES = linked_list_bench_lock_shr.c linked_list_bench_lock_shr_nocheck_CPPFLAGS = -DUSE_MODE_NOCHECK $(AM_CPPFLAGS) + +ircpi_LDADD = $(LDADD) -lm diff --git a/test/mpi/spawn/Makefile.am b/test/mpi/spawn/Makefile.am index a7d300d..938271d 100644 --- a/test/mpi/spawn/Makefile.am +++ b/test/mpi/spawn/Makefile.am @@ -41,3 +41,4 @@ noinst_PROGRAMS = \ pgroup_intercomm_test \ concurrent_spawns +join_LDADD = $(LDADD) @socklib@ @nslib@ http://git.mpich.org/mpich.git/commitdiff/fe2bec0fa9f06cb2dc583c2307326813ff... commit fe2bec0fa9f06cb2dc583c2307326813ffad7a70 Author: Ken Raffenetti <[email protected]> Date: Wed Aug 13 17:16:10 2014 -0500 rely on interlib dependencies in compile wrappers When a platform supports inter-library dependecies, remove MPICH dependencies from the compile wrappers. Specifying them can confuse the linker and cause a run-time "library not found" error for the resulting binary. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/confdb/aclocal_libs.m4 b/confdb/aclocal_libs.m4 index 8400977..9dff742 100644 --- a/confdb/aclocal_libs.m4 +++ b/confdb/aclocal_libs.m4 @@ -38,22 +38,17 @@ AC_DEFUN([PAC_SET_HEADER_LIB_PATH],[ # taking priority AS_IF([test -n "${with_$1_include}"], - [PAC_APPEND_FLAG([-I${with_$1_include}],[CPPFLAGS]) - PAC_APPEND_FLAG([-I${with_$1_include}],[WRAPPER_CPPFLAGS])], + [PAC_APPEND_FLAG([-I${with_$1_include}],[CPPFLAGS])], [AS_IF([test -n "${with_$1}"], - [PAC_APPEND_FLAG([-I${with_$1}/include],[CPPFLAGS]) - PAC_APPEND_FLAG([-I${with_$1}/include],[WRAPPER_CPPFLAGS])])]) + [PAC_APPEND_FLAG([-I${with_$1}/include],[CPPFLAGS])])]) AS_IF([test -n "${with_$1_lib}"], - [PAC_APPEND_FLAG([-L${with_$1_lib}],[LDFLAGS]) - PAC_APPEND_FLAG([-L${with_$1_lib}],[WRAPPER_LDFLAGS])], + [PAC_APPEND_FLAG([-L${with_$1_lib}],[LDFLAGS])], [AS_IF([test -n "${with_$1}"], dnl is adding lib64 by default really the right thing to do? What if dnl we are on a 32-bit host that happens to have both lib dirs available? [PAC_APPEND_FLAG([-L${with_$1}/lib64],[LDFLAGS]) - PAC_APPEND_FLAG([-L${with_$1}/lib64],[WRAPPER_LDFLAGS]) - PAC_APPEND_FLAG([-L${with_$1}/lib],[LDFLAGS]) - PAC_APPEND_FLAG([-L${with_$1}/lib],[WRAPPER_LDFLAGS])])]) + PAC_APPEND_FLAG([-L${with_$1}/lib],[LDFLAGS])])]) ]) diff --git a/configure.ac b/configure.ac index 5164887..18e4868 100644 --- a/configure.ac +++ b/configure.ac @@ -5972,9 +5972,12 @@ AC_OUTPUT_COMMANDS([chmod a+x test/commands/cmdtests]) AC_DEFINE(HAVE_MPICHCONF,1,[Define so that we can test whether the mpichconf.h file has been included]) -# Add the LDFLAGS/LIBS we got so far to WRAPPERs -WRAPPER_LDFLAGS="$WRAPPER_LDFLAGS $LDFLAGS" -WRAPPER_LIBS="$WRAPPER_LIBS $LIBS" +# If the platform does not support inter-library dependencies, +# add the LDFLAGS/LIBS we got so far to WRAPPERs +if test "$INTERLIB_DEPS" = "no" ; then + WRAPPER_LDFLAGS="$WRAPPER_LDFLAGS $LDFLAGS" + WRAPPER_LIBS="$WRAPPER_LIBS $LIBS" +fi if test "$USE_PMI2_API" = "yes" ; then AC_DEFINE(USE_PMI2_API, 1, [Define if PMI2 API must be used]) ----------------------------------------------------------------------- Summary of changes: confdb/aclocal_libs.m4 | 13 ++++--------- configure.ac | 9 ++++++--- test/mpi/configure.ac | 12 ++++++++++++ test/mpi/manual/Makefile.am | 2 ++ test/mpi/rma/Makefile.am | 2 ++ test/mpi/spawn/Makefile.am | 1 + 6 files changed, 27 insertions(+), 12 deletions(-) hooks/post-receive -- MPICH primary repository