diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2010-08-20 19:53:38 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2010-11-11 15:51:33 +0100 |
commit | 2e6a7406859301154d81472b4a94f0c17411ba29 (patch) | |
tree | 58dd69eddf40122c16c22a15ba93f0de0c5133cc /tests/javasubst.test | |
parent | 551b1133da2b17fb3d2171346fd4af86f05ad5fe (diff) | |
download | automake-2e6a7406859301154d81472b4a94f0c17411ba29.tar.gz |
Enable `set -e' in more tests (plus some tweakings).
* tests/implicit.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command.
* tests/insh2.test: Likewise.
* tests/instman2.test: Likewise.
* tests/interp.test: Likewise.
* tests/interp2.test: Likewise.
* tests/library.test: Likewise.
* tests/mclean.test: Likewise.
* tests/info.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command. Remove useless chaff from
generated Makefile.am. Add a "FIXME" comment.
* tests/include.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command. Prefer cat + here-doc over
echo to append to configure.in. Make tests more robust by using
longer and less common names to grep. Remove an useless call to
echo. Remove an useless subshell.
* tests/header.test: Enable `errexit' shell flag, and related
changes. Use proper m4 quoting. Add excerpts from the original
report of the bug tested for by this script.
* tests/gcj.test: Enable `errexit' shell flag, and related
changes. Use proper m4 quoting. Add trailing `:' command.
* tests/gcj3.test: Likewise.
* tests/ldflags.test: Likewise.
* tests/libtool.test: Likewise.
* tests/listval.test: Likewise.
* tests/javaprim.test: Likewise, and prefer cat + here-doc over
echo to append to configure.in.
* tests/javasubst.test: Likewise.
* tests/discorver.test: Enable `errexit' shell flag. Prefer
trailing `:' over trailing `Exit 0'.
* tests/instdat.test: Enable `errexit' shell flag, and related
changes. Use proper m4 quoting. Avoid usless subshell. Prefer
cat + here-doc over echo to append to configure.in.
* tests/libtool2.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command. Use the configure.in
stub provided by ./defs, rather than writing it from scratch.
Diffstat (limited to 'tests/javasubst.test')
-rwxr-xr-x | tests/javasubst.test | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/javasubst.test b/tests/javasubst.test index d0186452c..ae6bb784b 100755 --- a/tests/javasubst.test +++ b/tests/javasubst.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,14 +18,20 @@ . ./defs || Exit 1 -echo 'AC_SUBST(JAVAC)' >> configure.in +set -e + +cat >> configure.in << 'END' +AC_SUBST([JAVAC]) +END cat > Makefile.am << 'END' javadir = $(datadir)/java java_JAVA = a.java b.java c.java END -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 +$ACLOCAL +$AUTOMAKE grep 'JAVAC.*@JAVAC@' Makefile.in + +: |