tests: auto-generate deps for tests requiring libtool/gettext

* tests/gen-testsuite-part: Tests requiring libtool (or related
programs) will need libtool-provided m4 macros, so they should
be run after `libtool-macros.test'.  Similarly for gettext tests.
So, generate proper declarations of such dependencies.
* tests/Makefile.am: Remove now-unneeded hand-written declaration
of those dependencies.

diff --git a/ChangeLog b/ChangeLog
index 828288bc88dfc2cc275acbe322ea39758b48d07d..afd6a100cf01db6d53ba563241557a9bced1fb3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: auto-generate deps for tests requiring libtool/gettext
+       * tests/gen-testsuite-part: Tests requiring libtool (or related
+       programs) will need libtool-provided m4 macros, so they should
+       be run after `libtool-macros.test'.  Similarly for gettext tests.
+       So, generate proper declarations of such dependencies.
+       * tests/Makefile.am: Remove now-unneeded hand-written declaration
+       of those dependencies.
+
 2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tests: remove FIXME comments from tricks to pacify syntax checks

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 32824ffd608b209b5957165ec2517c05e4c8d6fa..78312a604bc3ca7b9230a230a4210921fd05acdf 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -181,74 +181,6 @@ include $(top_srcdir)/CheckListOfTests.am
 installcheck-local:
        am_running_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
 
-# FIXME: make these automatically computed once we are merged into
-# FIXME: the `testsuite-work' branch.
-ar-lib4.log: libtool-macros.log
-ar-lib6a.log: libtool-macros.log
-ar-lib6b.log: libtool-macros.log
-canon6.log: libtool-macros.log
-canon7.log: libtool-macros.log
-depcomp4.log: libtool-macros.log
-depcomp7.log: libtool-macros.log
-depcomp8b.log: libtool-macros.log
-extradep2.log: libtool-macros.log
-fort5.log: libtool-macros.log
-instdir-ltlib.log: libtool-macros.log
-instfail-libtool.log: libtool-macros.log
-ldadd.log: libtool-macros.log
-ldflags.log: libtool-macros.log
-libobj13.log: libtool-macros.log
-libtoo10.log: libtool-macros.log
-libtoo11.log: libtool-macros.log
-libtool.log: libtool-macros.log
-libtool2.log: libtool-macros.log
-libtool3.log: libtool-macros.log
-libtool5.log: libtool-macros.log
-libtool6.log: libtool-macros.log
-libtool7.log: libtool-macros.log
-libtool8.log: libtool-macros.log
-libtool9.log: libtool-macros.log
-listval.log: libtool-macros.log
-ltcond.log: libtool-macros.log
-ltcond2.log: libtool-macros.log
-ltconv.log: libtool-macros.log
-ltdeps.log: libtool-macros.log
-ltinit.log: libtool-macros.log
-ltinstloc.log: libtool-macros.log
-ltlibobjs.log: libtool-macros.log
-ltlibsrc.log: libtool-macros.log
-ltorder.log: libtool-macros.log
-nobase-libtool.log: libtool-macros.log
-pr211.log: libtool-macros.log
-pr300-ltlib.log: libtool-macros.log
-pr307.log: libtool-macros.log
-pr401b.log: libtool-macros.log
-pr72.log: libtool-macros.log
-reqd2.log: libtool-macros.log
-silent3.log: libtool-macros.log
-silent4.log: libtool-macros.log
-silent9.log: libtool-macros.log
-stdlib2.log: libtool-macros.log
-strip3.log: libtool-macros.log
-subobj9.log: libtool-macros.log
-suffix10.log: libtool-macros.log
-suffix2.log: libtool-macros.log
-suffix5.log: libtool-macros.log
-suffix8.log: libtool-macros.log
-vala.log: libtool-macros.log
-vala1.log: libtool-macros.log
-vala2.log: libtool-macros.log
-vala3.log: libtool-macros.log
-vala4.log: libtool-macros.log
-vala5.log: libtool-macros.log
-
-# FIXME: make these automatically computed once we are merged into
-# FIXME: the `testsuite-work' branch.
-gettext.log: gettext-macros.log
-gettext2.log: gettext-macros.log
-gettext3.log: gettext-macros.log
-subcond.log: gettext-macros.log
-
 clean-local: clean-local-check
 .PHONY: clean-local-check
 clean-local-check:

diff --git a/tests/gen-testsuite-part b/tests/gen-testsuite-part
index 6009dbc5464b4f89ccdf57cd0b478a5c47dea2a1..091009261e3914a277b1aa235f3fcd71158be987 100755 (executable)
--- a/tests/gen-testsuite-part
+++ b/tests/gen-testsuite-part
@@ -137,6 +137,16 @@ sub parse_options (@)
 
 my %deps_extractor =
   (
+    libtool_macros =>
+      {
+        line_matcher => qr/^\s*required=.*\blibtool/,
+        nodist_prereqs => "libtool-macros.log",
+      },
+    gettext_macros =>
+      {
+        line_matcher => qr/^\s*required=.*\bgettext/,
+        nodist_prereqs => "gettext-macros.log",
+      },
     use_trivial_test_driver =>
       {
         line_matcher => qr/\btrivial-test-driver\b/,