OK? The failure I stumbled over was the `grep ps stderr' that didn't
fail because of `ps' in ``pwd`'.
Cheers,
Ralf
* 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'.
Index: tests/overrid.test
===================================================================
RCS file: /cvs/automake/automake/tests/overrid.test,v
retrieving revision 1.7
diff -u -r1.7 overrid.test
--- tests/overrid.test 3 Oct 2005 20:52:27 -0000 1.7
+++ tests/overrid.test 26 Apr 2006 20:40:30 -0000
@@ -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 @@
$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.
