Improve declaration of dependencies in the testsuite.

* tests/Makefile.am (check_SCRIPTS): Remove.  Instead, let ...
($(TEST_LOGS)): ... all test logs depend on the scripts.
* test/gen-parallel-tests: For each parallel test foo-p.test,
let `foo-p.log' also depend on `foo.test', since it is sourced.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 5a5de1b..a5af5af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Improve declaration of dependencies in the testsuite.
+       * tests/Makefile.am (check_SCRIPTS): Remove.  Instead, let ...
+       ($(TEST_LOGS)): ... all test logs depend on the scripts.
+       * test/gen-parallel-tests: For each parallel test foo-p.test,
+       let `foo-p.log' also depend on `foo.test', since it is sourced.
+
 2010-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Coverage for TAGS_DEPENDENCIES warning.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 361294b..2fe615c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -795,7 +795,7 @@ $(parallel_tests)
 EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
 
 # Each test case depends on defs, aclocal, and automake.
-check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
+$(TEST_LOGS): defs aclocal-$(APIVERSION) automake-$(APIVERSION)
 
 clean-local: clean-local-check
 .PHONY: clean-local-check

diff --git a/tests/Makefile.in b/tests/Makefile.in
index a259a36..1bc1958 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -257,29 +257,12 @@ cond17.test                                       \
 gcj6.test                                      \
 txinfo5.test
 
-parallel_tests = \
-check-p.test \
-check10-p.test \
-check11-p.test \
-check2-p.test \
-check3-p.test \
-check4-p.test \
-check5-p.test \
-check6-p.test \
-check7-p.test \
-check8-p.test \
-check9-p.test \
-color-p.test \
-color2-p.test \
-comment9-p.test \
-dejagnu-p.test \
-exeext4-p.test \
-maken3-p.test \
-maken4-p.test \
-pr401-p.test \
-pr401b-p.test \
-pr401c-p.test
-
+parallel_tests = check-p.test check10-p.test check11-p.test \
+       check2-p.test check3-p.test check4-p.test check5-p.test \
+       check6-p.test check7-p.test check8-p.test check9-p.test \
+       color-p.test color2-p.test comment9-p.test dejagnu-p.test \
+       exeext4-p.test maken3-p.test maken4-p.test pr401-p.test \
+       pr401b-p.test pr401c-p.test
 MAINTAINERCLEANFILES = $(parallel_tests)
 TESTS = \
 aclibobj.test \
@@ -1031,9 +1014,6 @@ yaccvpath.test \
 $(parallel_tests)
 
 EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
-
-# Each test case depends on defs, aclocal, and automake.
-check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
 all: all-am
 
 .SUFFIXES:
@@ -1269,7 +1249,6 @@ distdir: $(DISTFILES)
          fi; \
        done
 check-am: all-am
-       $(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)
        $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile
@@ -1384,6 +1363,27 @@ uninstall-am:
        maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
        pdf-am ps ps-am recheck recheck-html uninstall uninstall-am
 
+check-p.log: check.test
+check10-p.log: check10.test
+check11-p.log: check11.test
+check2-p.log: check2.test
+check3-p.log: check3.test
+check4-p.log: check4.test
+check5-p.log: check5.test
+check6-p.log: check6.test
+check7-p.log: check7.test
+check8-p.log: check8.test
+check9-p.log: check9.test
+color-p.log: color.test
+color2-p.log: color2.test
+comment9-p.log: comment9.test
+dejagnu-p.log: dejagnu.test
+exeext4-p.log: exeext4.test
+maken3-p.log: maken3.test
+maken4-p.log: maken4.test
+pr401-p.log: pr401.test
+pr401b-p.log: pr401b.test
+pr401c-p.log: pr401c.test
 
 $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
        $(AM_V_GEN)(cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
@@ -1401,6 +1401,9 @@ $(parallel_tests): Makefile.am
        } > $@-t
        $(AM_V_at)chmod a+rx $@-t && mv -f $@-t $@
 
+# Each test case depends on defs, aclocal, and automake.
+$(TEST_LOGS): defs aclocal-$(APIVERSION) automake-$(APIVERSION)
+
 clean-local: clean-local-check
 .PHONY: clean-local-check
 clean-local-check:

diff --git a/tests/gen-parallel-tests b/tests/gen-parallel-tests
index 39f5d1e..d2a5c13 100755 (executable)
--- a/tests/gen-parallel-tests
+++ b/tests/gen-parallel-tests
@@ -35,8 +35,18 @@ while read tst; do
      || grep "parallel_tests=['\"]yes" $tst >/dev/null
   then :; else echo $tst; fi;
 done |
+sed -e 's/\.test$//' |
 {
   echo "## Generated by gen-parallel-tests.  Edit Makefile.am instead of this."
-  echo "parallel_tests = \\"
-  sed 's,\.test$,-p.test,; $!s,$, \\,'
+  echo "parallel_tests ="
+  # Since `foo-p.test' sources `foo.test', `foo-p.log' also depends on
+  # `foo.test'.
+  sed -e '
+    h
+    s/^/parallel_tests += /
+    s/$/-p.test/
+    p
+    x
+    s/.*/&-p.log: &.test/
+  '
 }