From c766e70ca307789f4d95b29c84f61e0c8777d141 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 12 Aug 2008 22:20:43 +0200 Subject: [PATCH] Parallel make testsuite fixes. * tests/configure-iface.at (installable libltdl) (--with-ltdl-include/lib, --with-included-ltdl): Add dlopened libmodule.la to main_DEPENDENCIES. * tests/old-m4-iface.at (AC_WITH_LTDL): Likewise, let ltdldemo depend upon module.la and libltdl/libltdlc.la. * tests/testsuite.at (LT_AT_MAKE): Invoke each target in turn, default to 'all'. * tests/early-libtool.at (config.lt): Define 'all' target. Signed-off-by: Ralf Wildenhues --- ChangeLog | 10 ++++++++++ tests/configure-iface.at | 6 +++--- tests/early-libtool.at | 2 ++ tests/old-m4-iface.at | 2 +- tests/testsuite.at | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0cc15d17..2ee10ae1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2008-08-12 Ralf Wildenhues + Parallel make testsuite fixes. + * tests/configure-iface.at (installable libltdl) + (--with-ltdl-include/lib, --with-included-ltdl): Add dlopened + libmodule.la to main_DEPENDENCIES. + * tests/old-m4-iface.at (AC_WITH_LTDL): Likewise, let ltdldemo + depend upon module.la and libltdl/libltdlc.la. + * tests/testsuite.at (LT_AT_MAKE): Invoke each target in turn, + default to 'all'. + * tests/early-libtool.at (config.lt): Define 'all' target. + * HACKING: Update for git, fix some minor nits. 2008-08-11 Ralf Wildenhues diff --git a/tests/configure-iface.at b/tests/configure-iface.at index 5e33eca40..38e78245b 100644 --- a/tests/configure-iface.at +++ b/tests/configure-iface.at @@ -132,7 +132,7 @@ libmodule_la_LDFLAGS = -module bin_PROGRAMS = main main_LDFLAGS = -dlopen libmodule.la main_LDADD = $(LIBLTDL) -main_DEPENDENCIES = $(LTDLDEPS) +main_DEPENDENCIES = $(LTDLDEPS) libmodule.la ]]) # Install everything! @@ -201,7 +201,7 @@ libmodule_la_LDFLAGS = -module bin_PROGRAMS = main main_LDFLAGS = -dlopen libmodule.la main_LDADD = $(LIBLTDL) -main_DEPENDENCIES = $(LTDLDEPS) +main_DEPENDENCIES = $(LTDLDEPS) libmodule.la ]]) # We don't use 'libtoolize --ltdl', so that we get an error if the test @@ -255,7 +255,7 @@ libmodule_la_LDFLAGS = -module bin_PROGRAMS = main main_LDFLAGS = -dlopen libmodule.la main_LDADD = $(LIBLTDL) -main_DEPENDENCIES = $(LTDLDEPS) +main_DEPENDENCIES = $(LTDLDEPS) libmodule.la ]]) LT_AT_BOOTSTRAP([--ltdl], [-I libltdl/m4], [], [--add-missing], [], diff --git a/tests/early-libtool.at b/tests/early-libtool.at index 74d3a8451..75e26a2f0 100644 --- a/tests/early-libtool.at +++ b/tests/early-libtool.at @@ -168,6 +168,8 @@ LDFLAGS = @LDFLAGS@ COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFAULT_INCLUDES) LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +all: hell$(EXEEXT) + hell$(EXEEXT): main.$(OBJEXT) libhello.la $(LINK) main.$(OBJEXT) libhello.la diff --git a/tests/old-m4-iface.at b/tests/old-m4-iface.at index f36f97f52..3365a2ae8 100644 --- a/tests/old-m4-iface.at +++ b/tests/old-m4-iface.at @@ -137,7 +137,7 @@ libltdl/libltdlc.la: module.la: module.lo $(LTLINK) module.lo -module -avoid-version -rpath /dev/null -ltdldemo@EXEEXT@: main.@OBJEXT@ +ltdldemo@EXEEXT@: main.@OBJEXT@ module.la libltdl/libltdlc.la $(LTLINK) main.@OBJEXT@ -dlopen module.la @LIBLTDL@ .SUFFIXES: diff --git a/tests/testsuite.at b/tests/testsuite.at index 4dfc4aba3..7a3b01d48 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -152,7 +152,10 @@ m4_define([LT_AT_CONFIGURE], # -------------------------- m4_define([LT_AT_MAKE], [( $unset LIBTOOL LIBTOOLIZE - AT_CHECK([$MAKE $1 $2], [0], [ignore], [ignore]) ) + for target in m4_default([$1], [all]) + do + AT_CHECK([$MAKE $target $2], [0], [ignore], [ignore]) + done ) ]) -- 2.47.2