From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 11 May 2006 17:33:31 +0000 (+0000)
Subject: * tests/missing.test, tests/missing2.test: Do not require
X-Git-Tag: Release-1-9b~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b2f18ee7e6449ee203055d7b235436fb082f0ea;p=thirdparty%2Fautomake.git

* 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 e7718d5eb..6b135d931 100644
--- 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 57780337d..1b1c7b243 100644
--- 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 52ecab320..27836e1ae 100644
--- 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 c7d369648..0370f0fae 100755
--- 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 df4ba558a..38c5726a5 100755
--- 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'