[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/8] Testsuite: remove AUTOMAKE_fails and AUTOMAKE_run
|
From: |
Stefano Lattarini |
|
Subject: |
[PATCH 3/8] Testsuite: remove AUTOMAKE_fails and AUTOMAKE_run |
|
Date: |
Mon, 1 Feb 2010 16:59:52 +0100 |
|
User-agent: |
KMail/1.12.1 (Linux/2.6.30-2-686; KDE/4.3.2; i686; ; ) |
Testsuite: remove AUTOMAKE_fails and AUTOMAKE_run
* tests/defs.in (AUTOMAKE_fails, AUTOMAKE_run): Removed.
* tests/README: Suggest to use `run_command -e 1 $AUTOMAKE',
rather than `AUTOMAKE_fails'.
* Makefile.am (sc_tests_automake_fails): Likewise.
* tests/license2.test: Use `run_command $AUTOMAKE' rather than
`AUTOMAKE_run 0', and use `run_command -e 1 $AUTOMAKE' rather
than `AUTOMAKE_fails'. Update copyright years.
* tests/getopt.test: Likewise.
* tests/cond44.test: Use `run_command $AUTOMAKE', rather than
`AUTOMAKE_run 0'. Update copyright years.
* tests/cond45.test: Likewise.
* tests/parallel-am.test: Likewise.
* tests/parallel-am3.test: Likewise.
* tests/help.test: Use `run_command -e 1 $AUTOMAKE', rather
than `AUTOMAKE_fails'.
* tests/distcom3.test: Likewise.
* tests/alloca.test: Use `run_command -e 1 $AUTOMAKE', rather
than `AUTOMAKE_fails'. Update copyright years.
* tests/alloca2.test: Likewise.
* tests/amopt.test: Likewise.
* tests/ansi8.test: Likewise.
* tests/asm.test: Likewise.
* tests/asm2.test: Likewise.
* tests/asm3.test: Likewise.
* tests/automake.test: Likewise.
* tests/auxdir3.test: Likewise.
* tests/auxdir4.test: Likewise.
* tests/backsl3.test: Likewise.
* tests/backsl4.test: Likewise.
* tests/badline.test: Likewise.
* tests/badopt.test: Likewise.
* tests/candist.test: Likewise.
* tests/canon-name.test: Likewise.
* tests/canon.test: Likewise.
* tests/canon5.test: Likewise.
* tests/ccnoco2.test: Likewise.
* tests/colneq.test: Likewise.
* tests/commen10.test: Likewise.
* tests/commen11.test: Likewise.
* tests/comment3.test: Likewise.
* tests/comment5.test: Likewise.
* tests/cond2.test: Likewise.
* tests/cond20.test: Likewise.
* tests/cond23.test: Likewise.
* tests/cond24.test: Likewise.
* tests/cond27.test: Likewise.
* tests/cond36.test: Likewise.
* tests/cond42.test: Likewise.
* tests/cond43.test: Likewise.
* tests/cond46.test: Likewise.
* tests/condinc2.test: Likewise.
* tests/conff2.test: Likewise.
* tests/cxx2.test: Likewise.
* tests/dejagnu2.test: Likewise.
* tests/dirforbid.test: Likewise.
* tests/distcom7.test: Likewise.
* tests/dollarvar.test: Likewise.
* tests/dollarvar2.test: Likewise.
* tests/else.test: Likewise.
* tests/exdir2.test: Likewise.
* tests/exeext2.test: Likewise.
* tests/extra9.test: Likewise.
* tests/fort1.test: Likewise.
* tests/gcj2.test: Likewise.
* tests/gcj5.test: Likewise.
* tests/gettext.test: Likewise.
* tests/gettext2.test: Likewise.
* tests/gettext3.test: Likewise.
* tests/gnits.test: Likewise.
* tests/gnuwarn.test: Likewise.
* tests/gnuwarn2.test: Likewise.
* tests/insthook.test: Likewise.
* tests/lex2.test: Likewise.
* tests/libobj10.test: Likewise.
* tests/libobj12.test: Likewise.
* tests/libobj13.test: Likewise.
* tests/libobj3.test: Likewise.
* tests/library2.test: Likewise.
* tests/library3.test: Likewise.
* tests/libtool4.test: Likewise.
* tests/libtool8.test: Likewise.
* tests/lisp2.test: Likewise.
* tests/location.test: Likewise.
* tests/ltinstloc.test: Likewise.
* tests/ltlibsrc.test: Likewise.
* tests/nogzip2.test: Likewise.
* tests/objc2.test: Likewise.
* tests/output5.test: Likewise.
* tests/overrid.test: Likewise.
* tests/parallel-am2.test: Likewise.
* tests/parallel-tests8.test: Likewise.
* tests/percent.test: Likewise.
* tests/percent2.test: Likewise.
* tests/pluseq5.test: Likewise.
* tests/pluseq7.test: Likewise.
* tests/pluseq9.test: Likewise.
* tests/pr211.test: Likewise.
* tests/pr401.test: Likewise.
* tests/pr401b.test: Likewise.
* tests/pr401c.test: Likewise.
* tests/primary.test: Likewise.
* tests/primary2.test: Likewise.
* tests/python2.test: Likewise.
* tests/recurs.test: Likewise.
* tests/reqd2.test: Likewise.
* tests/seenc.test: Likewise.
* tests/silent6.test: Likewise.
* tests/silent7.test: Likewise.
* tests/specflg.test: Likewise.
* tests/specflg10.test: Likewise.
* tests/specflg2.test: Likewise.
* tests/spell.test: Likewise.
* tests/spell2.test: Likewise.
* tests/srcsub.test: Likewise.
* tests/srcsub2.test: Likewise.
* tests/stdlib.test: Likewise.
* tests/stdlib2.test: Likewise.
* tests/subdir7.test: Likewise.
* tests/subst5.test: Likewise.
* tests/substtarg.test: Likewise.
* tests/suffix11.test: Likewise.
* tests/symlink.test: Likewise.
* tests/syntax.test: Likewise.
* tests/tar3.test: Likewise.
* tests/targetclash.test: Likewise.
* tests/txinfo29.test: Likewise.
* tests/txinfo4.test: Likewise.
* tests/upc2.test: Likewise.
* tests/version3.test: Likewise.
* tests/warnopts.test: Likewise.
* tests/xsource.test: Likewise.
* tests/yacc2.test: Likewise.
From e06e13bec6770eb81270b10dd6a9323002eab831 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Tue, 8 Dec 2009 22:17:50 +0100
Subject: [PATCH 3/8] Testsuite: remove AUTOMAKE_fails and AUTOMAKE_run
* tests/defs.in (AUTOMAKE_fails, AUTOMAKE_run): Removed.
* tests/README: Suggest to use `run_command -e 1 $AUTOMAKE',
rather than `AUTOMAKE_fails'.
* Makefile.am (sc_tests_automake_fails): Likewise.
* tests/license2.test: Use `run_command $AUTOMAKE' rather than
`AUTOMAKE_run 0', and use `run_command -e 1 $AUTOMAKE' rather
than `AUTOMAKE_fails'. Update copyright years.
* tests/getopt.test: Likewise.
* tests/cond44.test: Use `run_command $AUTOMAKE', rather than
`AUTOMAKE_run 0'. Update copyright years.
* tests/cond45.test: Likewise.
* tests/parallel-am.test: Likewise.
* tests/parallel-am3.test: Likewise.
* tests/help.test: Use `run_command -e 1 $AUTOMAKE', rather
than `AUTOMAKE_fails'.
* tests/distcom3.test: Likewise.
* tests/alloca.test: Use `run_command -e 1 $AUTOMAKE', rather
than `AUTOMAKE_fails'. Update copyright years.
* tests/alloca2.test: Likewise.
* tests/amopt.test: Likewise.
* tests/ansi8.test: Likewise.
* tests/asm.test: Likewise.
* tests/asm2.test: Likewise.
* tests/asm3.test: Likewise.
* tests/automake.test: Likewise.
* tests/auxdir3.test: Likewise.
* tests/auxdir4.test: Likewise.
* tests/backsl3.test: Likewise.
* tests/backsl4.test: Likewise.
* tests/badline.test: Likewise.
* tests/badopt.test: Likewise.
* tests/candist.test: Likewise.
* tests/canon-name.test: Likewise.
* tests/canon.test: Likewise.
* tests/canon5.test: Likewise.
* tests/ccnoco2.test: Likewise.
* tests/colneq.test: Likewise.
* tests/commen10.test: Likewise.
* tests/commen11.test: Likewise.
* tests/comment3.test: Likewise.
* tests/comment5.test: Likewise.
* tests/cond2.test: Likewise.
* tests/cond20.test: Likewise.
* tests/cond23.test: Likewise.
* tests/cond24.test: Likewise.
* tests/cond27.test: Likewise.
* tests/cond36.test: Likewise.
* tests/cond42.test: Likewise.
* tests/cond43.test: Likewise.
* tests/cond46.test: Likewise.
* tests/condinc2.test: Likewise.
* tests/conff2.test: Likewise.
* tests/cxx2.test: Likewise.
* tests/dejagnu2.test: Likewise.
* tests/dirforbid.test: Likewise.
* tests/distcom7.test: Likewise.
* tests/dollarvar.test: Likewise.
* tests/dollarvar2.test: Likewise.
* tests/else.test: Likewise.
* tests/exdir2.test: Likewise.
* tests/exeext2.test: Likewise.
* tests/extra9.test: Likewise.
* tests/fort1.test: Likewise.
* tests/gcj2.test: Likewise.
* tests/gcj5.test: Likewise.
* tests/gettext.test: Likewise.
* tests/gettext2.test: Likewise.
* tests/gettext3.test: Likewise.
* tests/gnits.test: Likewise.
* tests/gnuwarn.test: Likewise.
* tests/gnuwarn2.test: Likewise.
* tests/insthook.test: Likewise.
* tests/lex2.test: Likewise.
* tests/libobj10.test: Likewise.
* tests/libobj12.test: Likewise.
* tests/libobj13.test: Likewise.
* tests/libobj3.test: Likewise.
* tests/library2.test: Likewise.
* tests/library3.test: Likewise.
* tests/libtool4.test: Likewise.
* tests/libtool8.test: Likewise.
* tests/lisp2.test: Likewise.
* tests/location.test: Likewise.
* tests/ltinstloc.test: Likewise.
* tests/ltlibsrc.test: Likewise.
* tests/nogzip2.test: Likewise.
* tests/objc2.test: Likewise.
* tests/output5.test: Likewise.
* tests/overrid.test: Likewise.
* tests/parallel-am2.test: Likewise.
* tests/parallel-tests8.test: Likewise.
* tests/percent.test: Likewise.
* tests/percent2.test: Likewise.
* tests/pluseq5.test: Likewise.
* tests/pluseq7.test: Likewise.
* tests/pluseq9.test: Likewise.
* tests/pr211.test: Likewise.
* tests/pr401.test: Likewise.
* tests/pr401b.test: Likewise.
* tests/pr401c.test: Likewise.
* tests/primary.test: Likewise.
* tests/primary2.test: Likewise.
* tests/python2.test: Likewise.
* tests/recurs.test: Likewise.
* tests/reqd2.test: Likewise.
* tests/seenc.test: Likewise.
* tests/silent6.test: Likewise.
* tests/silent7.test: Likewise.
* tests/specflg.test: Likewise.
* tests/specflg10.test: Likewise.
* tests/specflg2.test: Likewise.
* tests/spell.test: Likewise.
* tests/spell2.test: Likewise.
* tests/srcsub.test: Likewise.
* tests/srcsub2.test: Likewise.
* tests/stdlib.test: Likewise.
* tests/stdlib2.test: Likewise.
* tests/subdir7.test: Likewise.
* tests/subst5.test: Likewise.
* tests/substtarg.test: Likewise.
* tests/suffix11.test: Likewise.
* tests/symlink.test: Likewise.
* tests/syntax.test: Likewise.
* tests/tar3.test: Likewise.
* tests/targetclash.test: Likewise.
* tests/txinfo29.test: Likewise.
* tests/txinfo4.test: Likewise.
* tests/upc2.test: Likewise.
* tests/version3.test: Likewise.
* tests/warnopts.test: Likewise.
* tests/xsource.test: Likewise.
* tests/yacc2.test: Likewise.
---
ChangeLog | 136 ++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 4 +-
Makefile.in | 2 +-
tests/README | 2 +-
tests/alloca.test | 4 +-
tests/alloca2.test | 4 +-
tests/amopt.test | 4 +-
tests/ansi8.test | 4 +-
tests/asm.test | 8 +-
tests/asm2.test | 11 ++--
tests/asm3.test | 12 ++--
tests/automake.test | 16 +++---
tests/auxdir3.test | 4 +-
tests/auxdir4.test | 4 +-
tests/backsl3.test | 4 +-
tests/backsl4.test | 4 +-
tests/badline.test | 5 +-
tests/badopt.test | 4 +-
tests/candist.test | 4 +-
tests/canon-name.test | 4 +-
tests/canon.test | 5 +-
tests/canon5.test | 5 +-
tests/ccnoco2.test | 6 +-
tests/colneq.test | 5 +-
tests/commen10.test | 4 +-
tests/commen11.test | 4 +-
tests/comment3.test | 4 +-
tests/comment5.test | 8 +-
tests/cond2.test | 5 +-
tests/cond20.test | 4 +-
tests/cond23.test | 4 +-
tests/cond24.test | 4 +-
tests/cond27.test | 4 +-
tests/cond36.test | 4 +-
tests/cond42.test | 10 ++--
tests/cond43.test | 4 +-
tests/cond44.test | 4 +-
tests/cond45.test | 4 +-
tests/cond46.test | 16 +++---
tests/condinc2.test | 8 +-
tests/conff2.test | 4 +-
tests/cxx2.test | 4 +-
tests/defs.in | 20 -------
tests/dejagnu2.test | 4 +-
tests/dirforbid.test | 4 +-
tests/distcom3.test | 2 +-
tests/distcom7.test | 4 +-
tests/dollarvar.test | 6 +-
tests/dollarvar2.test | 4 +-
tests/else.test | 5 +-
tests/exdir2.test | 5 +-
tests/exeext2.test | 7 +-
tests/extra9.test | 4 +-
tests/fort1.test | 4 +-
tests/gcj2.test | 5 +-
tests/gcj5.test | 4 +-
tests/getopt.test | 10 ++--
tests/gettext.test | 12 ++--
tests/gettext2.test | 8 +-
tests/gettext3.test | 6 +-
tests/gnits.test | 5 +-
tests/gnuwarn.test | 4 +-
tests/gnuwarn2.test | 4 +-
tests/help.test | 2 +-
tests/insthook.test | 4 +-
tests/lex2.test | 5 +-
tests/libobj10.test | 5 +-
tests/libobj12.test | 6 +-
tests/libobj13.test | 4 +-
tests/libobj3.test | 5 +-
tests/library2.test | 4 +-
tests/library3.test | 4 +-
tests/libtool4.test | 4 +-
tests/libtool8.test | 4 +-
tests/license2.test | 6 +-
tests/lisp2.test | 8 +-
tests/location.test | 4 +-
tests/ltinstloc.test | 4 +-
tests/ltlibsrc.test | 4 +-
tests/nogzip2.test | 4 +-
tests/objc2.test | 4 +-
tests/output5.test | 6 +-
tests/overrid.test | 4 +-
tests/parallel-am.test | 6 +-
tests/parallel-am2.test | 6 +-
tests/parallel-am3.test | 6 +-
tests/parallel-tests8.test | 4 +-
tests/percent.test | 4 +-
tests/percent2.test | 4 +-
tests/pluseq5.test | 7 +-
tests/pluseq7.test | 5 +-
tests/pluseq9.test | 4 +-
tests/pr211.test | 4 +-
tests/pr401.test | 4 +-
tests/pr401b.test | 4 +-
tests/pr401c.test | 4 +-
tests/primary.test | 5 +-
tests/primary2.test | 5 +-
tests/python2.test | 12 ++--
tests/recurs.test | 5 +-
tests/reqd2.test | 4 +-
tests/seenc.test | 5 +-
tests/silent6.test | 4 +-
tests/silent7.test | 4 +-
tests/specflg.test | 5 +-
tests/specflg10.test | 6 +-
tests/specflg2.test | 5 +-
tests/spell.test | 5 +-
tests/spell2.test | 5 +-
tests/srcsub.test | 5 +-
tests/srcsub2.test | 4 +-
tests/stdlib.test | 5 +-
tests/stdlib2.test | 10 ++--
tests/subdir7.test | 6 +-
tests/subst5.test | 4 +-
tests/substtarg.test | 5 +-
tests/suffix11.test | 4 +-
tests/symlink.test | 5 +-
tests/syntax.test | 5 +-
tests/tar3.test | 6 +-
tests/targetclash.test | 4 +-
tests/txinfo29.test | 6 +-
tests/txinfo4.test | 5 +-
tests/upc2.test | 4 +-
tests/version3.test | 5 +-
tests/warnopts.test | 4 +-
tests/xsource.test | 6 +-
tests/yacc2.test | 5 +-
128 files changed, 478 insertions(+), 330 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0b81e60..ee1227f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,141 @@
2009-01-31 Stefano Lattarini <address@hidden>
+ Testsuite: remove AUTOMAKE_fails and AUTOMAKE_run
+ * tests/defs.in (AUTOMAKE_fails, AUTOMAKE_run): Removed.
+ * tests/README: Suggest to use `run_command -e 1 $AUTOMAKE',
+ rather than `AUTOMAKE_fails'.
+ * Makefile.am (sc_tests_automake_fails): Likewise.
+ * tests/license2.test: Use `run_command $AUTOMAKE' rather than
+ `AUTOMAKE_run 0', and use `run_command -e 1 $AUTOMAKE' rather
+ than `AUTOMAKE_fails'. Update copyright years.
+ * tests/getopt.test: Likewise.
+ * tests/cond44.test: Use `run_command $AUTOMAKE', rather than
+ `AUTOMAKE_run 0'. Update copyright years.
+ * tests/cond45.test: Likewise.
+ * tests/parallel-am.test: Likewise.
+ * tests/parallel-am3.test: Likewise.
+ * tests/help.test: Use `run_command -e 1 $AUTOMAKE', rather
+ than `AUTOMAKE_fails'.
+ * tests/distcom3.test: Likewise.
+ * tests/alloca.test: Use `run_command -e 1 $AUTOMAKE', rather
+ than `AUTOMAKE_fails'. Update copyright years.
+ * tests/alloca2.test: Likewise.
+ * tests/amopt.test: Likewise.
+ * tests/ansi8.test: Likewise.
+ * tests/asm.test: Likewise.
+ * tests/asm2.test: Likewise.
+ * tests/asm3.test: Likewise.
+ * tests/automake.test: Likewise.
+ * tests/auxdir3.test: Likewise.
+ * tests/auxdir4.test: Likewise.
+ * tests/backsl3.test: Likewise.
+ * tests/backsl4.test: Likewise.
+ * tests/badline.test: Likewise.
+ * tests/badopt.test: Likewise.
+ * tests/candist.test: Likewise.
+ * tests/canon-name.test: Likewise.
+ * tests/canon.test: Likewise.
+ * tests/canon5.test: Likewise.
+ * tests/ccnoco2.test: Likewise.
+ * tests/colneq.test: Likewise.
+ * tests/commen10.test: Likewise.
+ * tests/commen11.test: Likewise.
+ * tests/comment3.test: Likewise.
+ * tests/comment5.test: Likewise.
+ * tests/cond2.test: Likewise.
+ * tests/cond20.test: Likewise.
+ * tests/cond23.test: Likewise.
+ * tests/cond24.test: Likewise.
+ * tests/cond27.test: Likewise.
+ * tests/cond36.test: Likewise.
+ * tests/cond42.test: Likewise.
+ * tests/cond43.test: Likewise.
+ * tests/cond46.test: Likewise.
+ * tests/condinc2.test: Likewise.
+ * tests/conff2.test: Likewise.
+ * tests/cxx2.test: Likewise.
+ * tests/dejagnu2.test: Likewise.
+ * tests/dirforbid.test: Likewise.
+ * tests/distcom7.test: Likewise.
+ * tests/dollarvar.test: Likewise.
+ * tests/dollarvar2.test: Likewise.
+ * tests/else.test: Likewise.
+ * tests/exdir2.test: Likewise.
+ * tests/exeext2.test: Likewise.
+ * tests/extra9.test: Likewise.
+ * tests/fort1.test: Likewise.
+ * tests/gcj2.test: Likewise.
+ * tests/gcj5.test: Likewise.
+ * tests/gettext.test: Likewise.
+ * tests/gettext2.test: Likewise.
+ * tests/gettext3.test: Likewise.
+ * tests/gnits.test: Likewise.
+ * tests/gnuwarn.test: Likewise.
+ * tests/gnuwarn2.test: Likewise.
+ * tests/insthook.test: Likewise.
+ * tests/lex2.test: Likewise.
+ * tests/libobj10.test: Likewise.
+ * tests/libobj12.test: Likewise.
+ * tests/libobj13.test: Likewise.
+ * tests/libobj3.test: Likewise.
+ * tests/library2.test: Likewise.
+ * tests/library3.test: Likewise.
+ * tests/libtool4.test: Likewise.
+ * tests/libtool8.test: Likewise.
+ * tests/lisp2.test: Likewise.
+ * tests/location.test: Likewise.
+ * tests/ltinstloc.test: Likewise.
+ * tests/ltlibsrc.test: Likewise.
+ * tests/nogzip2.test: Likewise.
+ * tests/objc2.test: Likewise.
+ * tests/output5.test: Likewise.
+ * tests/overrid.test: Likewise.
+ * tests/parallel-am2.test: Likewise.
+ * tests/parallel-tests8.test: Likewise.
+ * tests/percent.test: Likewise.
+ * tests/percent2.test: Likewise.
+ * tests/pluseq5.test: Likewise.
+ * tests/pluseq7.test: Likewise.
+ * tests/pluseq9.test: Likewise.
+ * tests/pr211.test: Likewise.
+ * tests/pr401.test: Likewise.
+ * tests/pr401b.test: Likewise.
+ * tests/pr401c.test: Likewise.
+ * tests/primary.test: Likewise.
+ * tests/primary2.test: Likewise.
+ * tests/python2.test: Likewise.
+ * tests/recurs.test: Likewise.
+ * tests/reqd2.test: Likewise.
+ * tests/seenc.test: Likewise.
+ * tests/silent6.test: Likewise.
+ * tests/silent7.test: Likewise.
+ * tests/specflg.test: Likewise.
+ * tests/specflg10.test: Likewise.
+ * tests/specflg2.test: Likewise.
+ * tests/spell.test: Likewise.
+ * tests/spell2.test: Likewise.
+ * tests/srcsub.test: Likewise.
+ * tests/srcsub2.test: Likewise.
+ * tests/stdlib.test: Likewise.
+ * tests/stdlib2.test: Likewise.
+ * tests/subdir7.test: Likewise.
+ * tests/subst5.test: Likewise.
+ * tests/substtarg.test: Likewise.
+ * tests/suffix11.test: Likewise.
+ * tests/symlink.test: Likewise.
+ * tests/syntax.test: Likewise.
+ * tests/tar3.test: Likewise.
+ * tests/targetclash.test: Likewise.
+ * tests/txinfo29.test: Likewise.
+ * tests/txinfo4.test: Likewise.
+ * tests/upc2.test: Likewise.
+ * tests/version3.test: Likewise.
+ * tests/warnopts.test: Likewise.
+ * tests/xsource.test: Likewise.
+ * tests/yacc2.test: Likewise.
+
+2009-01-31 Stefano Lattarini <address@hidden>
+
Extended target maintainer-check, to warn against idioms and
constructs in test scripts which might trigger the Zsh xtrace
bug.
diff --git a/Makefile.am b/Makefile.am
index fc8207a..b60a41d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -387,10 +387,10 @@ sc_tests_Exit_not_exit:
exit 1; \
fi
-## Use AUTOMAKE_fails when appropriate
+## Use `run_command -e 1 $AUTOMAKE' when appropriate
sc_tests_automake_fails:
@if grep -v '^#' $(srcdir)/tests/*.test | grep
'\$$AUTOMAKE.*&&.*[eE]xit'; then \
- echo 'Use AUTOMAKE_fails + grep to catch automake failures in the
above tests.' 1>&2; \
+ echo "Use \`run_command -e 1 \$$AUTOMAKE' + \`grep' to catch automake
failures in the above tests." 1>&2; \
exit 1; \
fi
diff --git a/Makefile.in b/Makefile.in
index 0082bde..d5977a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1149,7 +1149,7 @@ sc_tests_Exit_not_exit:
sc_tests_automake_fails:
@if grep -v '^#' $(srcdir)/tests/*.test | grep
'\$$AUTOMAKE.*&&.*[eE]xit'; then \
- echo 'Use AUTOMAKE_fails + grep to catch automake failures in the
above tests.' 1>&2; \
+ echo "Use \`run_command -e 1 \$$AUTOMAKE' + \`grep' to catch automake
failures in the above tests." 1>&2; \
exit 1; \
fi
diff --git a/tests/README b/tests/README
index 0b26211..dce0bc4 100644
--- a/tests/README
+++ b/tests/README
@@ -179,7 +179,7 @@ Do not
Do not test an Automake error with `$AUTOMAKE && Exit 1', or in three
years we'll discover that this test failed for some other bogus reason.
This happened many times. Better use something like
- AUTOMAKE_fails
+ run_command -e 1 $AUTOMAKE
grep 'expected diagnostic' stderr
(Note this doesn't prevent the test from failing for another
reason, but at least it makes sure the original error is still
diff --git a/tests/alloca.test b/tests/alloca.test
index 6cf51bb..13cb752 100755
--- a/tests/alloca.test
+++ b/tests/alloca.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
@@ -27,6 +27,6 @@ libtu_a_LIBADD = @ALLOCA@
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:1:.*AC_PROG_RANLIB' stderr
grep 'Makefile.am:3:.*AC_FUNC_ALLOCA' stderr
diff --git a/tests/alloca2.test b/tests/alloca2.test
index 4ecd229..75a9c3d 100755
--- a/tests/alloca2.test
+++ b/tests/alloca2.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
@@ -27,6 +27,6 @@ libtu_la_LIBADD = @LTALLOCA@
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:1:.*AC_PROG_LIBTOOL' stderr
grep 'Makefile.am:3:.*ALLOCA' stderr
diff --git a/tests/amopt.test b/tests/amopt.test
index e83b800..309908b 100755
--- a/tests/amopt.test
+++ b/tests/amopt.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -37,5 +37,5 @@ endif
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:2.*AUTOMAKE_OPTIONS.*conditional' stderr
diff --git a/tests/ansi8.test b/tests/ansi8.test
index 33f17dc..aa0ee45 100755
--- a/tests/ansi8.test
+++ b/tests/ansi8.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
@@ -26,5 +26,5 @@ bin_PROGRAMS = hello
END
$ACLOCAL
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
grep AM_C_PROTOTYPES stderr
diff --git a/tests/asm.test b/tests/asm.test
index 6c0aa3d..1b6cc8b 100755
--- a/tests/asm.test
+++ b/tests/asm.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
@@ -37,7 +37,7 @@ AC_OUTPUT(Makefile)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_PROG_AS stderr
# On fast machines the autom4te.cache created during the above run of
@@ -59,7 +59,7 @@ AC_OUTPUT(Makefile)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep CCAS stderr
grep AM_PROG_AS stderr
@@ -77,7 +77,7 @@ AC_OUTPUT(Makefile)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep CCASFLAGS stderr
grep AM_PROG_AS stderr
diff --git a/tests/asm2.test b/tests/asm2.test
index 8afd4f9..b74350a 100755
--- a/tests/asm2.test
+++ b/tests/asm2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 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
@@ -37,7 +38,7 @@ AC_OUTPUT(Makefile)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_PROG_AS stderr
# On fast machines the autom4te.cache created during the above run of
@@ -59,7 +60,7 @@ AC_OUTPUT(Makefile)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep CCAS stderr
grep AM_PROG_AS stderr
@@ -77,7 +78,7 @@ AC_OUTPUT(Makefile)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep CCASFLAGS stderr
grep AM_PROG_AS stderr
@@ -96,7 +97,7 @@ AC_OUTPUT(Makefile)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_PROG_AS stderr
rm -rf autom4te*.cache
diff --git a/tests/asm3.test b/tests/asm3.test
index 0738d6a..0ba2730 100755
--- a/tests/asm3.test
+++ b/tests/asm3.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2006, 2007 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2006, 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
@@ -38,7 +38,7 @@ AC_OUTPUT(Makefile)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_PROG_AS stderr
# On fast machines the autom4te.cache created during the above run of
@@ -60,7 +60,7 @@ AC_OUTPUT(Makefile)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep CCAS stderr
grep AM_PROG_AS stderr
@@ -78,7 +78,7 @@ AC_OUTPUT(Makefile)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep CCASFLAGS stderr
grep AM_PROG_AS stderr
@@ -97,7 +97,7 @@ AC_OUTPUT(Makefile)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_PROG_AS stderr
rm -rf autom4te*.cache
diff --git a/tests/automake.test b/tests/automake.test
index f8b4fef..31c47ee 100755
--- a/tests/automake.test
+++ b/tests/automake.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2004, 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
@@ -21,21 +21,21 @@ set -e
$AUTOMAKE --help
$AUTOMAKE --version
-AUTOMAKE_fails --voo
+run_command -e 1 $AUTOMAKE --voo
grep 'unrecognized option.*--voo' stderr
# older perl has a buggy Getopt::Long which makes this fail.
if $PERL -e 'require 5.8.2;'; then
- AUTOMAKE_fails -- --voo
+ run_command -e 1 $AUTOMAKE -- --voo
grep 'input file.*--voo' stderr
fi
-AUTOMAKE_fails ''
+run_command -e 1 $AUTOMAKE ''
grep 'empty argument' stderr
-AUTOMAKE_fails -W
+run_command -e 1 $AUTOMAKE -W
grep 'option.*-W.*requires an argument' stderr
-AUTOMAKE_fails --warnings
+run_command -e 1 $AUTOMAKE --warnings
grep 'option.*--warning.*requires an argument' stderr
-AUTOMAKE_fails --warnings --help
+run_command -e 1 $AUTOMAKE --warnings --help
grep 'unknown warning.*--help' stderr
-AUTOMAKE_fails --ver
+run_command -e 1 $AUTOMAKE --ver
grep 'unrecognized option.*--ver' stderr
$AUTOMAKE --vers
diff --git a/tests/auxdir3.test b/tests/auxdir3.test
index c828051..0f248ff 100755
--- a/tests/auxdir3.test
+++ b/tests/auxdir3.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
@@ -27,5 +27,5 @@ END
: > Makefile.am
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'AC_CONFIG_AUX_DIR.*AM_INIT_AUTOMAKE' stderr
diff --git a/tests/auxdir4.test b/tests/auxdir4.test
index 0447809..8b128ac 100755
--- a/tests/auxdir4.test
+++ b/tests/auxdir4.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
@@ -30,6 +30,6 @@ END
: > Makefile.am
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'configure.in:2:.*aux.*does not exist' stderr
grep 'configure.in:2:.*aux.*W32' stderr
diff --git a/tests/backsl3.test b/tests/backsl3.test
index 76fdd9a..2609c2d 100755
--- a/tests/backsl3.test
+++ b/tests/backsl3.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
@@ -26,6 +26,6 @@ foo = \
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
cat stderr
grep 'trailing backslash' stderr
diff --git a/tests/backsl4.test b/tests/backsl4.test
index 16eab5f..a37b8e7 100755
--- a/tests/backsl4.test
+++ b/tests/backsl4.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
@@ -38,7 +38,7 @@ echo ' fum' >>Makefile.am
$ACLOCAL
$AUTOCONF
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep ':1:.*whitespace' stderr
grep ':5:.*whitespace' stderr
$AUTOMAKE -Wno-error
diff --git a/tests/badline.test b/tests/badline.test
index 7c63697..8dc814b 100755
--- a/tests/badline.test
+++ b/tests/badline.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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
@@ -31,5 +32,5 @@ END
: > Makefile.am
$ACLOCAL || Exit 1
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'configure.in:3:.*info_TEXINFOS' stderr
diff --git a/tests/badopt.test b/tests/badopt.test
index 59eb5fa..430f7b6 100755
--- a/tests/badopt.test
+++ b/tests/badopt.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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
@@ -23,5 +23,5 @@ AUTOMAKE_OPTIONS = zardoz
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep zardoz stderr
diff --git a/tests/candist.test b/tests/candist.test
index 0a859dd..5323124 100755
--- a/tests/candist.test
+++ b/tests/candist.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
@@ -28,7 +28,7 @@ dist_lib_LIBRARIES = libfoo.a
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
test 2 -eq `grep -c 'dist.*forbidden' stderr`
Exit 0
diff --git a/tests/canon-name.test b/tests/canon-name.test
index 50a4dff..99ed12b 100755
--- a/tests/canon-name.test
+++ b/tests/canon-name.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
@@ -30,6 +30,6 @@ echo 'SUBDIRS = sub' >gmakefile.am
: >sub/gmakefile.am
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'leading.*\./.*\./gmakefile' stderr
grep 'leading.*\./.*\./sub/gmakefile' stderr
diff --git a/tests/canon.test b/tests/canon.test
index 2b035d0..ac733bd 100755
--- a/tests/canon.test
+++ b/tests/canon.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
@@ -28,5 +29,5 @@ sniff-glue_SOURCES = sg.c
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:2:.*sniff_glue_SOURCES' stderr
diff --git a/tests/canon5.test b/tests/canon5.test
index 768e087..deb56cf 100755
--- a/tests/canon5.test
+++ b/tests/canon5.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 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
@@ -43,7 +44,7 @@ bin_PROGRAMS = ,foo
,foo_SOURCES = foo.c
END
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:2:.*_foo_SOURCES' stderr
cat > Makefile.am << 'END'
diff --git a/tests/ccnoco2.test b/tests/ccnoco2.test
index 062fe6b..8d99983 100755
--- a/tests/ccnoco2.test
+++ b/tests/ccnoco2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -36,7 +36,7 @@ touch a.c
$ACLOCAL
$AUTOCONF
-AUTOMAKE_fails --copy --add-missing
+run_command -e 1 $AUTOMAKE --copy --add-missing
grep 'Makefile.am:2:.*per-target.*AM_PROG_CC_C_O' stderr
@@ -51,5 +51,5 @@ mv a.c sub
$AUTOMAKE --copy --add-missing
echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
-AUTOMAKE_fails --copy --add-missing
+run_command -e 1 $AUTOMAKE --copy --add-missing
grep 'Makefile.am:2:.*subdir.*AM_PROG_CC_C_O' stderr
diff --git a/tests/colneq.test b/tests/colneq.test
index 59d2414..37cf798 100755
--- a/tests/colneq.test
+++ b/tests/colneq.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1996, 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
@@ -26,7 +27,7 @@ data_DATA = $(ICONS)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep ':=.*not portable' stderr
echo 'AUTOMAKE_OPTIONS = -Wno-portability' >> Makefile.am
diff --git a/tests/commen10.test b/tests/commen10.test
index d7148f8..7ab01ff 100755
--- a/tests/commen10.test
+++ b/tests/commen10.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
@@ -30,5 +30,5 @@ END
mkdir foo
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep backslash stderr
diff --git a/tests/commen11.test b/tests/commen11.test
index 963f2f8..c38a825 100755
--- a/tests/commen11.test
+++ b/tests/commen11.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2005, 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
@@ -36,7 +36,7 @@ END
mkdir foo
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 3.*backslash stderr
grep 7.*backslash stderr
:
diff --git a/tests/comment3.test b/tests/comment3.test
index 14980c8..ff5f7b3 100755
--- a/tests/comment3.test
+++ b/tests/comment3.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
@@ -29,5 +29,5 @@ install-data-local:
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:2:.*#' stderr
diff --git a/tests/comment5.test b/tests/comment5.test
index 21b5e87..f574e9e 100755
--- a/tests/comment5.test
+++ b/tests/comment5.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
@@ -36,7 +36,7 @@ var = foo
EOF
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep '^Makefile.am:5: blank line following trailing backslash' stderr
@@ -53,7 +53,7 @@ all-local:
var = foo
EOF
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep '^Makefile.am:2: blank line following trailing backslash' stderr
@@ -65,7 +65,7 @@ cat > Makefile.inc << 'EOF'
EOF
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep '^Makefile.inc:2: blank line following trailing backslash' stderr
grep '^Makefile.am:1: .*included from here' stderr
diff --git a/tests/cond2.test b/tests/cond2.test
index a548ef6..1fbedc0 100755
--- a/tests/cond2.test
+++ b/tests/cond2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2001, 2002, 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
@@ -39,5 +40,5 @@ END
mkdir dir1
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:4:.*dir2.*does not exist' stderr
diff --git a/tests/cond20.test b/tests/cond20.test
index d0557e5..c41d125 100755
--- a/tests/cond20.test
+++ b/tests/cond20.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
@@ -46,5 +46,5 @@ set -e
$ACLOCAL
$AUTOCONF
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
grep "recursively defined" stderr
diff --git a/tests/cond23.test b/tests/cond23.test
index 4ec596d..6a9eac9 100755
--- a/tests/cond23.test
+++ b/tests/cond23.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
@@ -33,5 +33,5 @@ endif
EOF
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'libdir was already defined' stderr
diff --git a/tests/cond24.test b/tests/cond24.test
index 6f76e4d..42a038e 100755
--- a/tests/cond24.test
+++ b/tests/cond24.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
@@ -34,5 +34,5 @@ endif
EOF
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'foo was already defined' stderr
diff --git a/tests/cond27.test b/tests/cond27.test
index 3082902..697b983 100755
--- a/tests/cond27.test
+++ b/tests/cond27.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
@@ -33,6 +33,6 @@ my_DATA = foo
EOF
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep ' USE_FOO' stderr && Exit 1
grep '!USE_FOO' stderr
diff --git a/tests/cond36.test b/tests/cond36.test
index 58eb529..35037f9 100755
--- a/tests/cond36.test
+++ b/tests/cond36.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
@@ -51,7 +51,7 @@ $ACLOCAL
# Presently Automake doesn't fully support partially overriden rules
# and should complain.
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'tparse.h.*already defined' stderr
$AUTOMAKE -Wno-error
diff --git a/tests/cond42.test b/tests/cond42.test
index 00ca114..2074159 100755
--- a/tests/cond42.test
+++ b/tests/cond42.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.
#
@@ -35,25 +35,25 @@ END
: >Makefile.am
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'condition stack' stderr
sed 's/_AM_COND_IF/_AM_COND_ELSE/' < configure.in >configure.int
mv -f configure.int configure.in
rm -rf autom4te*.cache
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'else without if' stderr
sed 's/_AM_COND_ELSE/_AM_COND_ENDIF/' < configure.in >configure.int
mv -f configure.int configure.in
rm -rf autom4te*.cache
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'endif without if' stderr
sed 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\
_AM_COND_ENDIF/' < configure.in >configure.int
mv -f configure.int configure.in
rm -rf autom4te*.cache
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
test 2 = `grep -c 'not enough arguments' stderr`
:
diff --git a/tests/cond43.test b/tests/cond43.test
index 1b468a7..9194a60 100755
--- a/tests/cond43.test
+++ b/tests/cond43.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.
#
@@ -34,7 +34,7 @@ END
: >Makefile.am
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
sed '/.AM_COND_IF/{
s/^/[/
diff --git a/tests/cond44.test b/tests/cond44.test
index ac907f1..d721595 100755
--- a/tests/cond44.test
+++ b/tests/cond44.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 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
@@ -34,7 +34,7 @@ endif
EOF
$ACLOCAL
-AUTOMAKE_run 0
+run_command $AUTOMAKE
grep 'libdir was already defined' stderr && Exit 1
grep '^libdir = ' Makefile.in && Exit 1
Exit 0
diff --git a/tests/cond45.test b/tests/cond45.test
index 57dd339..8c297cf 100755
--- a/tests/cond45.test
+++ b/tests/cond45.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 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
@@ -35,7 +35,7 @@ endif
EOF
$ACLOCAL
-AUTOMAKE_run 0
+run_command $AUTOMAKE
grep 'foo was already defined' stderr && Exit 1
grep '^foo =' Makefile.in && Exit 1
Exit 0
diff --git a/tests/cond46.test b/tests/cond46.test
index 73b6e94..c45e065 100755
--- a/tests/cond46.test
+++ b/tests/cond46.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
@@ -31,7 +31,7 @@ if USE_A
endif !USE_A
END
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'endif.*incompatible with current conditional' stderr
cat > Makefile.am << 'END'
@@ -39,7 +39,7 @@ if USE_A
endif USE_B
END
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'endif.*incompatible with current conditional' stderr
cat > Makefile.am << 'END'
@@ -48,7 +48,7 @@ else
endif USE_A
END
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'endif.*incompatible with current conditional' stderr
cat > Makefile.am << 'END'
@@ -67,7 +67,7 @@ endif !USE_A
endif
END
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'endif.*incompatible with current conditional' stderr
cat > Makefile.am << 'END'
@@ -76,7 +76,7 @@ else USE_A
endif
END
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'else.*incompatible with current conditional' stderr
cat > Makefile.am << 'END'
@@ -85,7 +85,7 @@ else USE_B
endif
END
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'else.*incompatible with current conditional' stderr
cat > Makefile.am << 'END'
@@ -96,7 +96,7 @@ endif
endif
END
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'else.*incompatible with current conditional' stderr
cat > Makefile.am << 'END'
diff --git a/tests/condinc2.test b/tests/condinc2.test
index 69eff59..4972fd1 100755
--- a/tests/condinc2.test
+++ b/tests/condinc2.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 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
@@ -38,7 +38,7 @@ endif
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'adjunct:3: too many conditionals closed' stderr
cat > adjunct << 'END'
@@ -47,7 +47,7 @@ target: dependency
rule
END
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'unterminated conditionals' stderr
cat > adjunct << 'END'
diff --git a/tests/conff2.test b/tests/conff2.test
index 0c53067..585b509 100755
--- a/tests/conff2.test
+++ b/tests/conff2.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
@@ -29,6 +29,6 @@ AC_OUTPUT
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'configure.in:3:.*AC_CONFIG_FILES' stderr
grep 'configure.in:4:.*AC_CONFIG_HEADERS' stderr
diff --git a/tests/cxx2.test b/tests/cxx2.test
index 0b9e880..edb5e0b 100755
--- a/tests/cxx2.test
+++ b/tests/cxx2.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
@@ -28,5 +28,5 @@ hello_SOURCES = hello.cpp
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AC_PROG_CXX stderr
diff --git a/tests/defs.in b/tests/defs.in
index 266b2a5..3aa88d5 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -488,26 +488,6 @@ run_command ()
test x"$run_ok" = x"yes" || Exit 1
}
-# AUTOMAKE_run status [options...]
-# --------------------------------
-# Run Automake with OPTIONS, and cause the test to FAIL if automake
-# does not exit with STATUS.
-AUTOMAKE_run ()
-{
- am_run_expected_exitcode=$1
- shift
- run_command -e $am_run_expected_exitcode -- $AUTOMAKE ${1+"$@"}
-}
-
-# AUTOMAKE_fails [options...]
-# ---------------------------
-# Run Automake with OPTIONS, and cuse the test to FAIL if automake
-# does not exit with status 1.
-AUTOMAKE_fails ()
-{
- AUTOMAKE_run 1 ${1+"$@"}
-}
-
# Turn on shell traces.
set -x
diff --git a/tests/dejagnu2.test b/tests/dejagnu2.test
index 531f744..09356ab 100755
--- a/tests/dejagnu2.test
+++ b/tests/dejagnu2.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
@@ -41,5 +41,5 @@ $MAKE site.exp >stdout
cat stdout
grep foo stdout
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:3:.*site.exp' stderr
diff --git a/tests/dirforbid.test b/tests/dirforbid.test
index 3ab319d..678aa5e 100755
--- a/tests/dirforbid.test
+++ b/tests/dirforbid.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
@@ -32,7 +32,7 @@ for i in data_PROGRAMS lib_HEADERS ; do
$i = foo
END
$ACLOCAL
- AUTOMAKE_fails -a
+ run_command -e 1 $AUTOMAKE -a
grep 'Makefile.am:1:.*directory' stderr
done
:
diff --git a/tests/distcom3.test b/tests/distcom3.test
index f8848f5..73b63b9 100755
--- a/tests/distcom3.test
+++ b/tests/distcom3.test
@@ -53,5 +53,5 @@ sed -n -e '/^DIST_COMMON =.*\\$/ {
# Should warn about missing README.
: > Makefile.am
-AUTOMAKE_fails --add-missing --gnu
+run_command -e 1 $AUTOMAKE --add-missing --gnu
grep README stderr
diff --git a/tests/distcom7.test b/tests/distcom7.test
index 500c909..edba3f9 100755
--- a/tests/distcom7.test
+++ b/tests/distcom7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 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,5 +37,5 @@ echo bin_PROGRAMS = foo > subdir/Makefile.am
: > subdir/foo.c
$ACLOCAL
-AUTOMAKE_fails --add-missing subdir/Makefile
+run_command -e 1 $AUTOMAKE --add-missing subdir/Makefile
grep 'full run' stderr
diff --git a/tests/dollarvar.test b/tests/dollarvar.test
index bdc73ab..3bad823 100755
--- a/tests/dollarvar.test
+++ b/tests/dollarvar.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,7 +37,7 @@ blo = $(foo${x})
EOF
$ACLOCAL
-AUTOMAKE_fails -Wportability
+run_command -e 1 $AUTOMAKE -Wportability
grep 'Makefile.am:2' stderr
grep 'Makefile.am:3' stderr
grep 'Makefile.am:4' stderr
@@ -53,7 +53,7 @@ $sleep
echo 'AM_SILENT_RULES' >> configure.in
$ACLOCAL --force
-AUTOMAKE_fails -Wportability
+run_command -e 1 $AUTOMAKE -Wportability
grep 'Makefile.am:2' stderr
grep 'Makefile.am:3' stderr
grep 'Makefile.am:4' stderr
diff --git a/tests/dollarvar2.test b/tests/dollarvar2.test
index 0d12afd..64fe011 100755
--- a/tests/dollarvar2.test
+++ b/tests/dollarvar2.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
@@ -29,7 +29,7 @@ EOF
$ACLOCAL
# $AUTOMAKE already contains -Wall -Werror.
-AUTOMAKE_fails -Wportability
+run_command -e 1 $AUTOMAKE -Wportability
$AUTOMAKE --force -Wno-all
$AUTOMAKE --force -Wno-portability
echo 'AUTOMAKE_OPTIONS = -Wno-portability' >> Makefile.am
diff --git a/tests/else.test b/tests/else.test
index 32cf81a..f0c46fd 100755
--- a/tests/else.test
+++ b/tests/else.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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
@@ -35,5 +36,5 @@ endif
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:7:.*else without if' stderr
diff --git a/tests/exdir2.test b/tests/exdir2.test
index aca1497..be49313 100755
--- a/tests/exdir2.test
+++ b/tests/exdir2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 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
@@ -26,6 +27,6 @@ pkgdata_DATA = qbert
EOF
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'pkgdatadir' stderr && Exit 1
grep 'Makefile.am:1:.*quuzdir.*undefined' stderr
diff --git a/tests/exeext2.test b/tests/exeext2.test
index fc05712..9dd8885 100755
--- a/tests/exeext2.test
+++ b/tests/exeext2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 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
@@ -34,9 +35,9 @@ END
$ACLOCAL
$AUTOMAKE -Wnone
-AUTOMAKE_fails -Wnone -Wobsolete
+run_command -e 1 $AUTOMAKE -Wnone -Wobsolete
grep 'deprecated.*maude' stderr
-AUTOMAKE_fails -Wall
+run_command -e 1 $AUTOMAKE -Wall
grep 'deprecated.*maude' stderr
grep 'overrid.*maude' stderr
diff --git a/tests/extra9.test b/tests/extra9.test
index fefd385..08499a5 100755
--- a/tests/extra9.test
+++ b/tests/extra9.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
@@ -39,7 +39,7 @@ bin_PROGRAMS = @bins@
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'bin_PROGRAMS.*contains configure substitution' stderr
grep 'lib_LIBRARIES.*contains configure substitution' stderr && Exit 1
diff --git a/tests/fort1.test b/tests/fort1.test
index 930ae02..644fd2e 100755
--- a/tests/fort1.test
+++ b/tests/fort1.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
@@ -27,6 +27,6 @@ hello_SOURCES = hello.f foo.f95
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AC_PROG_F77 stderr
grep AC_PROG_FC stderr
diff --git a/tests/gcj2.test b/tests/gcj2.test
index 3e3af60..10067c8 100755
--- a/tests/gcj2.test
+++ b/tests/gcj2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 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
@@ -31,5 +32,5 @@ convert_SOURCES = x/../convert.java
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:.*\.\.' stderr
diff --git a/tests/gcj5.test b/tests/gcj5.test
index 6ef171d..ae2f83d 100755
--- a/tests/gcj5.test
+++ b/tests/gcj5.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
@@ -30,5 +30,5 @@ convert_SOURCES = convert.java
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_PROG_GCJ stderr
diff --git a/tests/getopt.test b/tests/getopt.test
index bc82984..d626426 100755
--- a/tests/getopt.test
+++ b/tests/getopt.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 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
@@ -22,20 +22,20 @@
set -e
# This is expected to fail ...
-AUTOMAKE_fails -Wnonexistent
+run_command -e 1 $AUTOMAKE -Wnonexistent
grep ':.*nonexistent' stderr
# ... but this should not.
-AUTOMAKE_run 0 -Wnonexistent --help
+run_command $AUTOMAKE -Wnonexistent --help
grep ':.*nonexistent' stderr && Exit 1
# Similarly, this should fail ...
-AUTOMAKE_fails --nonexistent
+run_command -e 1 $AUTOMAKE --nonexistent
grep ':.*nonexistent' stderr
# ... but this should not.
-AUTOMAKE_run 0 --nonexistent --help
+run_command $AUTOMAKE --nonexistent --help
grep ':.*nonexistent' stderr && Exit 1
:
diff --git a/tests/gettext.test b/tests/gettext.test
index b0bb2d2..8112cc0 100755
--- a/tests/gettext.test
+++ b/tests/gettext.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
@@ -42,7 +42,7 @@ if $ACLOCAL; then
# If gettext is too old to provide autopoint, this will
# fail as well, so we're safe here.
if autopoint -n; then
- AUTOMAKE_fails --add-missing
+ run_command -e 1 $AUTOMAKE --add-missing
grep 'required.*config.rpath' stderr
fi
fi
@@ -55,15 +55,15 @@ $ACLOCAL
# po/ and intl/ are required
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
echo 'SUBDIRS = po' >Makefile.am
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'AM_GNU_GETTEXT.*intl' stderr
echo 'SUBDIRS = intl' >Makefile.am
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'AM_GNU_GETTEXT.*po' stderr
# Ok.
@@ -85,5 +85,5 @@ $AUTOMAKE
# Still, SUBDIRS must be defined.
: >Makefile.am
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
diff --git a/tests/gettext2.test b/tests/gettext2.test
index 41128e2..0de0a23 100755
--- a/tests/gettext2.test
+++ b/tests/gettext2.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
@@ -37,11 +37,11 @@ $ACLOCAL
# po/ is required, but intl/ isn't.
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
echo 'SUBDIRS = foo' >Makefile.am
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'AM_GNU_GETTEXT.*po' stderr
# Ok.
@@ -58,5 +58,5 @@ grep 'with-included-gettext' Makefile.in && Exit 1
mkdir intl
echo 'SUBDIRS = po intl' >Makefile.am
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'intl.*AM_GNU_GETTEXT' stderr
diff --git a/tests/gettext3.test b/tests/gettext3.test
index a25af87..5cb7d45 100755
--- a/tests/gettext3.test
+++ b/tests/gettext3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -38,11 +38,11 @@ $ACLOCAL || Exit 77
: >config.rpath
# intl/ is required.
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'AM_GNU_GETTEXT.*intl.*SUBDIRS' stderr
mkdir intl
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'AM_GNU_GETTEXT.*intl.*SUBDIRS' stderr
echo 'SUBDIRS = po intl' > Makefile.am
diff --git a/tests/gnits.test b/tests/gnits.test
index 897d0ab..5509a83 100755
--- a/tests/gnits.test
+++ b/tests/gnits.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003 Free Software Foundation,
Inc.
+# Copyright (C) 1996, 1998, 2000, 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
@@ -40,5 +41,5 @@ END
: > THANKS
$ACLOCAL
-AUTOMAKE_fails --gnits
+run_command -e 1 $AUTOMAKE --gnits
grep 'configure.in:.*3\.5\.3\.2' stderr
diff --git a/tests/gnuwarn.test b/tests/gnuwarn.test
index 9c8aeb4..db34a3d 100755
--- a/tests/gnuwarn.test
+++ b/tests/gnuwarn.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
@@ -42,7 +42,7 @@ $ACLOCAL
# Don't warn in foreign mode
$AUTOMAKE -Wnone --add-missing --foreign
# Warn in gnu mode
-AUTOMAKE_fails -Wnone --add-missing --gnu
+run_command -e 1 $AUTOMAKE -Wnone --add-missing --gnu
grep 'Makefile.am:1:.*CFLAGS' stderr
grep 'Makefile.am:2:.*LDFLAGS' stderr
# No reason to warn about CXXFLAGS since it's not used.
diff --git a/tests/gnuwarn2.test b/tests/gnuwarn2.test
index 0227e3a..81083f9 100755
--- a/tests/gnuwarn2.test
+++ b/tests/gnuwarn2.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
@@ -40,5 +40,5 @@ AUTOMAKE_OPTIONS = gnu
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'configure.in:2:.*no-installman' stderr
diff --git a/tests/help.test b/tests/help.test
index be50d90..7230467 100755
--- a/tests/help.test
+++ b/tests/help.test
@@ -35,6 +35,6 @@ $AUTOMAKE --help
run_command -e 1 $ACLOCAL
grep configure.ac stderr
grep configure.in stderr
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep configure.ac stderr
grep configure.in stderr
diff --git a/tests/insthook.test b/tests/insthook.test
index 5a82bd6..e11969b 100755
--- a/tests/insthook.test
+++ b/tests/insthook.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 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
@@ -70,6 +70,6 @@ install-hook:
echo test
EOF
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep install-data-hook stderr
grep install-exec-hook stderr
diff --git a/tests/lex2.test b/tests/lex2.test
index d588edf..c07cc99 100755
--- a/tests/lex2.test
+++ b/tests/lex2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003 Free Software Foundation,
Inc.
+# Copyright (C) 1996, 1997, 1998, 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
@@ -32,5 +33,5 @@ END
: > joe.l
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_PROG_LEX stderr
diff --git a/tests/libobj10.test b/tests/libobj10.test
index 0d24741..371d7fa 100755
--- a/tests/libobj10.test
+++ b/tests/libobj10.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 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
@@ -34,7 +35,7 @@ libfoo_a_LIBADD = @LIBOBJS@
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:2:.*foo\.c' stderr
echo 'BUILT_SOURCES = foo.c' >> Makefile.am
diff --git a/tests/libobj12.test b/tests/libobj12.test
index 5f1d029..3fdb679 100755
--- a/tests/libobj12.test
+++ b/tests/libobj12.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
@@ -53,7 +53,7 @@ $AUTOMAKE
# This however should be diagnosed, since foo.c and bar.c are in
@address@hidden
echo 'libfoo_a_SOURCES += foo.c' >> Makefile.am
echo 'p1_SOURCES += bar.c' >> Makefile.am
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
$FGREP foo.c stderr
$FGREP bar.c stderr
@@ -65,5 +65,5 @@ END
$AUTOMAKE
grep 'a_DEPENDENCIES.*LIBOBJS' Makefile.in
echo 'a_SOURCES = foo.c' >> Makefile.am
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
$FGREP foo.c stderr
diff --git a/tests/libobj13.test b/tests/libobj13.test
index 6ca68c9..48afaad 100755
--- a/tests/libobj13.test
+++ b/tests/libobj13.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
@@ -46,5 +46,5 @@ $AUTOMAKE --add-missing
# This however should be diagnosed, since foo.c is in @address@hidden
echo 'libfoo_la_SOURCES += foo.c' >> Makefile.am
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
$FGREP foo.c stderr
diff --git a/tests/libobj3.test b/tests/libobj3.test
index 0aeced9..66355bd 100755
--- a/tests/libobj3.test
+++ b/tests/libobj3.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
@@ -31,5 +32,5 @@ libtu_a_LIBADD = @LIBOBJS@
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:3:.*LIBOBJS' stderr
diff --git a/tests/library2.test b/tests/library2.test
index 0dbff28..5be2af0 100755
--- a/tests/library2.test
+++ b/tests/library2.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
@@ -25,5 +25,5 @@ EXTRA_LIBRARIES = libfoo.a
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AC_PROG_RANLIB stderr
diff --git a/tests/library3.test b/tests/library3.test
index 9d30d87..ce93a1a 100755
--- a/tests/library3.test
+++ b/tests/library3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 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
@@ -48,7 +48,7 @@ EXTRA_LIBRARIES = libfoo.a
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep '^Makefile.am:.*: !A and !C and !D$' stderr
# Is there only one missing condition?
test `grep ': !' stderr | wc -l` = 1 || Exit 1
diff --git a/tests/libtool4.test b/tests/libtool4.test
index bcc9b0f..13bc609 100755
--- a/tests/libtool4.test
+++ b/tests/libtool4.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
@@ -25,5 +25,5 @@ EXTRA_LTLIBRARIES = liblib.la
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AC_PROG_LIBTOOL stderr
diff --git a/tests/libtool8.test b/tests/libtool8.test
index a1bb88a..1acd23f 100755
--- a/tests/libtool8.test
+++ b/tests/libtool8.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
@@ -46,7 +46,7 @@ END
libtoolize
$ACLOCAL
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep libb stderr && Exit 1
grep 'Makefile.am:3:.*libc.la.*multiply defined' stderr
grep 'Makefile.am:9:.*`pkglib' stderr
diff --git a/tests/license2.test b/tests/license2.test
index 75f7811..5a389c1 100755
--- a/tests/license2.test
+++ b/tests/license2.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
@@ -31,10 +31,10 @@ END
: >INSTALL
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'COPYING' stderr
-AUTOMAKE_run 0 --add-missing
+run_command $AUTOMAKE --add-missing
grep 'COPYING' stderr
grep 'GNU General Public License' stderr
grep 'Consider adding.*version control' stderr
diff --git a/tests/lisp2.test b/tests/lisp2.test
index 2fccdb2..64837c5 100755
--- a/tests/lisp2.test
+++ b/tests/lisp2.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
@@ -27,7 +27,7 @@ lisp_LISP = foo.el
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_PATH_LISPDIR stderr
@@ -40,7 +40,7 @@ lisp_LISP = foo.el
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_PATH_LISPDIR stderr
echo 3
@@ -52,7 +52,7 @@ lisp_LISP = foo.el
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_PATH_LISPDIR stderr
diff --git a/tests/location.test b/tests/location.test
index 13a2183..8f392a9 100755
--- a/tests/location.test
+++ b/tests/location.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
@@ -45,7 +45,7 @@ VAR = 1 \
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
# Smash the useless difference of lib file locations.
sed 's,^.*lib/am/\([a-z]*\.am\),\1,' stderr >observed
diff --git a/tests/ltinstloc.test b/tests/ltinstloc.test
index bb3203a..ed111e4 100755
--- a/tests/ltinstloc.test
+++ b/tests/ltinstloc.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -41,7 +41,7 @@ END
libtoolize
$ACLOCAL
$AUTOCONF
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
# libtoolize might have installed config.guess and config.sub already,
# and autom4te might warn about bugs in Libtool macro files, so filter
diff --git a/tests/ltlibsrc.test b/tests/ltlibsrc.test
index 2c9911d..dad9ba2 100755
--- a/tests/ltlibsrc.test
+++ b/tests/ltlibsrc.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
@@ -48,7 +48,7 @@ cp foo.c old_la.c
libtoolize
$ACLOCAL
$AUTOCONF
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
grep 'Makefile.am:2:.*old_la.c' stderr
grep 'Makefile.am:2:.*old.c' stderr
grep 'Makefile.am:3:.*zoo_d_old2_la.c' stderr
diff --git a/tests/nogzip2.test b/tests/nogzip2.test
index f6e01ab..3f7c203 100755
--- a/tests/nogzip2.test
+++ b/tests/nogzip2.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
@@ -30,7 +30,7 @@ END
: > Makefile.am
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'configure.in:2:.*no-dist-gzip' stderr
echo 'AUTOMAKE_OPTIONS = dist-bzip2' > Makefile.am
diff --git a/tests/objc2.test b/tests/objc2.test
index 9931ef7..5e5e4b4 100755
--- a/tests/objc2.test
+++ b/tests/objc2.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
@@ -29,5 +29,5 @@ hello_SOURCES = hello.m
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AC_PROG_OBJC stderr
diff --git a/tests/output5.test b/tests/output5.test
index 4323f62..eac6899 100755
--- a/tests/output5.test
+++ b/tests/output5.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2002, 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
@@ -30,5 +30,5 @@ END
: > Makefile.am
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'AC_CONFIG_FILES(.Makefile.)' stderr
diff --git a/tests/overrid.test b/tests/overrid.test
index df453ca..dccbb3e 100755
--- a/tests/overrid.test
+++ b/tests/overrid.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 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
@@ -43,7 +43,7 @@ END
$ACLOCAL
$AUTOMAKE -Wno-override
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep ':.*install-local' stderr && Exit 1 # There is no such thing as
install-local
grep ':.*installcheck-local' stderr
grep ':.*html-local' stderr
diff --git a/tests/parallel-am.test b/tests/parallel-am.test
index c46377b..36fd4a2 100755
--- a/tests/parallel-am.test
+++ b/tests/parallel-am.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -83,7 +83,7 @@ $ACLOCAL
# Generate expected output using the non-threaded code.
unset AUTOMAKE_JOBS || :
-AUTOMAKE_run 0 --add-missing
+run_command $AUTOMAKE --add-missing
mv stderr expected
Makefile_ins=`find . -name Makefile.in`
for file in $Makefile_ins; do
@@ -95,7 +95,7 @@ export AUTOMAKE_JOBS
for run in 1 2 3 4 5 6 7; do
rm -f build-aux/* sub*/Makefile.in
- AUTOMAKE_run 0 --add-missing
+ run_command $AUTOMAKE --add-missing
diff stderr expected
for file in $Makefile_ins; do
diff $file $file.exp
diff --git a/tests/parallel-am2.test b/tests/parallel-am2.test
index d929740..1d25b08 100755
--- a/tests/parallel-am2.test
+++ b/tests/parallel-am2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -64,7 +64,7 @@ $ACLOCAL
# Generate expected output using non-threaded code.
unset AUTOMAKE_JOBS || :
rm -f install-sh missing depcomp
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
mv stderr expected
AUTOMAKE_JOBS=5
@@ -72,7 +72,7 @@ export AUTOMAKE_JOBS
for i in 1 2 3 4 5 6 7 8; do
rm -f install-sh missing depcomp
- AUTOMAKE_fails --add-missing
+ run_command -e 1 $AUTOMAKE --add-missing
diff expected stderr
done
diff --git a/tests/parallel-am3.test b/tests/parallel-am3.test
index 104376a..5688c3e 100755
--- a/tests/parallel-am3.test
+++ b/tests/parallel-am3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -59,7 +59,7 @@ $ACLOCAL
# Generate expected output using the non-threaded code.
unset AUTOMAKE_JOBS || :
-AUTOMAKE_run 0 --add-missing
+run_command $AUTOMAKE --add-missing
mv stderr expected
mv Makefile.in Makefile.in.exp
@@ -68,7 +68,7 @@ export AUTOMAKE_JOBS
for run in 1 2 3 4 5 6 7; do
rm -f build-aux/* sub*/Makefile.in
- AUTOMAKE_run 0 --add-missing
+ run_command $AUTOMAKE --add-missing
diff stderr expected
diff Makefile.in Makefile.in.exp
done
diff --git a/tests/parallel-tests8.test b/tests/parallel-tests8.test
index 2c27064..54b2d69 100755
--- a/tests/parallel-tests8.test
+++ b/tests/parallel-tests8.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
@@ -52,7 +52,7 @@ END
$ACLOCAL
$AUTOCONF
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
grep '(srcdir.*bar' stderr
grep 'top_srcdir.*baz' stderr
diff --git a/tests/percent.test b/tests/percent.test
index 40f9a43..7e4f422 100755
--- a/tests/percent.test
+++ b/tests/percent.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
@@ -34,5 +34,5 @@ liver_SOURCES = foo.c
EOF
$ACLOCAL
-AUTOMAKE_fails -Wportability
+run_command -e 1 $AUTOMAKE -Wportability
grep 'Makefile.am:4:.*%' stderr
diff --git a/tests/percent2.test b/tests/percent2.test
index f7c7f14..b03aeec 100755
--- a/tests/percent2.test
+++ b/tests/percent2.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
@@ -34,7 +34,7 @@ ${ARCH}/%.$(OBJEXT): %.c
EOF
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep '%.*pattern.*rules' stderr
# No error otherwise.
diff --git a/tests/pluseq5.test b/tests/pluseq5.test
index 1f1c98c..de757f1 100755
--- a/tests/pluseq5.test
+++ b/tests/pluseq5.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 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
@@ -30,7 +31,7 @@ INCLUDES += def
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
# We expect the following diagnostic:
#
@@ -52,7 +53,7 @@ grep AM_CPPFLAGS stderr
# A way to suppress the obsolete warning is to use
# -Wno-obsolete:
echo 'AUTOMAKE_OPTIONS = -Wno-obsolete' >> Makefile.am
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_CPPFLAGS stderr && Exit 1
# !CHECK should still be mentioned.
grep ':.*!CHECK$' stderr
diff --git a/tests/pluseq7.test b/tests/pluseq7.test
index f74e62c..99125d7 100755
--- a/tests/pluseq7.test
+++ b/tests/pluseq7.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 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
@@ -35,5 +36,5 @@ END
: > q.c
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:3:.*AR' stderr
diff --git a/tests/pluseq9.test b/tests/pluseq9.test
index 31e1c8d..0b08f7d 100755
--- a/tests/pluseq9.test
+++ b/tests/pluseq9.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
@@ -51,7 +51,7 @@ B += dd
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
# We expect the following diagnostic:
#
diff --git a/tests/pr211.test b/tests/pr211.test
index 9344fd2..b4af2e0 100755
--- a/tests/pr211.test
+++ b/tests/pr211.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
@@ -38,5 +38,5 @@ END
libtoolize
$ACLOCAL
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
$FGREP 'foo.$(OBJEXT)' stderr
diff --git a/tests/pr401.test b/tests/pr401.test
index 7a092bf..2db23a7 100755
--- a/tests/pr401.test
+++ b/tests/pr401.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 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
@@ -107,7 +107,7 @@ $MAKE distcheck
mv -f src/Makefile.am src/t
sed 's/LDADD = .*/LDADD = @LIBOBJS@/' src/t > src/Makefile.am
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'cannot be used outside.*lib' stderr
mv -f src/t src/Makefile.am
diff --git a/tests/pr401b.test b/tests/pr401b.test
index f7f6344..49a96b5 100755
--- a/tests/pr401b.test
+++ b/tests/pr401b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 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
@@ -109,7 +109,7 @@ $MAKE distcheck
mv -f src/Makefile.am src/t
sed 's/LDADD = .*/LDADD = @LTLIBOBJS@/' src/t > src/Makefile.am
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'cannot be used outside.*lib' stderr
mv -f src/t src/Makefile.am
diff --git a/tests/pr401c.test b/tests/pr401c.test
index fc2f5de..0841d89 100755
--- a/tests/pr401c.test
+++ b/tests/pr401c.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 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
@@ -110,7 +110,7 @@ $MAKE distcheck
mv -f src/Makefile.am src/t
sed 's/LDADD = .*/LDADD = @ALLOCA@/' src/t > src/Makefile.am
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'cannot be used outside.*lib' stderr
mv -f src/t src/Makefile.am
diff --git a/tests/primary.test b/tests/primary.test
index ac5e54f..82c194d 100755
--- a/tests/primary.test
+++ b/tests/primary.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1996, 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
@@ -25,5 +26,5 @@ bin_PROGRAMS = @programs@
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'EXTRA_PROGRAMS' stderr
diff --git a/tests/primary2.test b/tests/primary2.test
index faa7aed..e376d9e 100755
--- a/tests/primary2.test
+++ b/tests/primary2.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
@@ -28,5 +29,5 @@ EXTRA_PROGRAMS = joe @more@
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep EXTRA_PROGRAMS stderr
diff --git a/tests/python2.test b/tests/python2.test
index 7768e81..0c4b51b 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
@@ -29,7 +29,7 @@ python_PYTHON = foo.py
END
$ACLOCAL
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
grep AM_PATH_PYTHON stderr
echo 2
@@ -41,7 +41,7 @@ pkgpython_PYTHON = foo.py
END
$ACLOCAL
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
grep AM_PATH_PYTHON stderr
@@ -54,7 +54,7 @@ pyexec_PYTHON = foo.py
END
$ACLOCAL
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
grep AM_PATH_PYTHON stderr
@@ -67,7 +67,7 @@ pkgpyexec_PYTHON = foo.py
END
$ACLOCAL
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
grep AM_PATH_PYTHON stderr
@@ -80,7 +80,7 @@ pkgpyexec_PYTHON = foo.py
END
$ACLOCAL
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
grep AM_PATH_PYTHON stderr
diff --git a/tests/recurs.test b/tests/recurs.test
index 026fb0d..77590f8 100755
--- a/tests/recurs.test
+++ b/tests/recurs.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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
@@ -35,5 +36,5 @@ foo = $(bin_PROGRAMS)
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:.*bin_PROGRAMS.*recursively defined' stderr
diff --git a/tests/reqd2.test b/tests/reqd2.test
index b47ef15..9885398 100755
--- a/tests/reqd2.test
+++ b/tests/reqd2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2002, 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
@@ -51,5 +51,5 @@ $AUTOCONF
test -f autoconf/ltmain.sh # Sanity check.
rm -f autoconf/ltmain.sh
-AUTOMAKE_fails --add-missing --copy
+run_command -e 1 $AUTOMAKE --add-missing --copy
grep 'autoconf/ltmain.sh' stderr
diff --git a/tests/seenc.test b/tests/seenc.test
index 3bfac37..cdfe56f 100755
--- a/tests/seenc.test
+++ b/tests/seenc.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 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
@@ -36,6 +37,6 @@ END
: > mountlist.c
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
$FGREP CC stderr
$FGREP CXX stderr
diff --git a/tests/silent6.test b/tests/silent6.test
index e6f08dd..da63a0c 100755
--- a/tests/silent6.test
+++ b/tests/silent6.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
@@ -75,7 +75,7 @@ AC_CONFIG_FILES([Makefile])
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
$AUTOMAKE -Wno-error
# AM_SILENT_RULES should turn off the warning
diff --git a/tests/silent7.test b/tests/silent7.test
index e953605..13c6fb4 100755
--- a/tests/silent7.test
+++ b/tests/silent7.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
@@ -90,6 +90,6 @@ grep 'echo ' stdout
# Ensure that setting `silent-rules' in a Makefile.am produces an error.
echo 'AUTOMAKE_OPTIONS = silent-rules' >> Makefile.am
-AUTOMAKE_fails --force
+run_command -e 1 $AUTOMAKE --force
:
diff --git a/tests/specflg.test b/tests/specflg.test
index b9b2e10..9644393 100755
--- a/tests/specflg.test
+++ b/tests/specflg.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 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
@@ -34,7 +35,7 @@ END
# Make sure `compile' is required.
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'required.*compile' stderr
: > compile
diff --git a/tests/specflg10.test b/tests/specflg10.test
index efe13f5..bef6941 100755
--- a/tests/specflg10.test
+++ b/tests/specflg10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -66,7 +66,7 @@ $AUTOCONF
# Conditional AM_DEFAULT_SOURCE_EXT does not work yet :-(
# (this limitation could be lifted).
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'defined conditionally' stderr
sed '/^if/d; /^endif/d' sub2/Makefile.am > t
@@ -74,7 +74,7 @@ mv -f t sub2/Makefile.am
# AM_DEFAULT_SOURCE_EXT can only assume one value
# (lifting this limitation is not such a good idea).
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'at most one value' stderr
sed 's/ \.quux//' sub2/Makefile.am > t
diff --git a/tests/specflg2.test b/tests/specflg2.test
index 0dc7fcc..f08307e 100755
--- a/tests/specflg2.test
+++ b/tests/specflg2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 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
@@ -37,7 +38,7 @@ END
# Make sure `compile' is required.
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'required.*compile' stderr
: > compile
diff --git a/tests/spell.test b/tests/spell.test
index d880a62..c259356 100755
--- a/tests/spell.test
+++ b/tests/spell.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1996, 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
@@ -27,5 +28,5 @@ boo_SOURCES = y.c
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:3:.*boo' stderr
diff --git a/tests/spell2.test b/tests/spell2.test
index 54298f1..36dab95 100755
--- a/tests/spell2.test
+++ b/tests/spell2.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
@@ -29,5 +30,5 @@ qardoz_LDADD = -ljoe
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:3:.*qardoz' stderr
diff --git a/tests/srcsub.test b/tests/srcsub.test
index 2f38312..406556b 100755
--- a/tests/srcsub.test
+++ b/tests/srcsub.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 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
@@ -31,5 +32,5 @@ EXTRA_x_SOURCES = y.c
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:2:.*x_SOURCES.*substitution' stderr
diff --git a/tests/srcsub2.test b/tests/srcsub2.test
index 494d0f6..1906246 100755
--- a/tests/srcsub2.test
+++ b/tests/srcsub2.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
@@ -33,6 +33,6 @@ EXTRA_x_SOURCES = y.c
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:2:.*bar.*substitution' stderr
grep 'Makefile.am:2:.*x_SOURCES' stderr
diff --git a/tests/stdlib.test b/tests/stdlib.test
index 48f56fc..06bbf60 100755
--- a/tests/stdlib.test
+++ b/tests/stdlib.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 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
@@ -30,7 +31,7 @@ noinst_LIBRARIES = sub/foo
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
# We're specifically testing for line-number information.
grep 'Makefile.am:1:.*sub/foo.*standard library name' stderr
grep 'Makefile.am:1:.*sub/libfoo.a.*' stderr
diff --git a/tests/stdlib2.test b/tests/stdlib2.test
index c5d543c..361fd6d 100755
--- a/tests/stdlib2.test
+++ b/tests/stdlib2.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
@@ -46,13 +46,13 @@ FOO = -module
END
$ACLOCAL
-AUTOMAKE_fails --add-missing --gnu
+run_command -e 1 $AUTOMAKE --add-missing --gnu
grep 'Makefile.am:2:.*nonstandard.la.*standard libtool library name' stderr
grep 'Makefile.am:2:.*libnonstandard.la' stderr
# We will use -Wno-gnu to disable the warning about setting LDFLAGS (below)
# Make sure nonstandard names are diagnosed anyway.
-AUTOMAKE_fails --add-missing --gnu -Wno-gnu
+run_command -e 1 $AUTOMAKE --add-missing --gnu -Wno-gnu
grep 'Makefile.am:2:.*nonstandard.la.*standard libtool library name' stderr
grep 'Makefile.am:2:.*libnonstandard.la' stderr
@@ -75,7 +75,7 @@ cat >Makefile.inc <<'EOF'
nonstandard_la_LDFLAGS = -lfoo
AM_LDFLAGS = -module
EOF
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:2:.*nonstandard.la.*standard libtool library name' stderr
grep 'Makefile.am:2:.*libnonstandard.la' stderr
@@ -90,6 +90,6 @@ nonstandard_SOURCES = foo.c
FOO = -module
END
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep "Makefile.am:2:.*nonstandard'.*standard libtool module name" stderr
grep 'Makefile.am:2:.*`nonstandard.la' stderr
diff --git a/tests/subdir7.test b/tests/subdir7.test
index e72f489..629f811 100755
--- a/tests/subdir7.test
+++ b/tests/subdir7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2002, 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
@@ -32,7 +32,7 @@ echo 'SUBDIRS = obj' >Makefile.am
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:1:.*obj.*BSD' stderr
cat >Makefile.am <<'EOF'
@@ -41,5 +41,5 @@ FOO = obj
DIST_SUBDIRS = $(FOO)
EOF
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:2:.*obj.*BSD' stderr
diff --git a/tests/subst5.test b/tests/subst5.test
index 7ffa1ad..b301ff5 100755
--- a/tests/subst5.test
+++ b/tests/subst5.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
@@ -35,7 +35,7 @@ EXTRA_PROGRAMS = @substed2@
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'bin_PROGRAMS.*contains configure substitution' stderr && Exit 1
grep 'EXTRA_PROGRAMS.*contains configure substitution' stderr
diff --git a/tests/substtarg.test b/tests/substtarg.test
index 7d5e098..0874299 100755
--- a/tests/substtarg.test
+++ b/tests/substtarg.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -43,7 +44,7 @@ address@hidden@.a: Makefile $(address@hidden@_a_OBJECTS)
$(address@hidden@_a_DEPEND
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'address@hidden@.a' stderr
$AUTOMAKE -Wno-override
num=`grep 'address@hidden@.a:' Makefile.in | wc -l`
diff --git a/tests/suffix11.test b/tests/suffix11.test
index e38926a..4f865f3 100755
--- a/tests/suffix11.test
+++ b/tests/suffix11.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
@@ -47,7 +47,7 @@ END
$ACLOCAL
$AUTOCONF
# What we do is not portable. Automake should warn.
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
grep 'Inference rules can have only one target before the colon' stderr
# But this should work anyway.
$AUTOMAKE -a -Wno-portability
diff --git a/tests/symlink.test b/tests/symlink.test
index a9b12c5..5cf7d18 100755
--- a/tests/symlink.test
+++ b/tests/symlink.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1999, 2001, 2002, 2003, 2004 Free Software Foundation,
Inc.
+# Copyright (C) 1996, 1999, 2001, 2002, 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
@@ -34,5 +35,5 @@ AC_CONFIG_FILES([Makefile])
END
$ACLOCAL
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep 'error while making link' stderr
diff --git a/tests/syntax.test b/tests/syntax.test
index 505486f..dff86a0 100755
--- a/tests/syntax.test
+++ b/tests/syntax.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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
@@ -27,5 +28,5 @@ lib_LTLIBRARIES = foo.la
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:2:.*blank line' stderr
diff --git a/tests/tar3.test b/tests/tar3.test
index de66754..1ee1a3b 100755
--- a/tests/tar3.test
+++ b/tests/tar3.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
@@ -30,7 +30,7 @@ END
: > Makefile.am
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'configure.in:2:.*mutually exclusive' stderr
rm -rf autom4te.cache
@@ -44,5 +44,5 @@ END
echo 'AUTOMAKE_OPTIONS = tar-pax' > Makefile.am
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:1:.*tar-pax.*AM_INIT_AUTOMAKE' stderr
diff --git a/tests/targetclash.test b/tests/targetclash.test
index 0433b41..423e5d9 100755
--- a/tests/targetclash.test
+++ b/tests/targetclash.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
@@ -31,5 +31,5 @@ END
$ACLOCAL
$AUTOCONF
-AUTOMAKE_fails -a
+run_command -e 1 $AUTOMAKE -a
grep 'redefinition.*ctags' stderr
diff --git a/tests/txinfo29.test b/tests/txinfo29.test
index 1d4aeff..1531fb5 100755
--- a/tests/txinfo29.test
+++ b/tests/txinfo29.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
@@ -29,7 +29,7 @@ END
echo '@setfilename baz.info' > bar.texi
$ACLOCAL
-AUTOMAKE_fails --add-missing
+run_command -e 1 $AUTOMAKE --add-missing
grep '^Makefile.am:1:.*user variable.*INFO_DEPS' stderr
grep 'overrides Automake variable.*INFO_DEPS' stderr
@@ -48,7 +48,7 @@ info_TEXINFOS = bar.texi
END
echo 'AC_SUBST([INFO_DEPS])' >>configure.in
rm -rf autom4te.cache # Make sure autoconf sees the configure.in update.
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep '^configure.in:4:.*user variable.*INFO_DEPS' stderr
grep 'overrides Automake variable.*INFO_DEPS' stderr
diff --git a/tests/txinfo4.test b/tests/txinfo4.test
index 1c6a92f..ce1c7ee 100755
--- a/tests/txinfo4.test
+++ b/tests/txinfo4.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -28,5 +29,5 @@ echo '@setfilename textutils.frob' > textutils.texi
: > texinfo.tex
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'textutils.texi:1:.*textutils.frob.*extension' stderr
diff --git a/tests/upc2.test b/tests/upc2.test
index 6b717fd..abab093 100755
--- a/tests/upc2.test
+++ b/tests/upc2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -29,5 +29,5 @@ hello_SOURCES = hello.upc
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep AM_PROG_UPC stderr
diff --git a/tests/version3.test b/tests/version3.test
index b7d356d..c4e5d86 100755
--- a/tests/version3.test
+++ b/tests/version3.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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
@@ -25,5 +26,5 @@ AUTOMAKE_OPTIONS = 9.9x
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'Makefile.am:1:.*Automake 9.9x' stderr
diff --git a/tests/warnopts.test b/tests/warnopts.test
index 6d96400..9113b55 100755
--- a/tests/warnopts.test
+++ b/tests/warnopts.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2002, 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,7 +44,7 @@ foo_SOURCES = unused
END
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
# The expected diagnostic is
# Makefile.am:3: unused variable: `foo_SOURCES'
# sub/Makefile.am:2: `INCLUDES' is the old name for `AM_CPPFLAGS'
diff --git a/tests/xsource.test b/tests/xsource.test
index df140a5..2ad9b73 100755
--- a/tests/xsource.test
+++ b/tests/xsource.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 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
@@ -37,5 +37,5 @@ mkdir x
: > x/z.c
$ACLOCAL
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
$FGREP 'z.$(OBJEXT)' stderr
diff --git a/tests/yacc2.test b/tests/yacc2.test
index a095edc..04ee789 100755
--- a/tests/yacc2.test
+++ b/tests/yacc2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 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
@@ -66,7 +67,7 @@ cp Makefile.src Makefile.am
echo 'YFLAGS = -d' >> Makefile.am
# YFLAGS is a use variable.
-AUTOMAKE_fails
+run_command -e 1 $AUTOMAKE
grep 'YFLAGS' stderr
$AUTOMAKE -Wno-gnu
--
1.6.5
- [PATCH 0/8] Towards a Zsh-compatible Automake testsuite, Stefano Lattarini, 2010/02/01
- [PATCH 1/8] Testsuite: avoid Zsh-related problem with `set -x', Stefano Lattarini, 2010/02/01
- [PATCH 2/8] Maintainer-check: warn against zsh xtrace bug, Stefano Lattarini, 2010/02/01
- [PATCH 3/8] Testsuite: remove AUTOMAKE_fails and AUTOMAKE_run,
Stefano Lattarini <=
- [PATCH 4/8] Work around a bug of AT&T Ksh w.r.t. ${1+"$@"}, Stefano Lattarini, 2010/02/01
- [PATCH 5/8] Improve description of `run_command' in README, Stefano Lattarini, 2010/02/01
- [PATCH 6/8] Tests: prefer run_command over direct stdout redirection(s), Stefano Lattarini, 2010/02/01
- [PATCH 7/8] Testsuite: run_command can now set env variables, Stefano Lattarini, 2010/02/01
- [PATCH 8/8] Testsuite: avoid redundant use of the `env' utility., Stefano Lattarini, 2010/02/01