[PATCH 1/2] build: improve the definition of the list of testcases

[Stefano Lattarini]

* tests/Makefile.am (handwritten_tests): New variable.
(generated_tests): Likewise.
(TESTS): Redefine as the union of the above.
(EXTRA_DIST): Extend using $(handwritten_tests) and
$(generate_tests) rather than $(TESTS).
* tests/gen-parallel-tests: Update and make more robust.
---
 ChangeLog                |   10 ++++++++++
 tests/Makefile.am        |   15 ++++++++-------
 tests/Makefile.in        |   10 +++++-----
 tests/gen-parallel-tests |   10 ++++++++--
 4 files changed, 31 insertions(+), 14 deletions(-)

From 361fb1730e1cb0a32c8008cc5109b26e6d1e4981 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Wed, 16 Feb 2011 13:46:33 +0100
Subject: [PATCH 1/2] build: improve the definition of the list of testcases

* tests/Makefile.am (handwritten_tests): New variable.
(generated_tests): Likewise.
(TESTS): Redefine as the union of the above.
(EXTRA_DIST): Extend using $(handwritten_tests) and
$(generate_tests) rather than $(TESTS).
* tests/gen-parallel-tests: Update and make more robust.
---
 ChangeLog                |   10 ++++++++++
 tests/Makefile.am        |   15 ++++++++-------
 tests/Makefile.in        |   10 +++++-----
 tests/gen-parallel-tests |   10 ++++++++--
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 12b8e9f..29e85ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
 2011-02-16  Stefano Lattarini  <address@hidden>
+
+       build: improve the definition of the list of testcases
+       * tests/Makefile.am (handwritten_tests): New variable.
+       (generated_tests): Likewise.
+       (TESTS): Redefine as the union of the above.
+       (EXTRA_DIST): Extend using $(handwritten_tests) and
+       $(generate_tests) rather than $(TESTS).
+       * tests/gen-parallel-tests: Update and make more robust.
+
+2011-02-16  Stefano Lattarini  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
        test defs: add subroutine for input unindenting
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e3eb9e9..96ea636 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -96,7 +96,13 @@ EXTRA_DIST += instspc-tests.sh
 XFAIL_TESTS += $(instspc_xfail_tests)
 
 
-TESTS = \
+TESTS = $(handwritten_tests) $(generated_tests)
+
+EXTRA_DIST += $(handwritten_tests) $(generated_tests)
+
+generated_tests = $(parallel_tests) $(instspc_tests)
+
+handwritten_tests = \
 aclocal.test \
 aclocal3.test \
 aclocal4.test \
@@ -512,7 +518,6 @@ instmany.test \
 instmany-mans.test \
 instmany-python.test \
 instspc-data.test \
-$(instspc_tests) \
 interp.test \
 interp2.test \
 java.test \
@@ -999,11 +1004,7 @@ yflags-conditional.test \
 yflags-d-false-positives.test \
 yflags-force-override.test \
 yflags-force-conditional.test \
-yflags-var-expand.test \
-$(parallel_tests)
-
-EXTRA_DIST += $(TESTS)
-
+yflags-var-expand.test
 
 # Each test case depends on defs, aclocal, and automake.
 $(TEST_LOGS): defs aclocal-$(APIVERSION) automake-$(APIVERSION)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1f367cd..80c00bf 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -283,7 +283,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests)
 EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \
-       $(TESTS)
+       $(handwritten_tests) $(generated_tests)
 XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \
        override-conditional-2.test txinfo5.test \
        $(instspc_xfail_tests)
@@ -358,7 +358,9 @@ instspc_xfail_tests = instspc-squote-build.test \
        instspc-dquote-install.test instspc-bquote-install.test \
        instspc-sharp-install.test instspc-dollar-install.test \
        instspc-linefeed-install.test instspc-a_lf_b-install.test
-TESTS = \
+TESTS = $(handwritten_tests) $(generated_tests)
+generated_tests = $(parallel_tests) $(instspc_tests)
+handwritten_tests = \
 aclocal.test \
 aclocal3.test \
 aclocal4.test \
@@ -774,7 +776,6 @@ instmany.test \
 instmany-mans.test \
 instmany-python.test \
 instspc-data.test \
-$(instspc_tests) \
 interp.test \
 interp2.test \
 java.test \
@@ -1261,8 +1262,7 @@ yflags-conditional.test \
 yflags-d-false-positives.test \
 yflags-force-override.test \
 yflags-force-conditional.test \
-yflags-var-expand.test \
-$(parallel_tests)
+yflags-var-expand.test
 
 all: all-am
 
diff --git a/tests/gen-parallel-tests b/tests/gen-parallel-tests
index d2a5c13..20b9ee1 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, 2011 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
@@ -22,7 +22,13 @@
 
 set -e
 
-tests=`sed -n '/^TESTS =/,/^$/s/\(.*\.test\).*/\1/p' Makefile.am`
+tests=`sed -n '/^handwritten_tests =/,/^$/s/\(.*\.test\).*/\1/p' Makefile.am`
+
+if test -z "$tests"; then
+  echo "$0: failed to obtain list of tests" >&2
+  exit 1
+fi
+
 {
   grep -l '^TESTS ' $tests
   grep -l ' TESTS ' $tests
-- 
1.7.2.3