From: Stefano Lattarini Date: Sun, 18 Sep 2011 17:25:38 +0000 (+0200) Subject: tests: remove redundant settings of `errexit' shell flag X-Git-Tag: ng-0.5a~89^2~40 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2b17e15d99b79401b4dee71e6830eed063fa5c7;p=thirdparty%2Fautomake.git 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. --- diff --git a/ChangeLog b/ChangeLog index a6de2e199..028d268a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2011-09-18 Stefano Lattarini + + 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 automake: remove special handling of `ANSI2KNR' make variable diff --git a/tests/aclocal-acdir.test b/tests/aclocal-acdir.test index e02db30e1..42f8b4534 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 c55ae2b17..4094b3531 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 f4e0edad6..1e121433a 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 74f2922a5..8a0e512a4 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 7db5e5371..c837ff7c5 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 74b7a001f..d947da38f 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 b5e1c3690..3e2bcfd89 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 9de874b85..fd9ba4a63 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 d6a43e79e..2bf4f727d 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 ec42a3b09..d441c4433 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 7b55290f4..b5e86dc54 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 75be5f733..0b5ad64f1 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 770eb2d16..9bf8855f1 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 35d1e4a04..c1672e7b6 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 75643222f..2b1e4716c 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 90823e2a3..4ea9df4e4 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 a277639cb..d48301b1c 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 a7a3f899c..6ea4d907f 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 0da0d4231..0e81e4386 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 3d122e64b..59b7a7886 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 a72d173c8..028c7960e 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 69f9bb5f1..20baca4e2 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 7e8c78605..0ec242755 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 stderr && { cat stderr >&2; Exit 1; } cat stderr >&2