diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2010-05-08 01:27:36 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-06-09 21:01:18 +0200 |
| commit | 8192eeb514acf36f91756a0a0e594b0c22d71efb (patch) | |
| tree | cbe177445b13a32b63f4c79737081309b34e0c1f /tests/confdeps.test | |
| parent | 4c86864aeb8571537c08c20c7bc7d7a459a63d17 (diff) | |
| download | automake-8192eeb514acf36f91756a0a0e594b0c22d71efb.tar.gz | |
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>
Diffstat (limited to 'tests/confdeps.test')
| -rwxr-xr-x | tests/confdeps.test | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/confdeps.test b/tests/confdeps.test index 47cdc16c4..8e1cc64e1 100755 --- a/tests/confdeps.test +++ b/tests/confdeps.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 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,11 +18,13 @@ . ./defs || Exit 1 -echo "FOO = foo" > Makefile.am set -e -echo "$me: Generated by aclocal..." +echo "FOO = foo" > Makefile.am + $ACLOCAL + +echo "$me: Generated by aclocal..." $AUTOMAKE grep '^\$(ACLOCAL_M4):' Makefile.in @@ -30,7 +32,7 @@ echo "$me: Not generated by aclocal..." # Pretend it is not from aclocal (remove the signature), # but keep it correct, i.e., with AM_INIT_AUTOMAKE etc. sed -n '3,$p' aclocal.m4 >aclocal.m4t -mv aclocal.m4t aclocal.m4 +mv -f aclocal.m4t aclocal.m4 $AUTOMAKE grep '^\$(ACLOCAL_M4):' Makefile.in && Exit 1 |