automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 6/8] Tests: prefer run_command over direct stdout redirection(s)


From: Stefano Lattarini
Subject: [PATCH 6/8] Tests: prefer run_command over direct stdout redirection(s)
Date: Mon, 1 Feb 2010 17:41:36 +0100
User-agent: KMail/1.12.1 (Linux/2.6.30-2-686; KDE/4.3.2; i686; ; )

Tests: prefer run_command over direct stdout redirection(s)

* tests/cond34.test: Use subroutine `run_command' instead
of "direct" redirection(s) of stdout.
* tests/distdir.test: Likewise.
* tests/dejagnu2.test: Use subroutine `run_command' instead of
"direct" redirection(s) of stdout.  Removed calls to `cat'
which have consequently become useless.
* tests/python11.test: Likewise.
* tests/silent4.test: Likewise.
* tests/silent5.test: Likewise.
* tests/silent6.test: Likewise.
* tests/silent7.test: Likewise.
* tests/silent9.test: Likewise.
* tests/subobj9.test: Likewise.
* tests/suffix11.test: Likewise.
* tests/acloca19.test: Use subroutine `run_command' instead of
"direct" redirection(s) of stdout.  Removed calls to `cat'
which have consequently become useless.  Also, updated copyright
years.
* tests/check11.test: Likewise.
* tests/check2.test: Likewise.
* tests/check3.test: Likewise.
* tests/check4.test: Likewise.
* tests/check5.test: Likewise.
* tests/check7.test: Likewise.
* tests/cond11.test: Likewise.
* tests/cond22.test: Likewise.
* tests/cond30.test: Likewise.
* tests/cond31.test: Likewise.
* tests/cond32.test: Likewise.
* tests/cond37.test: Likewise.
* tests/cond38.test: Likewise.
* tests/conff.test: Likewise.
* tests/exeext.test: Likewise.
* tests/exeext4.test: Likewise.
* tests/gcj4.test: Likewise.
* tests/instdir-java.test: Likewise.
* tests/instdir-lisp.test: Likewise.
* tests/instdir-ltlib.test: Likewise.
* tests/instdir-prog.test: Likewise.
* tests/instdir-python.test: Likewise.
* tests/instdir-texi.test: Likewise.
* tests/instdir.test: Likewise.
* tests/instdir2.test: Likewise.
* tests/lisp7.test: Likewise.
* tests/lisp8.test: Likewise.
* tests/maken3.test: Likewise.
* tests/maken4.test: Likewise.
* tests/output7.test: Likewise.
* tests/parallel-tests.test: Likewise.
* tests/parallel-tests2.test: Likewise.
* tests/parallel-tests6.test: Likewise.
* tests/parallel-tests9.test: Likewise.
* tests/pluseq10.test: Likewise.
* tests/remake6.test: Likewise.
* tests/silent.test: Likewise.
* tests/silent2.test: Likewise.
* tests/silent3.test: Likewise.
* tests/silent8.test: Likewise.
* tests/subst2.test: Likewise.
* tests/substre2.test: Likewise.
* tests/suffix10.test: Likewise.
* tests/suffix12.test: Likewise.
* tests/suffix8.test: Likewise.
* tests/txinfo2.test: Likewise.
From 7f9c00c8b4ac5c8f26dcc632d3f2c60289eda1df Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Fri, 29 Jan 2010 13:27:22 +0100
Subject: [PATCH 6/8] Tests: prefer run_command over direct stdout redirection(s)

* tests/cond34.test: Use subroutine `run_command' instead
of "direct" redirection(s) of stdout.
* tests/distdir.test: Likewise.
* tests/dejagnu2.test: Use subroutine `run_command' instead of
"direct" redirection(s) of stdout.  Removed calls to `cat'
which have consequently become useless.
* tests/python11.test: Likewise.
* tests/silent4.test: Likewise.
* tests/silent5.test: Likewise.
* tests/silent6.test: Likewise.
* tests/silent7.test: Likewise.
* tests/silent9.test: Likewise.
* tests/subobj9.test: Likewise.
* tests/suffix11.test: Likewise.
* tests/acloca19.test: Use subroutine `run_command' instead of
"direct" redirection(s) of stdout.  Removed calls to `cat'
which have consequently become useless.  Also, updated copyright
years.
* tests/check11.test: Likewise.
* tests/check2.test: Likewise.
* tests/check3.test: Likewise.
* tests/check4.test: Likewise.
* tests/check5.test: Likewise.
* tests/check7.test: Likewise.
* tests/cond11.test: Likewise.
* tests/cond22.test: Likewise.
* tests/cond30.test: Likewise.
* tests/cond31.test: Likewise.
* tests/cond32.test: Likewise.
* tests/cond37.test: Likewise.
* tests/cond38.test: Likewise.
* tests/conff.test: Likewise.
* tests/exeext.test: Likewise.
* tests/exeext4.test: Likewise.
* tests/gcj4.test: Likewise.
* tests/instdir-java.test: Likewise.
* tests/instdir-lisp.test: Likewise.
* tests/instdir-ltlib.test: Likewise.
* tests/instdir-prog.test: Likewise.
* tests/instdir-python.test: Likewise.
* tests/instdir-texi.test: Likewise.
* tests/instdir.test: Likewise.
* tests/instdir2.test: Likewise.
* tests/lisp7.test: Likewise.
* tests/lisp8.test: Likewise.
* tests/maken3.test: Likewise.
* tests/maken4.test: Likewise.
* tests/output7.test: Likewise.
* tests/parallel-tests.test: Likewise.
* tests/parallel-tests2.test: Likewise.
* tests/parallel-tests6.test: Likewise.
* tests/parallel-tests9.test: Likewise.
* tests/pluseq10.test: Likewise.
* tests/remake6.test: Likewise.
* tests/silent.test: Likewise.
* tests/silent2.test: Likewise.
* tests/silent3.test: Likewise.
* tests/silent8.test: Likewise.
* tests/subst2.test: Likewise.
* tests/substre2.test: Likewise.
* tests/suffix10.test: Likewise.
* tests/suffix12.test: Likewise.
* tests/suffix8.test: Likewise.
* tests/txinfo2.test: Likewise.
---
 ChangeLog                  |   70 ++++++++++++++++++++++++++++++++++++++++++++
 tests/acloca19.test        |    5 +--
 tests/check11.test         |    8 ++---
 tests/check2.test          |    5 +--
 tests/check3.test          |    5 +--
 tests/check4.test          |   18 ++++-------
 tests/check5.test          |    8 ++--
 tests/check7.test          |    7 ++--
 tests/cond11.test          |    8 ++---
 tests/cond22.test          |    7 ++--
 tests/cond30.test          |    8 ++---
 tests/cond31.test          |    8 ++---
 tests/cond32.test          |   11 ++----
 tests/cond34.test          |   18 +++++-----
 tests/cond37.test          |   14 +++-----
 tests/cond38.test          |    5 +--
 tests/conff.test           |   20 ++++--------
 tests/dejagnu2.test        |    3 +-
 tests/distdir.test         |    8 ++--
 tests/exeext.test          |    8 ++---
 tests/exeext4.test         |   32 ++++++++------------
 tests/gcj4.test            |   14 ++++-----
 tests/instdir-java.test    |    5 +--
 tests/instdir-lisp.test    |    5 +--
 tests/instdir-ltlib.test   |    5 +--
 tests/instdir-prog.test    |    5 +--
 tests/instdir-python.test  |    5 +--
 tests/instdir-texi.test    |    5 +--
 tests/instdir.test         |    5 +--
 tests/instdir2.test        |    5 +--
 tests/lisp7.test           |    5 +--
 tests/lisp8.test           |   11 ++-----
 tests/maken3.test          |    5 +--
 tests/maken4.test          |    5 +--
 tests/output7.test         |   11 +++----
 tests/parallel-tests.test  |   27 ++++++----------
 tests/parallel-tests2.test |   11 ++----
 tests/parallel-tests6.test |    5 +--
 tests/parallel-tests9.test |   12 ++-----
 tests/pluseq10.test        |    5 +--
 tests/python11.test        |    3 +-
 tests/remake6.test         |   14 +++-----
 tests/silent.test          |    8 ++---
 tests/silent2.test         |    8 ++---
 tests/silent3.test         |    8 ++---
 tests/silent4.test         |    6 +--
 tests/silent5.test         |    6 +--
 tests/silent6.test         |    9 ++----
 tests/silent7.test         |   18 ++++-------
 tests/silent8.test         |    9 ++---
 tests/silent9.test         |    6 +--
 tests/subobj9.test         |    3 +-
 tests/subst2.test          |   12 +++----
 tests/substre2.test        |    7 ++--
 tests/suffix10.test        |    5 +--
 tests/suffix11.test        |    3 +-
 tests/suffix12.test        |    5 +--
 tests/suffix8.test         |    5 +--
 tests/txinfo2.test         |    7 ++--
 59 files changed, 264 insertions(+), 305 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 42cd834..80aad4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,75 @@
 2010-01-31  Stefano Lattarini  <address@hidden>
 
