automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] Modernize, improve and/or fix tests `pluseq*.test.


From: Ralf Wildenhues
Subject: Re: [PATCH] Modernize, improve and/or fix tests `pluseq*.test.
Date: Sat, 12 Jun 2010 13:40:56 +0200
User-agent: Mutt/1.5.20 (2009-10-28)

Hi Stefano,

* Stefano Lattarini wrote on Fri, Jun 11, 2010 at 05:35:58PM CEST:
> Modernize, improve and/or fix tests `pluseq*.test.
> 
> * tests/pluseq5.test: Append to configure.in using cat with an
> here-doc, not using echo.
> * tests/pluseq10.test: Make sure that the captured output of
> `make' command is always displayed. Where possible, use $FGREP
> instead of grep (this change makes some checks slighty stricter).
> * tests/pluseq8.test: Enable `errexit' shell flag, with related
> changes.
> * tests/pluseq.test: Likewise.  Also, do not create useless dummy
> data files, and use better m4 quoting in generated configure.in.
> * tests/pluseq2.test: Likewise.  Also, append to configure.in
> using cat with an here-doc, not using echo.
> * tests/pluseq3.test: Likewise.
> * tests/pluseq4.test: Likewise.
> * tests/pluseq6.test: Likewise.
> * tests/pluseq7.test: Do not create useless dummy source file.
> * tests/pluseq9.test: Slighty extended w.r.t. the grepping of
> Automake stderr.  Some unrelated cosmetic changes.

Good for maint, with below squashed in.  We fixed capitalization of
error messages on master only.

Thanks!
Ralf

diff --git a/tests/pluseq5.test b/tests/pluseq5.test
index 405b1fa..4e03d37 100755
--- a/tests/pluseq5.test
+++ b/tests/pluseq5.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 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
diff --git a/tests/pluseq9.test b/tests/pluseq9.test
index 841a064..fb30a1d 100755
--- a/tests/pluseq9.test
+++ b/tests/pluseq9.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 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
@@ -65,7 +65,7 @@ AUTOMAKE_fails
 # COND1_FALSE (merging the last two conditions), so we'll support
 # this case in the check too.
 
-grep 'cannot apply.*+=' stderr
+grep '[cC]annot apply.*+=' stderr
 grep ':   !COND1 and !COND3$' stderr
 # Make sure there is exactly one missing condition.
 test `grep ':  ' stderr | wc -l` = 1



reply via email to

[Prev in Thread] Current Thread [Next in Thread]