diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2010-06-10 08:34:00 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-06-12 13:32:17 +0200 |
| commit | b563243e60d1886f639b2f6741340e7e1c0d0aef (patch) | |
| tree | b51f0cd579e5d36a0713fdfd1cc09d1773e592db /tests/pluseq3.test | |
| parent | f2d7321b758061ff25c2de8616e4f320ea098462 (diff) | |
| download | automake-b563243e60d1886f639b2f6741340e7e1c0d0aef.tar.gz | |
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'tests/pluseq3.test')
| -rwxr-xr-x | tests/pluseq3.test | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tests/pluseq3.test b/tests/pluseq3.test index 64ddd6902..755002c4d 100755 --- a/tests/pluseq3.test +++ b/tests/pluseq3.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1998, 1999, 2001, 2002, 2004 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2001, 2002, 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 @@ -18,7 +19,11 @@ . ./defs || Exit 1 -echo 'AM_CONDITIONAL(CHECK, true)' >> configure.in +set -e + +cat >> configure.in << 'END' +AM_CONDITIONAL([CHECK], [true]) +END cat > Makefile.am << 'END' @@ -37,13 +42,7 @@ endif END -: > zar -: > doz -: > dog - -set -e - -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE grep '^@CHECK_TRUE@data_DATA = zarrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr \\$' Makefile.in @@ -51,4 +50,4 @@ grep '^@CHECK_TRUE@ doz$' Makefile.in grep '^@CHECK_FALSE@data_DATA = dog$' Makefile.in -Exit 0 +: |