diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2010-06-11 21:22:40 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-06-12 13:01:14 +0200 |
| commit | f2d7321b758061ff25c2de8616e4f320ea098462 (patch) | |
| tree | adf18150efca3cef9c7a59a9b8ff29510889d456 /tests/cond39.test | |
| parent | c1f6cdbdb3ef89d2f6a23e5b9d87baeba73b2735 (diff) | |
| download | automake-f2d7321b758061ff25c2de8616e4f320ea098462.tar.gz | |
Testsuite: ensure verbose printing of captured stderr.
* tests/acloca18.test: Print captured stderr before either failing
or grepping it. Be sure to send captured stderr to stderr, not to
stdout.
* tests/ansi3b.test: Likewise.
* tests/cond39.test: Likewise.
* tests/configure.test: Likewise.
* tests/missing3.test: Likewise.
* tests/missing6.test: Likewise.
* tests/output-order.test: Likewise.
* tests/pr300-ltlib.test: Likewise.
* tests/python6.test: Likewise.
* tests/python7.test: Likewise.
* tests/python8.test: Likewise.
* tests/python9.test: Likewise.
* tests/subobj.test: Likewise.
* tests/vars3.test: Likewise.
* tests/missing4.test: Likewise, and fix a call to grep not to use
the `-c' flag.
* tests/ansi3.test: Likewise, and rely on the `configure.in' stub
created by `./defs', rather than writing one from scratch.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'tests/cond39.test')
| -rwxr-xr-x | tests/cond39.test | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/cond39.test b/tests/cond39.test index 79eaa7077..8d96595ba 100755 --- a/tests/cond39.test +++ b/tests/cond39.test @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008, 2010 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -82,8 +82,8 @@ $AUTOCONF $AUTOMAKE --add-missing ./configure COND=true -$MAKE 2>stderr -cat stderr +$MAKE 2>stderr || { cat stderr >&2; Exit 1; } +cat stderr >&2 grep 'overriding commands' stderr && Exit 1 $MAKE sure-exist ./prog1 && Exit 1 @@ -97,8 +97,8 @@ $MAKE sure-exist $MAKE distclean ./configure COND=false -$MAKE 2>stderr -cat stderr +$MAKE 2>stderr || { cat stderr >&2; Exit 1; } +cat stderr >&2 grep 'overriding commands' stderr && Exit 1 ./prog1 ./sub/prog2 @@ -107,3 +107,5 @@ $MAKE sure-not-exist $MAKE ./prog1 ./sub/prog2 + +: |