I pushed the following patch to master as obvious. Regards, Stefano
-*-*-*- Minor improvements to test 'amopts.test'. * tests/amopts.test: Remove botched comment. Make grepping of automake stderr slighty stricter. Add trailing `:' command. --- ChangeLog | 6 ++++++ tests/amopt.test | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f615ac..0ded3b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-12-21 Stefano Lattarini <stefano.lattar...@gmail.com> + Minor improvements to test 'amopts.test'. + * tests/amopts.test: Remove botched comment. Make grepping of + automake stderr slighty stricter. Add trailing `:' command. + +2010-12-21 Stefano Lattarini <stefano.lattar...@gmail.com> + backcompat6.test: avoid comments inside recipe commands. * tests/backcompat6.test: Remove shell comments from makefile rule commands, as they are not portable to (at least) Tru64 make. diff --git a/tests/amopt.test b/tests/amopt.test index e83b800..580cf8a 100755 --- a/tests/amopt.test +++ b/tests/amopt.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,9 +27,6 @@ END mkdir sub -# These two Makefile contain the same errors, but have different -# warnings disabled. - cat >Makefile.am <<END if COND AUTOMAKE_OPTIONS = -Wall @@ -38,4 +35,6 @@ END $ACLOCAL AUTOMAKE_fails -grep 'Makefile.am:2.*AUTOMAKE_OPTIONS.*conditional' stderr +grep '^Makefile\.am:2.*AUTOMAKE_OPTIONS.*conditional' stderr + +: -- 1.7.1