Modernize, improve and/or fix various test scripts.

* tests/sanity.test: Rely on the `configure.in' stub created by
`./defs', rather than writing one from scratch.
* tests/depend2.test: Likewise.  Also, call `set -e' just after
the inclusion of `./defs', instead that later in the script.
* tests/canon5.test: Avoid a useless `|| Exit 1' after a call to
$AUTOMAKE, and improve the positioning of an $ACLOCAL call.
* tests/exeext4.test: Use $FGREP instead of grep, where possible.
Make auxiliary rules in the generated Makefile more silent.
These changes make some checks slighty stricter.
* tests/ext2.test: Call `Exit 1' if inclusion of `./defs' fails.
* tests/gettext2.test: Place final `:' at the end of the script,
rather than in the middle.
* tests/exeext.test: Call `set -e' just after the inclusion of
`./defs', instead that later in the script.
* tests/extra5.test: Likewise.
* tests/confdeps.test: Likewise.  Also, prefer `mv -f' over
plain `mv', just to be sure.
* tests/depcomp.test: Enable `errexit' shell flag, with related
changes.  Also, modernize the generated configure.in.
* tests/cond9.test: Likewise.  Also, rely on the `configure.in'
stub created by `./defs', rather than writing one from scratch.
* tests/cond10.test: Likewise.
* tests/depcomp2.test: Likewise.
* tests/depend3.test: Likewise.
* tests/distcom7.test: Likewise.
* tests/fortdep.test: Likewise.  Also, remove definition of
AUTOMAKE_OPTIONS to `foreign' in the generated Makefile.am,
since that flag is already provided by $AUTOMAKE.
* tests/mdate.test: Made stricter, by checking that Automake
actually failed, and by	making a stricter grep on the error
message.  Also, set shell `errexit flag'.
* tests/python2.test: Improved verbose messages.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

1 files changed, 10 insertions, 15 deletions

diff --git a/tests/python2.test b/tests/python2.test
index 7768e81fc..3e14fa2b5 100755
--- a/tests/python2.test
+++ b/tests/python2.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
@@ -20,8 +20,8 @@
 
 set -e
 
-echo 1
-# pythondir not defined
+
+echo 1. pythondir not defined
 
 cat > Makefile.am <<'END'
 PYTHON = x
@@ -32,8 +32,8 @@ $ACLOCAL
 AUTOMAKE_fails -a
 grep AM_PATH_PYTHON stderr
 
-echo 2
-# pkgpythondir not defined
+
+echo 2. pkgpythondir not defined
 
 cat > Makefile.am <<'END'
 PYTHON = x
@@ -45,8 +45,7 @@ AUTOMAKE_fails -a
 grep AM_PATH_PYTHON stderr
 
 
-echo 3
-# pyexecdir not defined
+echo 3. pyexecdir not defined
 
 cat > Makefile.am <<'END'
 PYTHON = x
@@ -58,8 +57,7 @@ AUTOMAKE_fails -a
 grep AM_PATH_PYTHON stderr
 
 
-echo 4
-# pkgpyexecdir not defined
+echo 4. pkgpyexecdir not defined
 
 cat > Makefile.am <<'END'
 PYTHON = x
@@ -71,8 +69,7 @@ AUTOMAKE_fails -a
 grep AM_PATH_PYTHON stderr
 
 
-echo 5
-# PYTHON not defined.
+echo 5. PYTHON not defined.
 
 cat > Makefile.am <<'END'
 pkgpyexecdir = /here/we/go
@@ -84,8 +81,7 @@ AUTOMAKE_fails -a
 grep AM_PATH_PYTHON stderr
 
 
-echo 6
-# Ok.
+echo 6. Ok.
 
 cat > Makefile.am <<'END'
 PYTHON = x
@@ -98,8 +94,7 @@ $AUTOMAKE -a
 test -f py-compile
 
 
-echo 7
-# Ok.
+echo 7. Ok again.
 
 cat > Makefile.am <<'END'
 PYTHON = x