+       Testsuite: prefer use of `run_command' subroutine over "direct"
+       stdout redirection in some test scripts (unless the latter is
+       definitely clearer/more convenient).
+       * tests/cond34.test: Use subroutine `run_command' instead
+       of "direct" redirection(s) of stdout.
+       * tests/distdir.test: Likewise.
+       * tests/dejagnu2.test: Use subroutine `run_command' instead of
+       "direct" redirection(s) of stdout.  Removed calls to `cat'
+       which have consequently become useless.
+       * tests/python11.test: Likewise.
+       * tests/silent4.test: Likewise.
+       * tests/silent5.test: Likewise.
+       * tests/silent6.test: Likewise.
+       * tests/silent7.test: Likewise.
+       * tests/silent9.test: Likewise.
+       * tests/subobj9.test: Likewise.
+       * tests/suffix11.test: Likewise.
+       * tests/acloca19.test: Use subroutine `run_command' instead of
+       "direct" redirection(s) of stdout.  Removed calls to `cat'
+       which have consequently become useless.  Also, updated copyright
+       years.
+       * tests/check11.test: Likewise.
+       * tests/check2.test: Likewise.
+       * tests/check3.test: Likewise.
+       * tests/check4.test: Likewise.
+       * tests/check5.test: Likewise.
+       * tests/check7.test: Likewise.
+       * tests/cond11.test: Likewise.
+       * tests/cond22.test: Likewise.
+       * tests/cond30.test: Likewise.
+       * tests/cond31.test: Likewise.
+       * tests/cond32.test: Likewise.
+       * tests/cond37.test: Likewise.
+       * tests/cond38.test: Likewise.
+       * tests/conff.test: Likewise.
+       * tests/exeext.test: Likewise.
+       * tests/exeext4.test: Likewise.
+       * tests/gcj4.test: Likewise.
+       * tests/instdir-java.test: Likewise.
+       * tests/instdir-lisp.test: Likewise.
+       * tests/instdir-ltlib.test: Likewise.
+       * tests/instdir-prog.test: Likewise.
+       * tests/instdir-python.test: Likewise.
+       * tests/instdir-texi.test: Likewise.
+       * tests/instdir.test: Likewise.
+       * tests/instdir2.test: Likewise.
+       * tests/lisp7.test: Likewise.
+       * tests/lisp8.test: Likewise.
+       * tests/maken3.test: Likewise.
+       * tests/maken4.test: Likewise.
+       * tests/output7.test: Likewise.
+       * tests/parallel-tests.test: Likewise.
+       * tests/parallel-tests2.test: Likewise.
+       * tests/parallel-tests6.test: Likewise.
+       * tests/parallel-tests9.test: Likewise.
+       * tests/pluseq10.test: Likewise.
+       * tests/remake6.test: Likewise.
+       * tests/silent.test: Likewise.
+       * tests/silent2.test: Likewise.
+       * tests/silent3.test: Likewise.
+       * tests/silent8.test: Likewise.
+       * tests/subst2.test: Likewise.
+       * tests/substre2.test: Likewise.
+       * tests/suffix10.test: Likewise.
+       * tests/suffix12.test: Likewise.
+       * tests/suffix8.test: Likewise.
+       * tests/txinfo2.test: Likewise.
+
+2010-01-31  Stefano Lattarini  <address@hidden>
+
        Testsuite: improve description of `run_command' function in README
        * tests/README: Improve and extend the existing description of
        the `run_command' function, and explicitly tell that it can be
diff --git a/tests/acloca19.test b/tests/acloca19.test
index accad81..cdbc8ba 100755
--- a/tests/acloca19.test
+++ b/tests/acloca19.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
+# Copyright (C) 2005, 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
@@ -41,8 +41,7 @@ END
 
 $ACLOCAL
 $AUTOCONF
-./configure >stdout
-cat stdout
+run_command ./configure
 grep GREPME stdout
 grep 'aconfig\.ac' aclocal.m4 && Exit 1
 grep 'bconfig\.ac' aclocal.m4 && Exit 1
diff --git a/tests/check11.test b/tests/check11.test
index d3118a7..6307908 100755
--- a/tests/check11.test
+++ b/tests/check11.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -42,12 +42,10 @@ $AUTOMAKE -a
 unset TESTS || :
 
 ./configure
-env TESTS=skip $MAKE -e check >stdout
-cat stdout
+run_command env TESTS=skip $MAKE -e check
 grep '1.*passed' stdout && Exit 1
 
-env TESTS="skip skip2" $MAKE -e check >stdout
-cat stdout
+run_command env TESTS="skip skip2" $MAKE -e check
 grep '2.*passed' stdout && Exit 1
 
 :
diff --git a/tests/check2.test b/tests/check2.test
index 1db0454..21f0a2c 100755
--- a/tests/check2.test
+++ b/tests/check2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006, 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
@@ -49,8 +49,7 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure
-$MAKE check >stdout
-cat stdout
+run_command $MAKE check
 grep 'PASS: subrun.sh' stdout
 
 # check should depend directly on check-am (similar tests are
diff --git a/tests/check3.test b/tests/check3.test
index 65705c4..880754e 100755
--- a/tests/check3.test
+++ b/tests/check3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2007, 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
@@ -58,8 +58,7 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure --prefix "`pwd`/inst"
-$MAKE check >stdout
-cat stdout
+run_command $MAKE check
 grep 'PASS: subrun.sh' stdout
 
 # check should depend directly on check-am (similar tests are
diff --git a/tests/check4.test b/tests/check4.test
index 70dc55a..1d9a7f8 100755
--- a/tests/check4.test
+++ b/tests/check4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2007, 2008, 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
@@ -50,21 +50,18 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure --prefix "`pwd`/inst"
-$MAKE check >stdout && { cat stdout; Exit 1; }
-cat stdout
+run_command -e FAIL $MAKE check
 grep 'FAIL: fail.sh' stdout
 grep 'PASS: ok.sh' stdout && Exit 1
 
-# The exit status of `make -k' can be anything
-# (depending on the Make implementation)
-$MAKE -k check >stdout || :
-cat stdout
+# The exit status of `make -k' can be anything (depending on the
+# Make implementation), so ignore the exit status of make.
+run_command -e IGNORE $MAKE -k check
 grep 'FAIL: fail.sh' stdout
 grep 'PASS: ok.sh' stdout
 
 # should also works when -k is not in first position
-$MAKE -s -k check >stdout || :
-cat stdout
+run_command -e IGNORE $MAKE -s -k check
 grep 'FAIL: fail.sh' stdout
 grep 'PASS: ok.sh' stdout
 
@@ -78,7 +75,6 @@ grep 'PASS: ok.sh' stdout
 # Try with a long-option that do not have a short option equivalent
 # (here, --no-print-directory).  That should cause all options to
 # appear verbatim in MAKEFLAGS.
-$MAKE --no-print-directory -k check >stdout || :
-cat stdout
+run_command -e IGNORE $MAKE --no-print-directory -k check
 grep 'FAIL: fail.sh' stdout
 grep 'PASS: ok.sh' stdout
diff --git a/tests/check5.test b/tests/check5.test
index 857432b..cb87740 100755
--- a/tests/check5.test
+++ b/tests/check5.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 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
@@ -49,9 +50,8 @@ cp one.c two.c
 unset TESTS || :
 $MAKE check
 test -f ok
-EXEEXT=.bin $MAKE -e print-tests >output
-cat output
+run_command env EXEEXT=.bin $MAKE -e 'print-tests'
 # No am__EXEEXT_* variable is needed.
 grep '_EXEEXT_[1-9]' Makefile.in && Exit 1
-grep 'BEG: one.bin two.bin :END' output
+grep 'BEG: one.bin two.bin :END' stdout
 $FGREP 'TESTS = $(check_PROGRAMS)' Makefile.in
diff --git a/tests/check7.test b/tests/check7.test
index 1653a8d..6fde486 100755
--- a/tests/check7.test
+++ b/tests/check7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2007  Free Software Foundation, Inc.
+# Copyright (C) 2007, 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
@@ -55,9 +55,8 @@ $AUTOMAKE -a
 
 ./configure
 $MAKE check
-EXEEXT=.bin $MAKE -e print-xfail-tests >foo
-cat foo
-grep 'BEG: a.bin b c.bin d.bin :END' foo
+run_command env EXEEXT=.bin $MAKE -e print-xfail-tests
+grep 'BEG: a.bin b c.bin d.bin :END' stdout
 
 $MAKE distclean
 mkdir build
diff --git a/tests/cond11.test b/tests/cond11.test
index 15c6c2a..f29d48f 100755
--- a/tests/cond11.test
+++ b/tests/cond11.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -54,11 +54,9 @@ $AUTOCONF
 $AUTOMAKE
 
 ./configure
-$MAKE -e print > stdout
-cat stdout
+run_command $MAKE -e print
 grep 'BEG: faz.la :END' stdout
 
 ./configure two=yes
-$MAKE -e print > stdout
-cat stdout
+run_command $MAKE -e print
 grep 'BEG: :END' stdout
diff --git a/tests/cond22.test b/tests/cond22.test
index 4ef1967..11498b3 100755
--- a/tests/cond22.test
+++ b/tests/cond22.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
@@ -64,6 +64,5 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure
-OBJEXT=oo $MAKE -e echo > output
-cat output
-$FGREP 'BEG: one.oo two.oo three.oo three2.oo :END' output
+run_command env OBJEXT=oo $MAKE -e echo
+$FGREP 'BEG: one.oo two.oo three.oo three2.oo :END' stdout
diff --git a/tests/cond30.test b/tests/cond30.test
index e092c45..e2327c5 100755
--- a/tests/cond30.test
+++ b/tests/cond30.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003, 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
@@ -44,13 +44,11 @@ $AUTOCONF
 $AUTOMAKE
 
 ./configure
-EXEEXT=.foo $MAKE -e print > stdout
-cat stdout
+run_command env EXEEXT=.foo $MAKE -e print
 grep 'BEG: a.foo :END' stdout
 
 ./configure two=yes
-EXEEXT=.foo $MAKE -e print > stdout
-cat stdout
+run_command env EXEEXT=.foo $MAKE -e print
 grep 'BEG: b.foo :END' stdout
 
 grep 'a_SOURCES = a.c' Makefile.in
diff --git a/tests/cond31.test b/tests/cond31.test
index 4975ef4..4e6148c 100755
--- a/tests/cond31.test
+++ b/tests/cond31.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -45,11 +45,9 @@ $AUTOCONF
 $AUTOMAKE
 
 ./configure
-$MAKE -e print > stdout
-cat stdout
+run_command $MAKE -e print
 grep 'BEG: c0.o c1.o :END' stdout
 
 ./configure two=yes
-$MAKE -e print > stdout
-cat stdout
+run_command $MAKE -e print
 grep 'BEG: c0.o c2.o c3.la :END' stdout
diff --git a/tests/cond32.test b/tests/cond32.test
index ae5c8c6..0c40b3e 100755
--- a/tests/cond32.test
+++ b/tests/cond32.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2003, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 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
@@ -54,16 +54,13 @@ $AUTOCONF
 $AUTOMAKE
 
 ./configure
-$MAKE -e print > stdout
-cat stdout
+run_command $MAKE -e print
 grep 'BEG: foo.o nonsense.a :END' stdout
 
 ./configure two=yes three=
-$MAKE -e print > stdout
-cat stdout
+run_command $MAKE -e print
 grep 'BEG: bar.o :END' stdout
 
 ./configure two=yes three=yes
-$MAKE -e print > stdout
-cat stdout
+run_command $MAKE -e print
 grep 'BEG: baz.o :END' stdout
