Minor improvements to test 'amopts.test'.

* tests/amopts.test: Remove botched comment.  Make grepping of
automake stderr slighty stricter.  Add trailing `:' command.

diff --git a/ChangeLog b/ChangeLog
index 8f615ac152b3d7a0f5a7abcc904c1c0cd4f61020..0ded3b81fc51385f7a229c52707a63cd4164a0ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-21  Stefano Lattarini  <stefano.lattarini@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.lattarini@gmail.com>
 
        backcompat6.test: avoid comments inside recipe commands.

diff --git a/tests/amopt.test b/tests/amopt.test
index e83b800aacd13434fd5886aac4e0d87b78d27bc9..580cf8aab482d55ee98da930248b17db73f3d371 100755 (executable)
--- 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
+
+: