* tests/overrid.test: Change all regexes for warning messages to

match after a colon, so that the prepended file names do not
cause false matches.  Tighten overrides regex.  Fix typo
`cleam-am-local' -> `clean-am-local'.

diff --git a/ChangeLog b/ChangeLog
index 0e1664e3e70859a0256543341ae6ec7f1866e2da..063391a1efe8407a56bd6a63225a9db12d8ffe6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-05-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * tests/overrid.test: Change all regexes for warning messages to
+       match after a colon, so that the prepended file names do not
+       cause false matches.  Tighten overrides regex.  Fix typo
+       `cleam-am-local' -> `clean-am-local'.
+
        * tests/java.test: `configure' uses a trap, so use `(exit 77);
        exit 77' to portably set the exit status similar to AS_EXIT.
        * tests/fn99.test: propagate nonzero exit status from subshell.

diff --git a/tests/overrid.test b/tests/overrid.test
index 82983d9135544b7385c5352d3a7edc3df128bbc2..97abd0312fdba2a6d68f0eef0354c4d7a033737a 100755 (executable)
--- a/tests/overrid.test
+++ b/tests/overrid.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.
 #
@@ -48,18 +48,18 @@ END
 $ACLOCAL
 $AUTOMAKE -Wno-override
 AUTOMAKE_fails
-grep install-local stderr && exit 1 # There is no such thing as install-local
-grep installcheck-local stderr
-grep html-local stderr
+grep ':.*install-local' stderr && exit 1 # There is no such thing as install-local
+grep ':.*installcheck-local' stderr
+grep ':.*html-local' stderr
 # Make sure overriding *-am targets suggest using *-local, not *-am.
-grep cleam-am-local stderr && exit 1
-grep clean-local stderr
+grep ':.*clean-am-local' stderr && exit 1
+grep ':.*clean-local' stderr
 
 # Conditional overrides ought to be diagnosed, but it can't be done yet.
 # See the FIXME in Automake::Rule::define.  Once this is fixed, the grep below
 # will fail.  If you see the failure, it means you fixed Automake.  Well done!
 # Just strip out the next '&& exit 1' and this comment.
-grep ps stderr && exit 1
+grep ':.*overrides.*ps' stderr && exit 1
 
 # Test for another issue.  Overriding html: should cause only one
 # html: rule to be output.