From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 21 Dec 2010 01:41:20 +0000 (+0100)
Subject: Minor improvements to test 'amopts.test'.
X-Git-Tag: ng-0.5a~288
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=738d54fdacf323645cd51250fd1a87a9c8fa6038;p=thirdparty%2Fautomake.git

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 8f615ac15..0ded3b81f 100644
--- 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 e83b800aa..580cf8aab 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
+
+: