* tests/aclocal-acdir.test: Do not set the `errexit' shell
flag, as it is already set by `tests/defs'.
* tests/aclocal-print-acdir.test: Likewise.
* tests/distcheck-missing-m4.test: Likewise.
* tests/distcheck-outdated-m4.test: Likewise.
* tests/java-clean.test: Likewise.
* tests/java-compile-install.test: Likewise.
* tests/java-compile-run-flat.test: Likewise.
* tests/java-compile-run-nested.test: Likewise.
* tests/java-mix.test: Likewise.
* tests/java-no-duplicate.test: Likewise.
* tests/java-nobase.test: Likewise.
* tests/java-rebuild.test: Likewise.
* tests/java-sources.test: Likewise.
* tests/java-uninstall.test: Likewise.
* tests/javaflags.test: Likewise.
* tests/nobase-nodist.test: Likewise.
* tests/py-compile-basedir.test: Likewise.
* tests/py-compile-basic.test: Likewise.
* tests/py-compile-basic2.test: Likewise.
* tests/py-compile-destdir.test: Likewise.
* tests/py-compile-env.test: Likewise.
* tests/py-compile-option-terminate.test: Likewise.
* tests/py-compile-usage.test: Likewise. Since we are at it,
add an extra blank line, for clarity.
---
ChangeLog | 29 +++++++++++++++++++++++++++++
tests/aclocal-acdir.test | 2 --
tests/aclocal-print-acdir.test | 2 --
tests/distcheck-missing-m4.test | 2 --
tests/distcheck-outdated-m4.test | 2 --
tests/java-clean.test | 2 --
tests/java-compile-install.test | 2 --
tests/java-compile-run-flat.test | 2 --
tests/java-compile-run-nested.test | 2 --
tests/java-mix.test | 2 --
tests/java-no-duplicate.test | 2 --
tests/java-nobase.test | 2 --
tests/java-rebuild.test | 2 --
tests/java-sources.test | 2 --
tests/java-uninstall.test | 2 --
tests/javaflags.test | 2 --
tests/nobase-nodist.test | 2 --
tests/py-compile-basedir.test | 2 --
tests/py-compile-basic.test | 2 --
tests/py-compile-basic2.test | 2 --
tests/py-compile-destdir.test | 2 --
tests/py-compile-env.test | 2 --
tests/py-compile-option-terminate.test | 2 --
tests/py-compile-usage.test | 3 +--
24 files changed, 30 insertions(+), 46 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a6de2e1..028d268 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2011-09-18 Stefano Lattarini <stefano.lattar...@gmail.com>
+
+ tests: remove redundant settings of `errexit' shell flag
+ * tests/aclocal-acdir.test: Do not set the `errexit' shell
+ flag, as it is already set by `tests/defs'.
+ * tests/aclocal-print-acdir.test: Likewise.
+ * tests/distcheck-missing-m4.test: Likewise.
+ * tests/distcheck-outdated-m4.test: Likewise.
+ * tests/java-clean.test: Likewise.
+ * tests/java-compile-install.test: Likewise.
+ * tests/java-compile-run-flat.test: Likewise.
+ * tests/java-compile-run-nested.test: Likewise.
+ * tests/java-mix.test: Likewise.
+ * tests/java-no-duplicate.test: Likewise.
+ * tests/java-nobase.test: Likewise.
+ * tests/java-rebuild.test: Likewise.
+ * tests/java-sources.test: Likewise.
+ * tests/java-uninstall.test: Likewise.
+ * tests/javaflags.test: Likewise.
+ * tests/nobase-nodist.test: Likewise.
+ * tests/py-compile-basedir.test: Likewise.
+ * tests/py-compile-basic.test: Likewise.
+ * tests/py-compile-basic2.test: Likewise.
+ * tests/py-compile-destdir.test: Likewise.
+ * tests/py-compile-env.test: Likewise.
+ * tests/py-compile-option-terminate.test: Likewise.
+ * tests/py-compile-usage.test: Likewise. Since we are at it,
+ add an extra blank line, for clarity.
+
2011-09-16 Stefano Lattarini <stefano.lattar...@gmail.com>
automake: remove special handling of `ANSI2KNR' make variable
diff --git a/tests/aclocal-acdir.test b/tests/aclocal-acdir.test
index e02db30..42f8b45 100755
--- a/tests/aclocal-acdir.test
+++ b/tests/aclocal-acdir.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
mkdir am sys
cat >> configure.in <<'END'
diff --git a/tests/aclocal-print-acdir.test b/tests/aclocal-print-acdir.test
index c55ae2b..4094b35 100755
--- a/tests/aclocal-print-acdir.test
+++ b/tests/aclocal-print-acdir.test
@@ -19,8 +19,6 @@
am_create_testdir=empty
. ./defs || Exit 1
-set -e
-
$ACLOCAL --print-ac-dir
test "`$ACLOCAL --print-ac-dir`" = "$am_system_acdir"
diff --git a/tests/distcheck-missing-m4.test b/tests/distcheck-missing-m4.test
index f4e0eda..1e12143 100755
--- a/tests/distcheck-missing-m4.test
+++ b/tests/distcheck-missing-m4.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
cwd=`pwd` || fatal_ "cannot get current working directory"
cp "$testsrcdir"/distcheck-hook-m4.am . \
diff --git a/tests/distcheck-outdated-m4.test b/tests/distcheck-outdated-m4.test
index 74f2922..8a0e512 100755
--- a/tests/distcheck-outdated-m4.test
+++ b/tests/distcheck-outdated-m4.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
cwd=`pwd` || fatal_ "cannot get current working directory"
cp "$testsrcdir"/distcheck-hook-m4.am . \
diff --git a/tests/java-clean.test b/tests/java-clean.test
index 7db5e53..c837ff7 100755
--- a/tests/java-clean.test
+++ b/tests/java-clean.test
@@ -19,8 +19,6 @@
required=javac
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<'END'
AC_OUTPUT
END
diff --git a/tests/java-compile-install.test b/tests/java-compile-install.test
index 74b7a00..d947da3 100755
--- a/tests/java-compile-install.test
+++ b/tests/java-compile-install.test
@@ -19,8 +19,6 @@
required=javac
. ./defs || Exit 1
-set -e
-
cat >>configure.in <<'EOF'
AC_OUTPUT
EOF
diff --git a/tests/java-compile-run-flat.test b/tests/java-compile-run-flat.test
index b5e1c36..3e2bcfd 100755
--- a/tests/java-compile-run-flat.test
+++ b/tests/java-compile-run-flat.test
@@ -27,8 +27,6 @@ required='java javac'
am_parallel_tests=no
. ./defs || Exit 1
-set -e
-
echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.in
cat >> configure.in <<'END'
diff --git a/tests/java-compile-run-nested.test
b/tests/java-compile-run-nested.test
index 9de874b..fd9ba4a 100755
--- a/tests/java-compile-run-nested.test
+++ b/tests/java-compile-run-nested.test
@@ -28,8 +28,6 @@ required='java javac'
am_parallel_tests=yes
. ./defs || Exit 1
-set -e
-
echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.in
cat >> configure.in <<'END'
diff --git a/tests/java-mix.test b/tests/java-mix.test
index d6a43e7..2bf4f72 100755
--- a/tests/java-mix.test
+++ b/tests/java-mix.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_OUTPUT
END
diff --git a/tests/java-no-duplicate.test b/tests/java-no-duplicate.test
index ec42a3b..d441c44 100755
--- a/tests/java-no-duplicate.test
+++ b/tests/java-no-duplicate.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
cat > Makefile.am << 'END'
javadir = $(datadir)/java
java_JAVA = a.java
diff --git a/tests/java-nobase.test b/tests/java-nobase.test
index 7b55290..b5e86dc 100755
--- a/tests/java-nobase.test
+++ b/tests/java-nobase.test
@@ -19,8 +19,6 @@
required=javac
. ./defs || Exit 1
-set -e
-
cat >>configure.in <<'END'
AC_OUTPUT
END
diff --git a/tests/java-rebuild.test b/tests/java-rebuild.test
index 75be5f7..0b5ad64 100755
--- a/tests/java-rebuild.test
+++ b/tests/java-rebuild.test
@@ -19,8 +19,6 @@
required='javac'
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<'END'
AC_OUTPUT
END
diff --git a/tests/java-sources.test b/tests/java-sources.test
index 770eb2d..9bf8855 100755
--- a/tests/java-sources.test
+++ b/tests/java-sources.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_OUTPUT
END
diff --git a/tests/java-uninstall.test b/tests/java-uninstall.test
index 35d1e4a..c1672e7 100755
--- a/tests/java-uninstall.test
+++ b/tests/java-uninstall.test
@@ -19,8 +19,6 @@
required=javac
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_OUTPUT
END
diff --git a/tests/javaflags.test b/tests/javaflags.test
index 7564322..2b1e471 100755
--- a/tests/javaflags.test
+++ b/tests/javaflags.test
@@ -18,8 +18,6 @@
. ./defs || Exit 1
-set -e
-
cat > fake-javac <<'END'
#!/bin/sh
echo "$*" > javaflags.list
diff --git a/tests/nobase-nodist.test b/tests/nobase-nodist.test
index 90823e2..4ea9df4 100644
--- a/tests/nobase-nodist.test
+++ b/tests/nobase-nodist.test
@@ -18,8 +18,6 @@
. ./defs || Exit 1
-set -e
-
# Simulate no emacs and no python (it shouldn't be needed in this test).
EMACS="no" PYTHON=":"; export EMCAS PYTHON
diff --git a/tests/py-compile-basedir.test b/tests/py-compile-basedir.test
index a277639..d48301b 100755
--- a/tests/py-compile-basedir.test
+++ b/tests/py-compile-basedir.test
@@ -19,8 +19,6 @@
required=python
. ./defs || Exit 1
-set -e
-
# We'll need to create files in `..', so we need one more subdirectory
# level in order not to clutter up the top-level tests directory.
mkdir sandbox
diff --git a/tests/py-compile-basic.test b/tests/py-compile-basic.test
index a7a3f89..6ea4d90 100755
--- a/tests/py-compile-basic.test
+++ b/tests/py-compile-basic.test
@@ -21,8 +21,6 @@
required=python
. ./defs || Exit 1
-set -e
-
cp "$testsrcdir/../lib/py-compile" .
cat > foo.py <<'END'
diff --git a/tests/py-compile-basic2.test b/tests/py-compile-basic2.test
index 0da0d42..0e81e43 100755
--- a/tests/py-compile-basic2.test
+++ b/tests/py-compile-basic2.test
@@ -21,8 +21,6 @@
required=python
. ./defs || Exit 1
-set -e
-
ocwd=`pwd` || Exit 99
pyfiles="
diff --git a/tests/py-compile-destdir.test b/tests/py-compile-destdir.test
index 3d122e6..59b7a78 100755
--- a/tests/py-compile-destdir.test
+++ b/tests/py-compile-destdir.test
@@ -19,8 +19,6 @@
required=python
. ./defs || Exit 1
-set -e
-
cp "$testsrcdir/../lib/py-compile" .
# Should not give false positives when grepping for it, so use
diff --git a/tests/py-compile-env.test b/tests/py-compile-env.test
index a72d173..028c796 100755
--- a/tests/py-compile-env.test
+++ b/tests/py-compile-env.test
@@ -18,8 +18,6 @@
. ./defs || Exit 1
-set -e
-
cp "$testsrcdir/../lib/py-compile" .
cat > my-py <<'END'
diff --git a/tests/py-compile-option-terminate.test
b/tests/py-compile-option-terminate.test
index 69f9bb5..20baca4 100755
--- a/tests/py-compile-option-terminate.test
+++ b/tests/py-compile-option-terminate.test
@@ -20,8 +20,6 @@
required=python
. ./defs || Exit 1
-set -e
-
cp "$testsrcdir/../lib/py-compile" .
: > ./-o.py
diff --git a/tests/py-compile-usage.test b/tests/py-compile-usage.test
index 7e8c786..0ec2427 100755
--- a/tests/py-compile-usage.test
+++ b/tests/py-compile-usage.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
cp "$testsrcdir/../lib/py-compile" .
# --help
@@ -47,6 +45,7 @@ LC_ALL=C $EGREP "^py-compile $year-$month-$day\.$hour" stdout
test `wc -l <stdout` -eq 1
# Unknown option.
+
for opt in -b -d --foo; do
./py-compile $opt 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
--
1.7.2.3