diff --git a/tests/cond34.test b/tests/cond34.test
index 9e42eea..0885ce9 100755
--- a/tests/cond34.test
+++ b/tests/cond34.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
@@ -56,13 +56,13 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure
-$MAKE dep-test1 >out
-grep 'BEG: one.z somethingelse.a :END' out
-$MAKE dep-test2 >out
-grep 'BEG: three.z :END' out
+run_command $MAKE dep-test1
+grep 'BEG: one.z somethingelse.a :END' stdout
+run_command $MAKE dep-test2
+grep 'BEG: three.z :END' stdout
 
 ./configure two=2
-$MAKE dep-test1 >out
-grep 'BEG: two.z somethingelse.a :END' out
-$MAKE dep-test2 >out
-grep 'BEG: two.z somethingelse.a :END' out
+run_command $MAKE dep-test1
+grep 'BEG: two.z somethingelse.a :END' stdout
+run_command $MAKE dep-test2
+grep 'BEG: two.z somethingelse.a :END' stdout
diff --git a/tests/cond37.test b/tests/cond37.test
index 144c2ac..4da74b6 100755
--- a/tests/cond37.test
+++ b/tests/cond37.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
@@ -41,19 +41,15 @@ $AUTOCONF
 $AUTOMAKE
 
 ./configure
-$MAKE check >stdout
-cat stdout
+run_command $MAKE check
 grep GrepMe1 stdout && Exit 1
-$MAKE install >stdout
-cat stdout
+run_command $MAKE install
 grep GrepMe2 stdout
 
 ./configure case_A=1
-$MAKE check >stdout
-cat stdout
+run_command $MAKE check
 grep GrepMe1 stdout
-$MAKE install >stdout
-cat stdout
+run_command $MAKE install
 grep GrepMe2 stdout && Exit 1
 
 :
diff --git a/tests/cond38.test b/tests/cond38.test
index 0051e1f..e9fedb7 100755
--- a/tests/cond38.test
+++ b/tests/cond38.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
+# Copyright (C) 2005, 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
@@ -59,8 +59,7 @@ $AUTOCONF
 $AUTOMAKE
 
 ./configure
-$MAKE print >stdout
-cat stdout
+run_command $MAKE print
 # Check good ordering
 grep 'BEG: a b c d e f g h iXYZ jZYX :END' stdout
 # Make sure no extra variable was created for the last 3 items.
diff --git a/tests/conff.test b/tests/conff.test
index 353cb8e..8507654 100755
--- a/tests/conff.test
+++ b/tests/conff.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -50,11 +50,9 @@ $AUTOMAKE
 $MAKE
 
 cd bar
-$MAKE top-rule >stdout
-cat stdout
+run_command $MAKE top-rule
 grep 'top rule' stdout
-$MAKE bot-rule >stdout
-cat stdout
+run_command $MAKE bot-rule
 grep 'bot rule' stdout
 cd ..
 
@@ -67,11 +65,9 @@ END
 $MAKE
 
 cd bar
-$MAKE top-rule >stdout
-cat stdout
+run_command $MAKE top-rule
 grep 'top2 rule' stdout
-$MAKE bot-rule >stdout
-cat stdout
+run_command $MAKE bot-rule
 grep 'bot rule' stdout
 cd ..
 
@@ -84,11 +80,9 @@ END
 $MAKE
 
 cd bar
-$MAKE top-rule >stdout
-cat stdout
+run_command $MAKE top-rule
 grep 'top2 rule' stdout
-$MAKE bot-rule >stdout
-cat stdout
+run_command $MAKE bot-rule
 grep 'bot2 rule' stdout
 cd ..
 
diff --git a/tests/dejagnu2.test b/tests/dejagnu2.test
index 09356ab..daa20fc 100755
--- a/tests/dejagnu2.test
+++ b/tests/dejagnu2.test
@@ -37,8 +37,7 @@ grep site.exp Makefile.in
 test `grep '^site\.exp:' Makefile.in | wc -l` -eq 1
 
 ./configure
-$MAKE site.exp >stdout
-cat stdout
+run_command $MAKE site.exp
 grep foo stdout
 
 run_command -e 1 $AUTOMAKE
diff --git a/tests/distdir.test b/tests/distdir.test
index af2d01a..12b95c9 100755
--- a/tests/distdir.test
+++ b/tests/distdir.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2006, 2007, 2009  Free Software
-# Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2003, 2006, 2007, 2009, 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
@@ -69,11 +69,11 @@ test -d foo && Exit 1
 
 rm -rf distdir-1.0
 # Remove the dot from VERSION for the next grep.
-VERSION=10 MKDIR_P='echo MKDIR_P' $MAKE -e distdir >make.log || :
+run_command -e IGNORE env VERSION=10 MKDIR_P='echo MKDIR_P' $MAKE -e distdir
 
 # Make sure no `./' appear in the directory names.  srcdir is `..', so
 # this also checks that no directory is created in the source tree.
-grep 'MKDIR_P.*\.' make.log && Exit 1
+grep 'MKDIR_P.*\.' stdout && Exit 1
 
 cd ..
 ./configure --prefix "`pwd`"
diff --git a/tests/exeext.test b/tests/exeext.test
index 4ad837b..767ed32 100755
--- a/tests/exeext.test
+++ b/tests/exeext.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -70,8 +70,7 @@ grep 'maude3__EXEEXT__OBJECTS' Makefile.in && Exit 1
 
 ./configure
 
-EXEEXT=.foo $MAKE -e print > stdout
-cat stdout
+run_command env EXEEXT=.foo $MAKE -e print
 
 grep '1BEG: maude.foo mt.foo :END1' stdout
 grep '2BEG: maude.static.foo :END2' stdout
@@ -80,8 +79,7 @@ grep '4BEG: rmt.foo :END4' stdout
 
 ./configure revert=yes
 
-EXEEXT=.foo $MAKE -e print > stdout
-cat stdout
+run_command env EXEEXT=.foo $MAKE -e print
 
 grep '1BEG: maude.foo :END1' stdout
 grep '2BEG: maude.static.foo :END2' stdout
diff --git a/tests/exeext4.test b/tests/exeext4.test
index 7bea7d4..0ac9d3a 100755
--- a/tests/exeext4.test
+++ b/tests/exeext4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 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
@@ -54,26 +54,20 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure
-$MAKE print-bin > output
-cat output
-grep 'prg1.bin prg2.bin prg1.bin prg2.bin prg3.bin' output
-$MAKE print-extra > output
-cat output
-grep 'prg1.bin prg2.bin prg3.bin' output
-$MAKE print-tests > output
-cat output
-grep 'prg1.bin prg3.bin prg4' output
+run_command $MAKE print-bin
+grep 'prg1.bin prg2.bin prg1.bin prg2.bin prg3.bin' stdout
+run_command $MAKE print-extra
+grep 'prg1.bin prg2.bin prg3.bin' stdout
+run_command $MAKE print-tests
+grep 'prg1.bin prg3.bin prg4' stdout
 
 ./configure cond=yes
