[PATCH] Improve declaration of dependencies in the testsuite.

[Stefano Lattarini]

* tests/Makefile.am: Declare all the testsuite logs as dependent
from `defs', since all test scripts include ./defs.
* test/gen-parallel-tests:  Generate declaration of dependecy for
each `foo-p.log' from the corresponding `foo.test', since each
`foo-t.test' script sources the corresponding `foo.test'.

From 982b4772b803a3b55e22ab11767fa825a51ca04d Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Sat, 8 May 2010 03:04:09 +0200
Subject: [PATCH] Improve declaration of dependencies in the testsuite.

* tests/Makefile.am: Declare all the testsuite logs as dependent
from `defs', since all test scripts include ./defs.
* test/gen-parallel-tests:  Generate declaration of dependecy for
each `foo-p.log' from the corresponding `foo.test', since each
`foo-t.test' script sources the corresponding `foo.test'.
---
 ChangeLog                |    9 +++++++
 tests/Makefile.am        |    3 ++
 tests/Makefile.in        |   53 ++++++++++++++++++++++++++--------------------
 tests/gen-parallel-tests |   19 +++++++++++++--
 4 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 71b0d9b..b7a5734 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-08  Stefano Lattarini  <address@hidden>
+
+       Improve declaration of dependencies in the testsuite.
+       * tests/Makefile.am: Declare all the testsuite logs as dependent
+       from `defs', since all test scripts include ./defs.
+       * test/gen-parallel-tests:  Generate declaration of dependecy for
+       each `foo-p.log' from the corresponding `foo.test', since each
+       `foo-t.test' script sources the corresponding `foo.test'.
+
 2010-04-25  Ralf Wildenhues  <address@hidden>
 
        Warning and error message formatting cleanups.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cff34c5..6864e1b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -781,6 +781,9 @@ yaccpp.test \
 yaccvpath.test \
 $(parallel_tests)
 
+# All tests include ./defs, so that all the testsuite logs depend from it.
+$(TEST_LOGS): defs
+
 EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
 
 # Each test case depends on defs, aclocal, and automake.
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3ff9012..72442c6 100644
--- 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 \
@@ -1376,6 +1359,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) >$@
@@ -1390,6 +1394,9 @@ $(parallel_tests): Makefile.am
        } > address@hidden
        $(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
 
+# All tests include ./defs, so that all the testsuite logs depend from it.
+$(TEST_LOGS): defs
+
 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..5345867 100755
--- a/tests/gen-parallel-tests
+++ b/tests/gen-parallel-tests
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Generate parallel-tests.am.
 #
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,8 +35,21 @@ 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 ="
+  echo
+  # Since `foo-p.test' sources `foo.test', `foo-p.log' will depend from
+  # `foo.test'.  We make this dependency explicit.
+  sed -e '
+    h
+    s/^/parallel_tests += /
+    s/$/-p.test/
+    p
+    x
+    s/.*/&-p.log: &.test/
+    p
+    s/.*//
+  '
 }
-- 
1.6.5