[PATCH] Minor improvements to tests `canon*.test'.

[Stefano Lattarini]

Hello automakers.

I found this one bit-rotting on my local repository, as apparently I 
forgot to send it along with the others testsuite-tweaking patches.
Oh well, here it is now: better late than never.

Regards,
  Stefano

-*-*-

Minor improvements to tests `canon*.test'.

* tests/canon-name.test: Add trailing `:' command.
* tests/canon3.test: Prefer trailing `:' over trailing `Exit 0'.
* tests/canon4.test: Likewise.
* tests/canon.test: Prefer cat + here-doc over echo to append
text to configure.in.  Extend grepping of Automake stderr.  Add
trailing `:' command.
* tests/canon5.test: Likewise.
---
 ChangeLog             |   11 +++++++++++
 tests/canon-name.test |    2 ++
 tests/canon.test      |   12 +++++++++---
 tests/canon3.test     |    3 ++-
 tests/canon4.test     |    3 ++-
 tests/canon5.test     |    9 +++++++--
 6 files changed, 33 insertions(+), 7 deletions(-)

From 80c6c3e1958477868c656a4dd58ded2cd1fc1892 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Mon, 28 Jun 2010 12:40:55 +0200
Subject: [PATCH] Minor improvements to tests `canon*.test'.

* tests/canon-name.test: Add trailing `:' command.
* tests/canon3.test: Prefer trailing `:' over trailing `Exit 0'.
* tests/canon4.test: Likewise.
* tests/canon.test: Prefer cat + here-doc over echo to append
text to configure.in.  Extend grepping of Automake stderr.  Add
trailing `:' command.
* tests/canon5.test: Likewise.
---
 ChangeLog             |   11 +++++++++++
 tests/canon-name.test |    2 ++
 tests/canon.test      |   12 +++++++++---
 tests/canon3.test     |    3 ++-
 tests/canon4.test     |    3 ++-
 tests/canon5.test     |    9 +++++++--
 6 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 934eba6..0dad1cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-20  Stefano Lattarini  <address@hidden>
+
+       Minor improvements to tests `canon*.test'.
+       * tests/canon-name.test: Add trailing `:' command.
+       * tests/canon3.test: Prefer trailing `:' over trailing `Exit 0'.
+       * tests/canon4.test: Likewise.
+       * tests/canon.test: Prefer cat + here-doc over echo to append
+       text to configure.in.  Extend grepping of Automake stderr.  Add
+       trailing `:' command.
+       * tests/canon5.test: Likewise.
+
 2010-08-18  Stefano Lattarini  <address@hidden>
 
        Fix potential regressions in depcomp{3,5}.test.
diff --git a/tests/canon-name.test b/tests/canon-name.test
index aecda17..af5d5a7 100755
--- a/tests/canon-name.test
+++ b/tests/canon-name.test
@@ -36,3 +36,5 @@ $ACLOCAL
 AUTOMAKE_fails
 grep 'leading.*\./.*\./gmakefile' stderr
 grep 'leading.*\./.*\./sub/gmakefile' stderr
+
+:
diff --git a/tests/canon.test b/tests/canon.test
index 2b035d0..fc524fd 100755
--- a/tests/canon.test
+++ b/tests/canon.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 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
@@ -20,7 +21,9 @@
 
 set -e
 
-echo AC_PROG_CC >> configure.in
+cat >> configure.in << 'END'
+AC_PROG_CC
+END
 
 cat > Makefile.am << 'END'
 bin_PROGRAMS = sniff-glue
@@ -29,4 +32,7 @@ END
 
 $ACLOCAL
 AUTOMAKE_fails
-grep 'Makefile.am:2:.*sniff_glue_SOURCES' stderr
+grep 'Makefile\.am:2:.* bad .*variable.*sniff-glue_SOURCES' stderr
+grep 'Makefile\.am:2:.* use .*sniff_glue_SOURCES' stderr
+
+:
diff --git a/tests/canon3.test b/tests/canon3.test
index 9d5a172..ce5876a 100755
--- a/tests/canon3.test
+++ b/tests/canon3.test
@@ -34,4 +34,5 @@ $ACLOCAL
 $AUTOMAKE
 
 $FGREP 'perm_number.c' Makefile.in && Exit 1
-Exit 0
+
+:
diff --git a/tests/canon4.test b/tests/canon4.test
index 52e968d..7792fbe 100755
--- a/tests/canon4.test
+++ b/tests/canon4.test
@@ -34,4 +34,5 @@ $ACLOCAL
 $AUTOMAKE
 
 grep '^libx-y.*=' Makefile.in && Exit 1
-Exit 0
+
+:
diff --git a/tests/canon5.test b/tests/canon5.test
index 53cdeb2..3bd99ab 100755
--- a/tests/canon5.test
+++ b/tests/canon5.test
@@ -22,7 +22,9 @@
 
 set -e
 
-echo AC_PROG_CC >> configure.in
+cat >> configure.in << 'END'
+AC_PROG_CC
+END
 
 $ACLOCAL
 
@@ -46,7 +48,8 @@ bin_PROGRAMS = ,foo
 END
 
 AUTOMAKE_fails
-grep 'Makefile.am:2:.*_foo_SOURCES' stderr
+grep 'Makefile\.am:2:.* bad .*variable.*,foo_SOURCES' stderr
+grep 'Makefile\.am:2:.* use .*_foo_SOURCES' stderr
 
 cat > Makefile.am << 'END'
 bin_PROGRAMS = ,foo
@@ -54,3 +57,5 @@ _foo_SOURCES = foo.c
 END
 
 $AUTOMAKE -Wno-portability
+
+:
-- 
1.7.1