-$MAKE print-bin > output
-cat output
-grep 'prg1.bin prg2.bin prg1.bin prg2.bin prg3.bin bar.bin baz.bin' output
-$MAKE print-tests > output
-cat output
-grep 'prg1.bin prg3.bin prg4 baz.bin bar.bin' output
-$MAKE print-barbaz > output
-cat output
-grep 'bar baz bar' output
+run_command $MAKE print-bin
+grep 'prg1.bin prg2.bin prg1.bin prg2.bin prg3.bin bar.bin baz.bin' stdout
+run_command $MAKE print-tests
+grep 'prg1.bin prg3.bin prg4 baz.bin bar.bin' stdout
+run_command $MAKE print-barbaz
+grep 'bar baz bar' stdout
 
 # Only two am__EXEEXT_* variables are needed here: one for BAR, and one
 # BAZ.  The latter must use the former.
diff --git a/tests/gcj4.test b/tests/gcj4.test
index f3828ea..99442c2 100755
--- a/tests/gcj4.test
+++ b/tests/gcj4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007, 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
@@ -34,16 +34,14 @@ set -e
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
-./configure >stdout
-cat stdout
+run_command ./configure
+mv stdout conf.out
 
 # Configure must be checking the dependency style of gcj ...
-grep 'dependency style of gcj' stdout >filt
-cat filt
-
+run_command grep 'dependency style of gcj' conf.out
 # ... only once.
-test `wc -l < filt` = 1
+test `wc -l < stdout` = 1
 
 # Accept any outcome but `none'
 # (at the time of writing it should be gcc or gcc3).
-grep -v none filt
+grep -v none stdout
diff --git a/tests/instdir-java.test b/tests/instdir-java.test
index 6adc82e..2d6e482 100755
--- a/tests/instdir-java.test
+++ b/tests/instdir-java.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -53,8 +53,7 @@ test ! -d "$instdir"
 $MAKE -e install DESTDIR="$destdir"
 test ! -d "$instdir"
 test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE -e uninstall
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
 :
diff --git a/tests/instdir-lisp.test b/tests/instdir-lisp.test
index 475e935..7031f6b 100755
--- a/tests/instdir-lisp.test
+++ b/tests/instdir-lisp.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -51,8 +51,7 @@ test ! -d "$instdir"
 $MAKE -e install DESTDIR="$destdir"
 test ! -d "$instdir"
 test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE -e uninstall
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
 :
diff --git a/tests/instdir-ltlib.test b/tests/instdir-ltlib.test
index 1fb4f37..6a1f671 100755
--- a/tests/instdir-ltlib.test
+++ b/tests/instdir-ltlib.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -67,8 +67,7 @@ test ! -d "$instdir"
 $MAKE -e install DESTDIR="$destdir"
 test ! -d "$instdir"
 test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE -e uninstall
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
 :
diff --git a/tests/instdir-prog.test b/tests/instdir-prog.test
index 6a73b75..a4d0fff 100755
--- a/tests/instdir-prog.test
+++ b/tests/instdir-prog.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -65,8 +65,7 @@ test ! -d "$instdir"
 $MAKE -e install DESTDIR="$destdir"
 test ! -d "$instdir"
 test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE -e uninstall
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
 :
diff --git a/tests/instdir-python.test b/tests/instdir-python.test
index 2af2408..dd6a632 100755
--- a/tests/instdir-python.test
+++ b/tests/instdir-python.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -55,8 +55,7 @@ test ! -d "$instdir"
 $MAKE -e install DESTDIR="$destdir"
 test ! -d "$instdir"
 test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE -e uninstall
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
 :
diff --git a/tests/instdir-texi.test b/tests/instdir-texi.test
index 50617c8..cefa194 100755
--- a/tests/instdir-texi.test
+++ b/tests/instdir-texi.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -63,8 +63,7 @@ test ! -d "$instdir"
 $MAKE -e install install-html install-dvi install-ps install-pdf 
DESTDIR="$destdir"
 test ! -d "$instdir"
 test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE -e uninstall
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
 :
diff --git a/tests/instdir.test b/tests/instdir.test
index 1132738..99fad11 100755
--- a/tests/instdir.test
+++ b/tests/instdir.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -64,8 +64,7 @@ test ! -d "$instdir"
 $MAKE -e install DESTDIR="$destdir"
 test ! -d "$instdir"
 test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE -e uninstall
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
 :
diff --git a/tests/instdir2.test b/tests/instdir2.test
index b0b78b7..aa35bfb 100755
--- a/tests/instdir2.test
+++ b/tests/instdir2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -86,8 +86,7 @@ test ! -d "$instdir"
 $MAKE -e install DESTDIR="$destdir"
 test ! -d "$instdir"
 test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE -e uninstall
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
 :
diff --git a/tests/lisp7.test b/tests/lisp7.test
index cf52527..d78290f 100755
--- a/tests/lisp7.test
+++ b/tests/lisp7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
+# Copyright (C) 2005, 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
@@ -39,9 +39,8 @@ $AUTOCONF
 $AUTOMAKE --add-missing
 ./configure
 
-$MAKE >stdout
+run_command $MAKE
 
-cat stdout
 test 1 -eq `grep 'Warnings can be ignored' stdout | wc -l`
 
 test ! -f am-one.elc
diff --git a/tests/lisp8.test b/tests/lisp8.test
index 8a3edf2..c9cb1c7 100755
--- a/tests/lisp8.test
+++ b/tests/lisp8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2008, 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
@@ -39,10 +39,7 @@ $AUTOCONF
 $AUTOMAKE --add-missing
 ./configure
 
-: >stdout
-$MAKE -j >>stdout || { cat stdout; Exit 1; }
-
-cat stdout
+run_command $MAKE -j
 test 1 -eq `grep 'Warnings can be ignored' stdout | wc -l`
 
 test -f am-one.elc
@@ -52,10 +49,8 @@ test -f elc-stamp
 
 rm -f am-*.elc
 
-: >stdout
-$MAKE -j >>stdout
+run_command $MAKE -j
 
-cat stdout
 test 1 -eq `grep 'Warnings can be ignored' stdout | wc -l`
 test -f am-one.elc
 test -f am-two.elc
diff --git a/tests/maken3.test b/tests/maken3.test
index b839d0d..156862f 100755
--- a/tests/maken3.test
+++ b/tests/maken3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -129,8 +129,7 @@ check_targets ()
     install-info install-html install-dvi install-pdf install-ps \
     installcheck installdirs tags TAGS mostlyclean maintainer-clean
   do
-    $MAKE -n $target >stdout || { cat stdout; Exit 1; }
-    cat stdout
+    run_command $MAKE -n $target
     case $target in
     install-* | installdirs | tags | TAGS ) ;;
     *)
diff --git a/tests/maken4.test b/tests/maken4.test
index ae5ce27..43acca4 100755
--- a/tests/maken4.test
+++ b/tests/maken4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -131,8 +131,7 @@ check_targets ()
     install-info install-html install-dvi install-pdf install-ps \
     installcheck installdirs tags TAGS mostlyclean maintainer-clean
   do
-    $MAKE -n $target >stdout || { cat stdout; Exit 1; }
-    cat stdout
+    run_command $MAKE -n $target
     case $target in
     install-* | installdirs | tags | TAGS ) ;;
     *)
diff --git a/tests/output7.test b/tests/output7.test
index 878c091..f72f212 100755
--- a/tests/output7.test
+++ b/tests/output7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -65,10 +65,9 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure
-$MAKE >output
-cat output
-grep in--mk output
-grep in--sub output
-grep at--toplevel output
+run_command $MAKE
+grep in--mk stdout
+grep in--sub stdout
+grep at--toplevel stdout
 
 $MAKE distcheck
diff --git a/tests/parallel-tests.test b/tests/parallel-tests.test
index 385cef3..cc90f94 100755
--- a/tests/parallel-tests.test
+++ b/tests/parallel-tests.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -65,8 +65,7 @@ unset TESTS || :
 
 ./configure
 # No hard errors: all tests should be run, there should be one failure.
-env DISABLE_HARD_ERRORS=yes $MAKE -e check >stdout && { cat stdout; Exit 1; }
-cat stdout
+run_command -e FAIL env DISABLE_HARD_ERRORS=yes $MAKE -e check
 test `grep -c '^FAIL' stdout` -eq 1
 test -f mylog.log
 test `grep -c '^FAIL' mylog.log` -eq 1
@@ -86,8 +85,7 @@ test ! -f mylog.log
 test -f unrelated.log
 
 $MAKE clean
-$MAKE check >stdout && { cat stdout; Exit 1; }
-cat stdout
+run_command -e FAIL $MAKE check
 # Now, there should be two errors: bar.test is a hard error.
 test `grep -c '^FAIL' stdout` -eq 2
 test `grep -c '^FAIL' mylog.log` -eq 2
@@ -98,7 +96,7 @@ test `grep -c '^FAIL' mylog.log` -eq 2
 # take bar.log into account, because the $(TEST_SUITE_LOG) rule
 # does not "see" baz.log.  Hmm.
 $MAKE clean
-env TESTS='bar.test' $MAKE -e check && Exit 1
+run_command -e FAIL env TESTS='bar.test' $MAKE -e check
 test -f baz.log
 test -f bar.log
 test ! -f foo.log
@@ -110,7 +108,7 @@ test -f mylog.log
 # Note that the previous test and this one taken together expose the timing
 # issue that requires the check-TESTS rule to always remove TEST_SUITE_LOG
 # before running the tests lazily.
-env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; }
+run_command -e FAIL env RECHECK_LOGS= $MAKE -e check
 cat stdout
 test -f foo.log
 grep foo.test stdout
@@ -120,37 +118,32 @@ grep '2.*tests.*failed' stdout
 
 # Now, explicitly retry with all test logs already updated, and ensure
 # that the summary is still displayed.
-env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; }
-cat stdout
+run_command -e FAIL env RECHECK_LOGS= $MAKE -e check
 grep foo.test stdout && Exit 1
 grep bar.test stdout && Exit 1
 grep baz.test stdout && Exit 1
 grep '2.*tests.*failed' stdout
 
 # Lazily rerunning only foo should only rerun this one test.
-env RECHECK_LOGS=foo.log $MAKE -e check > stdout && { cat stdout; Exit 1; }
-cat stdout
+run_command -e FAIL env RECHECK_LOGS=foo.log $MAKE -e check
 grep foo.test stdout
 grep bar.test stdout && Exit 1
 grep baz.test stdout && Exit 1
 grep '2.*tests.*failed' stdout
 
 # Test VERBOSE.
-env VERBOSE=yes $MAKE -e check > stdout && { cat stdout; Exit 1; }
-cat stdout
+run_command -e FAIL env VERBOSE=yes $MAKE -e check
 grep 'this is.*bar.test' stdout
 grep 'this is.*baz.test' stdout
 
 $MAKE clean
-env TEST_LOGS=baz.log $MAKE -e check > stdout && { cat stdout; Exit 1; }
-cat stdout
+run_command -e FAIL env TEST_LOGS=baz.log $MAKE -e check
 grep foo.test stdout && Exit 1
 grep bar.test stdout && Exit 1
 grep baz.test stdout
 
 $MAKE clean
-env TESTS=baz.test $MAKE -e check > stdout && { cat stdout; Exit 1; }
-cat stdout
+run_command -e FAIL env TESTS=baz.test $MAKE -e check
 grep foo.test stdout && Exit 1
 grep bar.test stdout && Exit 1
 grep baz.test stdout
diff --git a/tests/parallel-tests2.test b/tests/parallel-tests2.test
index 5101e47..8d66313 100755
--- a/tests/parallel-tests2.test
+++ b/tests/parallel-tests2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -59,20 +59,17 @@ $AUTOCONF
 $AUTOMAKE -a
 
 ./configure
-$MAKE check-html >stdout && { cat stdout; Exit 1; }
-cat stdout
+run_command -e FAIL $MAKE check-html
 test -f mylog.html
 
 # Always create the HTML output, even if there were no failures.
 rm -f mylog.html
-env TESTS=foo.test $MAKE -e check-html >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command env TESTS=foo.test $MAKE -e check-html
 test -f mylog.html
 
 # Create HTML output also with recheck-html
 rm -f mylog.html
-env TESTS=foo.test $MAKE -e recheck-html >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command env TESTS=foo.test $MAKE -e recheck-html
 test -f mylog.html
 
 # check-html and recheck-html should cause check_SCRIPTS to be created,
diff --git a/tests/parallel-tests6.test b/tests/parallel-tests6.test
index 5dbb433..442c7ca 100755
--- a/tests/parallel-tests6.test
+++ b/tests/parallel-tests6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -37,8 +37,7 @@ $AUTOMAKE -a
 unset TESTS || :
 
 ./configure
-$MAKE check >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE check
 grep '0 tests' stdout
 
 Exit 0
diff --git a/tests/parallel-tests9.test b/tests/parallel-tests9.test
index 300a2f0..8150aca 100755
--- a/tests/parallel-tests9.test
+++ b/tests/parallel-tests9.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -57,11 +57,8 @@ $AUTOCONF
 $AUTOMAKE -a
 
 ./configure
-$MAKE check >stdout && { cat stdout; Exit 1; }
-cat stdout
-
-$MAKE recheck >stdout && { cat stdout; Exit 1; }
-cat stdout
+run_command -e FAIL $MAKE check
+run_command -e FAIL $MAKE recheck
 grep foo.test stdout && Exit 1
 grep bar.test stdout || Exit 1
 grep baz.test stdout || Exit 1
@@ -70,8 +67,7 @@ grep '2 of 2.*failed' stdout
 # If we cannot read the log file, then redo it as well.
 chmod a-r foo.log
 if test ! -r foo.log; then
-   $MAKE recheck >stdout && { cat stdout; Exit 1; }
-   cat stdout
+   run_command -e FAIL $MAKE recheck
    grep foo.test stdout || Exit 1
 fi
 
