For PR automake/175:

	* tests/Makefile.am (XFAIL_TESTS): Added make.test.
	* tests/make.test: Run test with `make -w'.

diff --git a/ChangeLog b/ChangeLog
index 74a0445..ef2772e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-05-16  Tom Tromey  <tromey@redhat.com>
 
+       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 2232fcb..302304d 100644 (file)
--- 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 96a2087..78ef0fc 100644 (file)
--- 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 cd2e700..99c4218 100755 (executable)
--- 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