From eaf36ea23f6ccc8e20c378c6068e76c90bca4532 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 17 May 2001 03:14:23 +0000 Subject: [PATCH] For PR automake/175: * tests/Makefile.am (XFAIL_TESTS): Added make.test. * tests/make.test: Run test with `make -w'. --- ChangeLog | 4 ++++ tests/Makefile.am | 2 +- tests/Makefile.in | 2 +- tests/make.test | 20 ++++++++++++++++---- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74a0445c..ef2772ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2001-05-16 Tom Tromey + For PR automake/175: + * tests/Makefile.am (XFAIL_TESTS): Added make.test. + * tests/make.test: Run test with `make -w'. + * tests/Makefile.am (TESTS): Removed maintclean.test. * lib/am/clean.am (maintainer-clean-generic): Don't remove Makefile.in. diff --git a/tests/Makefile.am b/tests/Makefile.am index 2232fcbf..302304dd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = subdir5.test +XFAIL_TESTS = subdir5.test make.test TESTS = \ acinclude.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 96a20870..78ef0fc4 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -70,7 +70,7 @@ install_sh = @install_sh@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = subdir5.test +XFAIL_TESTS = subdir5.test make.test TESTS = \ acinclude.test \ diff --git a/tests/make.test b/tests/make.test index cd2e7006..99c4218b 100755 --- a/tests/make.test +++ b/tests/make.test @@ -27,9 +27,21 @@ export ACLOCAL export AUTOCONF export AUTOMAKE -./configure -touch configure.in -$MAKE +# Do the test twice -- once with make and once with make -w. +# This tests for a bug reported by Rainer Orth. + +save="$MAKE" +for flag in '' -w; do + MAKE="$save $flag" ./configure + + fgrep '_am_include = #' Makefile && exit 1 + + touch configure.in + $MAKE $flag + + fgrep '_am_include = #' Makefile && exit 1 + + rm -f config.cache +done -fgrep '_am_include = #' Makefile && exit 1 exit 0 -- 2.43.5