Tweak and extend tests `pr[!0-9]*.test'.

* tests/primary3.test: Add trailing `:' command.
* tests/primary.test: Make grepping of Automake's stderr stricter.
Also, add trailing `:' command, and cosmetic changes in spacing.
* tests/primary2.test: Likewise.
* tests/prefix.test: Enable `errexit' shell flags, and related
changes.  Add a trailing `:' command.
* tests/proginst.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 633703e534441e86864ff5666bfe676905113c80..e39a5b84771bcdd47cf1513e2b684ec197772bba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2010-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+       Tweak and extend tests `pr[!0-9]*.test'.
+       * tests/primary3.test: Add trailing `:' command.
+       * tests/primary.test: Make grepping of Automake's stderr stricter.
+       Also, add trailing `:' command, and cosmetic changes in spacing.
+       * tests/primary2.test: Likewise.
+       * tests/prefix.test: Enable `errexit' shell flags, and related
+       changes.  Add a trailing `:' command.
+       * tests/proginst.test: Likewise.
+
        Modernize, improve and extend tests for PR (`pr[0-9]*.test').
        * tests/pr2.test: Add trailing `:' command.
        * tests/pr229.test: Likewise.

diff --git a/tests/prefix.test b/tests/prefix.test
index 8199bd4569f03054f79fda551cba689282f76326..8ba92ef6c10a96823d0485a08114cc06342f067a 100755 (executable)
--- a/tests/prefix.test
+++ b/tests/prefix.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 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
@@ -18,6 +18,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_PROG_CC
 END
@@ -27,5 +29,7 @@ bnidir = $(prefix)/bni
 bni_PROGRAMS = zardoz
 EOF
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE
+
+:

diff --git a/tests/primary.test b/tests/primary.test
index ac5e54fc46d4db6d6ddaa65611f6754baaf7d682..a866f8f7d9994fe968dc323d093848c1d864a93f 100755 (executable)
--- a/tests/primary.test
+++ b/tests/primary.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1996, 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
@@ -26,4 +27,7 @@ END
 
 $ACLOCAL
 AUTOMAKE_fails
-grep 'EXTRA_PROGRAMS' stderr
+grep 'bin_PROGRAMS.*configure substitution' stderr
+grep 'EXTRA_PROGRAMS.*not defined' stderr
+
+:

diff --git a/tests/primary2.test b/tests/primary2.test
index faa7aed7013fa4776f2e312744422c32e9b39966..2fb3a605cc188cb2e44e84350428a4f19098b83c 100755 (executable)
--- a/tests/primary2.test
+++ b/tests/primary2.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
@@ -29,4 +30,6 @@ END
 
 $ACLOCAL
 AUTOMAKE_fails
-grep EXTRA_PROGRAMS stderr
+grep 'EXTRA_PROGRAMS.*configure substitution' stderr
+
+:

diff --git a/tests/primary3.test b/tests/primary3.test
index 578d05324bc5efd19d19f81bd4b7721b20a4e040..afccd0cbc52569c698cbf2aa8f4313e2c2fff7f3 100755 (executable)
--- a/tests/primary3.test
+++ b/tests/primary3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 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
@@ -38,3 +38,5 @@ $AUTOCONF
 $AUTOMAKE
 ./configure
 $MAKE
+
+:

diff --git a/tests/proginst.test b/tests/proginst.test
index 8881b9d6f46bb6c8ba6d133d91e1998d68d3df6e..31745b7e392d6e0f865755ddd6f7ec740631149f 100755 (executable)
--- a/tests/proginst.test
+++ b/tests/proginst.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 1998, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2001, 2002, 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
@@ -19,9 +20,13 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > Makefile.am << 'END'
 bin_SCRIPTS = zardoz qbert brownie
 END
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE
+
+: