* confh.test: Use `sed' to extract full definition of

	DIST_COMMON.  Look for stamp-h.in rule in include/Makefile.in.
	* Makefile.am (XFAIL_TESTS): Removed confh.test.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 1276f89..4b6fcdb 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+1999-04-11  Tom Tromey  <tromey@cygnus.com>
+
+       * confh.test: Use `sed' to extract full definition of
+       DIST_COMMON.  Look for stamp-h.in rule in include/Makefile.in.
+       * Makefile.am (XFAIL_TESTS): Removed confh.test.
+
 1999-04-10  Tom Tromey  <tromey@cygnus.com>
 
        * defs: Ensure srcdir is always absolute.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 247f45b..f15058d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnits
 
-XFAIL_TESTS = confh.test
+XFAIL_TESTS = 
 TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test \
 acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test \
 all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index a56bcd6..3759787 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -67,7 +67,7 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits
 
-XFAIL_TESTS = confh.test
+XFAIL_TESTS = 
 TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test \
 acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test \
 all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test \

diff --git a/tests/confh.test b/tests/confh.test
index d723554..63dd433 100755 (executable)
--- a/tests/confh.test
+++ b/tests/confh.test
@@ -23,8 +23,16 @@ mkdir include
 
 $AUTOMAKE || exit 1
 
-grep '^DIST_COMMON =.* acconfig.h' Makefile.in || exit 1
-grep 'stamp-h.in:.*acconfig.h' Makefile.in || exit 1
+(sed -n -e '/^DIST_COMMON =.*\\$/ {
+   :loop
+   p
+   n
+   /\\$/ b loop
+   p
+   n
+   }' -e '/^DIST_COMMON =/ p' Makefile.in | grep acconfig.h) || exit 1
+
+grep 'stamp-h.in:.*acconfig.h' include/Makefile.in || exit 1
 
 # Make sure re-running automake in a different way generates same
 # Makefile.in.