diff --git a/tests/pluseq10.test b/tests/pluseq10.test
index 5548e6d..c49c940 100755
--- a/tests/pluseq10.test
+++ b/tests/pluseq10.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -48,6 +48,5 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure
-$MAKE print >stdout
-cat stdout
+run_command $MAKE print
 grep 'BEG: 0.h a0.h a1.h a2.h a3.h :END' stdout
diff --git a/tests/python11.test b/tests/python11.test
index 30e11e3..10e29d6 100755
--- a/tests/python11.test
+++ b/tests/python11.test
@@ -49,6 +49,5 @@ $AUTOCONF
 ./configure
 
 # Any user setting should be used.
-./configure PYTHON=foo >stdout && { cat stdout; Exit 1; }
-cat stdout
+run_command -e FAILURE ./configure PYTHON=foo
 grep 'PYTHON = foo' stdout
diff --git a/tests/remake6.test b/tests/remake6.test
index a25e486..4455ff1 100755
--- a/tests/remake6.test
+++ b/tests/remake6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 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
@@ -42,23 +42,19 @@ $MAKE
 # only.
 
 rm -f Makefile.in
-$MAKE >stdout
-cat stdout
+run_command $MAKE
 test `grep -c " --run " stdout` -eq 1
 
 rm -f sub/Makefile.in
-$MAKE >stdout
-cat stdout
+run_command $MAKE
 test `grep -c " --run " stdout` -eq 1
 
 $sleep  # Let touched files appear newer.
 
 touch Makefile.am
-$MAKE >stdout
-cat stdout
+run_command $MAKE
 test `grep -c " --run " stdout` -eq 1
 
 touch sub/Makefile.am
-$MAKE >stdout
-cat stdout
+run_command $MAKE
 test `grep -c " --run " stdout` -eq 1
diff --git a/tests/silent.test b/tests/silent.test
index 70fcaae..cd42600 100755
--- a/tests/silent.test
+++ b/tests/silent.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -61,8 +61,7 @@ $AUTOMAKE --add-missing
 $AUTOCONF
 
 ./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE
 grep ' -c' stdout && Exit 1
 grep ' -o foo' stdout && Exit 1
 grep mv stdout && Exit 1
@@ -76,8 +75,7 @@ grep 'CCLD .*baz' stdout
 grep 'CCLD .*bla' stdout
 
 $MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE V=1
 grep ' -c' stdout
 grep ' -o foo' stdout
 grep 'CC .*foo\.' stdout && Exit 1
diff --git a/tests/silent2.test b/tests/silent2.test
index e0b0935..546bf34 100755
--- a/tests/silent2.test
+++ b/tests/silent2.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -63,8 +63,7 @@ $AUTOMAKE --add-missing
 $AUTOCONF
 
 ./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE
 grep ' -c' stdout && Exit 1
 grep ' -o foo' stdout && Exit 1
 grep mv stdout && Exit 1
@@ -78,8 +77,7 @@ grep 'CCLD .*baz' stdout
 grep 'CCLD .*bla' stdout
 
 $MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE V=1
 grep ' -c' stdout
 grep ' -o foo' stdout
 grep 'CC .*foo\.' stdout && Exit 1
diff --git a/tests/silent3.test b/tests/silent3.test
index 70023ec..22c78b0 100755
--- a/tests/silent3.test
+++ b/tests/silent3.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -64,8 +64,7 @@ $AUTOMAKE --add-missing
 $AUTOCONF
 
 ./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE
 grep ' -c' stdout && Exit 1
 grep ' -o libfoo' stdout && Exit 1
 grep mv stdout && Exit 1
@@ -79,8 +78,7 @@ grep ' CCLD .*baz' stdout
 grep ' CCLD .*bla' stdout
 
 $MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE V=1
 grep ' -c' stdout
 grep ' -o libfoo' stdout
 grep ' CC .*foo\.' stdout && Exit 1
diff --git a/tests/silent4.test b/tests/silent4.test
index 3fd9f65..7236bb7 100755
--- a/tests/silent4.test
+++ b/tests/silent4.test
@@ -65,8 +65,7 @@ $AUTOMAKE --add-missing
 $AUTOCONF
 
 ./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE
 grep ' -c' stdout && Exit 1
 grep ' -o libfoo' stdout && Exit 1
 grep mv stdout && Exit 1
@@ -80,8 +79,7 @@ grep ' CCLD .*baz' stdout
 grep ' CCLD .*bla' stdout
 
 $MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE V=1
 grep ' -c' stdout
 grep ' -o libfoo' stdout
 grep ' CC .*foo\.' stdout && Exit 1
diff --git a/tests/silent5.test b/tests/silent5.test
index 1f06cf0..7ab8e3c 100755
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -113,8 +113,7 @@ for config_args in '' 
am_cv_CC_dependencies_compiler_type=gcc \
   --disable-dependency-tracking
 do
   ./configure $config_args --enable-silent-rules
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
+  run_command $MAKE
   grep ' -c' stdout && Exit 1
   grep ' -o ' stdout && Exit 1
   grep mv stdout && Exit 1
@@ -140,8 +139,7 @@ do
   grep 'CCLD .*bla' stdout
 
   $MAKE clean
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
+  run_command $MAKE V=1
   grep ' -c' stdout
   grep ' -o ' stdout
 
diff --git a/tests/silent6.test b/tests/silent6.test
index da63a0c..b01d820 100755
--- a/tests/silent6.test
+++ b/tests/silent6.test
@@ -45,22 +45,19 @@ $AUTOMAKE --add-missing
 $AUTOCONF
 
 ./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE
 grep 'GEN foo' stdout
 grep 'cp ' stdout && Exit 1
 
 $MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE V=1
 grep 'GEN foo' stdout && Exit 1
 grep 'cp ' stdout
 
 $MAKE distclean
 
 ./configure --disable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE
 grep 'GEN foo' stdout && Exit 1
 grep 'cp ' stdout
 
diff --git a/tests/silent7.test b/tests/silent7.test
index 13c6fb4..3b519ab 100755
--- a/tests/silent7.test
+++ b/tests/silent7.test
@@ -44,22 +44,19 @@ $AUTOMAKE --add-missing
 $AUTOCONF
 
 ./configure --disable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE
 grep 'GEN.*foo' stdout && Exit 1
 grep 'cp ' stdout
 grep 'echo ' stdout
 
 $MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE V=1
 grep 'GEN.*foo' stdout && Exit 1
 grep 'cp ' stdout
 grep 'echo ' stdout
 
 $MAKE clean
-$MAKE V=0 >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE V=0
 grep 'GEN.*foo' stdout
 grep 'cp ' stdout && Exit 1
 grep 'echo ' stdout && Exit 1
@@ -68,22 +65,19 @@ grep 'echo ' stdout && Exit 1
 $MAKE distclean
 
 ./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE
 grep 'GEN.*foo' stdout
 grep 'cp ' stdout && Exit 1
 grep 'echo ' stdout && Exit 1
 
 $MAKE clean
