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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index b0cc15d178e495cbc47318c29c9c81901b21ae3a..2ee10ae1cd6a0665d388b56abf8e29c063f92f06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2008-08-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       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  <Ralf.Wildenhues@gmx.de>

diff --git a/tests/configure-iface.at b/tests/configure-iface.at
index 5e33eca40ddf4f9ccb2d4171a0eca42014445121..38e78245b0048801cd0aa56f9f9f92f1804492f5 100644 (file)
--- 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 74d3a84517387b023bf929e06b01fa98b206c7f8..75e26a2f01ae972c992ab414a0cf13201d022e96 100644 (file)
--- 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 f36f97f5270e659d25e0da32341c53e73a55ec1b..3365a2ae82ad69262cdcdf9c0d17c78e611d860d 100644 (file)
--- 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 4dfc4aba3391870d36bae5cf4f6eca93da05f4d3..7a3b01d48cc22dcd1073452b8df14a85875c98cb 100644 (file)
--- 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 )
 ])