* tests/missing.test, tests/missing2.test: Do not require

GNUmake.
* Makefile.am (maintainer-check): Make sure `required=' does not
follow `. ./defs' in the tests.

diff --git a/ChangeLog b/ChangeLog
index e7718d5ebf47e9ead5dc787d0286235d04d46717..6b135d931eddbfd2b20f9bc933a89329af4ca4d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-05-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * tests/missing.test, tests/missing2.test: Do not require
+       GNUmake.
+       * Makefile.am (maintainer-check): Make sure `required=' does not
+       follow `. ./defs' in the tests.
+
        * tests/ansi10.test: Use AC_PROG_CC_STDC.  Fix test that
        ac_cv_prog_cc_stdc isn't just used by Automake code in
        `configure'.

diff --git a/Makefile.am b/Makefile.am
index 57780337dbaaa5d0cba3ee7fff4a8001304c9022..1b1c7b24317796ebf899f39075c4633536145e5a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -225,6 +225,13 @@ maintainer-check: automake aclocal
          echo 'Do not run "perl" in the above tests.  Use "$$PERL" instead.' 1>&2; \
          exit 1; \
        fi
+## Setting `required' after sourcing `./defs' is a bug.
+       @for file in $(srcdir)/tests/*.test; do \
+         if out=`sed -n '/defs/,$${/required=/p;}' $$file`; test -n "$$out"; then \
+           echo 'Do not set "required" after sourcing "defs" in '"$$file: $$out" 1>&2; \
+           exit 1; \
+         fi; \
+       done
 ## Overriding a Makefile macro on the command line is not portable when
 ## recursive targets are used.  Better use an envvar.  SHELL is an exception,
 ## POSIX says it can't come from the environment.

diff --git a/Makefile.in b/Makefile.in
index 52ecab320bdfc413e6b284bfefa0ea317fe9bc08..27836e1aedee835e9fff78898754d98d3fb0143c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -774,6 +774,12 @@ maintainer-check: automake aclocal
          echo 'Do not run "perl" in the above tests.  Use "$$PERL" instead.' 1>&2; \
          exit 1; \
        fi
+       @for file in $(srcdir)/tests/*.test; do \
+         if out=`sed -n '/defs/,$${/required=/p;}' $$file`; test -n "$$out"; then \
+           echo 'Do not set "required" after sourcing "defs" in '"$$file: $$out" 1>&2; \
+           exit 1; \
+         fi; \
+       done
        @if grep -E '\$$MAKE .*(SHELL=.*=|=.*SHELL=)' $(srcdir)/tests/*.test; then \
          echo 'Rewrite "$$MAKE foo=bar SHELL=$$SHELL" as "foo=bar $$MAKE -e SHELL=$$SHELL"' 1>&2; \
          echo ' in the above lines, it is more portable.' 1>&2; \

diff --git a/tests/missing.test b/tests/missing.test
index c7d3696486ff438bb680a01132a949feebbc0dae..0370f0fae3283feaacf3e0edb3d51d37ee45dd45 100755 (executable)
--- a/tests/missing.test
+++ b/tests/missing.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -22,7 +22,6 @@
 
 . ./defs || exit 1
 
-required=GNUmake
 set -e
 
 cat >>configure.in <<'EOF'

diff --git a/tests/missing2.test b/tests/missing2.test
index df4ba558a7ee10607cc1212b42eefcbf54e683d2..38c5726a537801f33312b979c03f771ce3f1fb42 100755 (executable)
--- a/tests/missing2.test
+++ b/tests/missing2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -22,7 +22,6 @@
 
 . ./defs || exit 1
 
-required=GNUmake
 set -e
 
 cat >>configure.in <<'EOF'