-$MAKE V=0 >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE V=0
 grep 'GEN.*foo' stdout
 grep 'cp ' stdout && Exit 1
 grep 'echo ' stdout && Exit 1
 
 $MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE V=1
 grep 'GEN.*foo' stdout && Exit 1
 grep 'cp ' stdout
 grep 'echo ' stdout
diff --git a/tests/silent8.test b/tests/silent8.test
index 2546775..c7985d7 100755
--- a/tests/silent8.test
+++ b/tests/silent8.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -46,8 +46,7 @@ $AUTOCONF
 ./configure --disable-silent-rules
 
 # Make sure that all labels work in silent-mode
-$MAKE V=0 dvi html info ps pdf >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE V=0 dvi html info ps pdf
 grep 'DVIPS    foo.ps' stdout || Exit 1
 grep 'MAKEINFO foo.html' stdout || Exit 1
 grep 'MAKEINFO foo.info' stdout || Exit 1
@@ -55,8 +54,8 @@ grep 'TEXI2DVI foo.dvi' stdout || Exit 1
 grep 'TEXI2PDF foo.pdf' stdout || Exit 1
 
 # Now make sure the labels don't appear in verbose mode.
-$MAKE clean || Exit 1
-$MAKE V=1 dvi html info ps pdf >stdout || { cat stdout; Exit 1; }
+$MAKE clean
+run_command $MAKE V=1 dvi html info ps pdf
 grep 'DVIPS    foo.ps' stdout && Exit 1
 grep 'MAKEINFO foo.html' stdout && Exit 1
 grep 'MAKEINFO foo.info' stdout && Exit 1
diff --git a/tests/silent9.test b/tests/silent9.test
index 6be0f98..089e986 100755
--- a/tests/silent9.test
+++ b/tests/silent9.test
@@ -64,8 +64,7 @@ $AUTOMAKE --add-missing
 $AUTOCONF
 
 ./configure --disable-dependency-tracking --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE
 grep ' -c' stdout && Exit 1
 grep ' -o libfoo' stdout && Exit 1
 grep mv stdout && Exit 1
@@ -79,8 +78,7 @@ grep ' CCLD .*baz' stdout
 grep ' CCLD .*bla' stdout
 
 $MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_command $MAKE V=1
 grep ' -c' stdout
 grep ' -o libfoo' stdout
 grep ' CC .*foo\.' stdout && Exit 1
diff --git a/tests/subobj9.test b/tests/subobj9.test
index b600fbe..22268d1 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -68,8 +68,7 @@ $AUTOMAKE -a
 
 # opportunistically check that --tag=CXX is used when supported
 if test -n "`./libtool --help | grep tag=TAG`"; then
-  $MAKE print >stdout
-  cat stdout
+  run_command $MAKE print
   grep 'BEG1: .*--tag=CXX.*--mode=compile.* :1END' stdout
   grep 'BEG2: .*--tag=CXX.*--mode=link.* :2END' stdout
 fi
diff --git a/tests/subst2.test b/tests/subst2.test
index 2bbabdd..3ca49d7 100755
--- a/tests/subst2.test
+++ b/tests/subst2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 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
@@ -42,12 +42,10 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure
-EXEEXT=.bin $MAKE print-programs >foo
-cat foo
-grep 'BEG: x.bin :END' foo
-EXEEXT=.bin am__empty=X $MAKE -e print-programs >foo
-cat foo
-grep 'BEG: x.bin X :END' foo
+run_command env EXEEXT=.bin $MAKE print-programs
+grep 'BEG: x.bin :END' stdout
+run_command env EXEEXT=.bin am__empty=X $MAKE -e print-programs
+grep 'BEG: x.bin X :END' stdout
 
 # Test for another bug, where EXTRA_PROGRAMS was removed because it was empty.
 grep EXTRA_PROGRAMS Makefile.in
diff --git a/tests/substre2.test b/tests/substre2.test
index 30e7c94..6bd4dba 100755
--- a/tests/substre2.test
+++ b/tests/substre2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -46,6 +46,5 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 ./configure
-$MAKE echorule >output
-cat output
-grep 'BEG: foo1.obj foo4.obj bar3.obj bar4.obj :END' output
+run_command $MAKE echorule
+grep 'BEG: foo1.obj foo4.obj bar3.obj bar4.obj :END' stdout
diff --git a/tests/suffix10.test b/tests/suffix10.test
index 85525d0..b68a573 100755
--- a/tests/suffix10.test
+++ b/tests/suffix10.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -46,6 +46,5 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
 ./configure
-$MAKE print >stdout
-cat stdout
+run_command $MAKE print
 grep 'BEGIN: foo.lo :END' stdout
diff --git a/tests/suffix11.test b/tests/suffix11.test
index 4f865f3..417e0f1 100755
--- a/tests/suffix11.test
+++ b/tests/suffix11.test
@@ -52,8 +52,7 @@ grep 'Inference rules can have only one target before the 
colon' stderr
 # But this should work anyway.
 $AUTOMAKE -a -Wno-portability
 ./configure
-env OBJEXT=foo $MAKE -e print >stdout
-cat stdout
+run_command env OBJEXT=foo $MAKE -e print
 grep 'BEGIN: foo.foo :END' stdout
 grep 'BEGIN: bar.foo :END' stdout
 grep 'BEGIN: baz1.foo baz2.foo :END' stdout
diff --git a/tests/suffix12.test b/tests/suffix12.test
index e2a8c44..84d089e 100755
--- a/tests/suffix12.test
+++ b/tests/suffix12.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2006, 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
@@ -47,6 +47,5 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 ./configure
-env OBJEXT=OBJ $MAKE -e print >stdout
-cat stdout
+run_command env OBJEXT=OBJ $MAKE -e print
 grep 'BEGIN: foo.OBJ sub/bar.OBJ :END' stdout
diff --git a/tests/suffix8.test b/tests/suffix8.test
index fd12a0a..52fabf2 100755
--- a/tests/suffix8.test
+++ b/tests/suffix8.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
@@ -69,8 +69,7 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 ./configure
-env OBJEXT=foo $MAKE -e print >stdout
-cat stdout
+run_command env OBJEXT=foo $MAKE -e print
 grep 'BEGIN: foo.foo :END' stdout
 grep 'BEGIN: bar.lo :END' stdout
 $MAKE test
diff --git a/tests/txinfo2.test b/tests/txinfo2.test
index 2324f57..d4b4b27 100755
--- a/tests/txinfo2.test
+++ b/tests/txinfo2.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
@@ -33,12 +34,10 @@ END
 echo '@setfilename textutils.info' > textutils.texi
 : > textutils.info~
 
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure
-$MAKE magic >stdout
-cat stdout
+run_command $MAKE magic
 grep '~' stdout && Exit 1
 Exit 0
-- 
1.6.5


reply via email to

[Prev in Thread] Current Thread [Next in Thread]