A simple cleanup patch that removes from master redundant `set -e' calls
in newer tests merged from other (maint-based) branches.
Maybe we could add a new maintainer-check to catch such redundant calls
in the future; but I've not done that FTM, and I'm not completely sure
it would be worthwhile.
The patch has already been pushed to master.
Regards,
Stefano
From 061cf14019af41062cfaca2ebd97f6a460de3bb2 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Fri, 15 Apr 2011 18:41:06 +0200
Subject: [PATCH] tests: remove redundant settings of `errexit' shell flag
* tests/autodist-acconfig.test: Do not set the `errexit'
shell flag, as it is already set by `tests/defs'.
* tests/autodist-acconfig-no-subdir.test: Likewise.
* tests/autodist-aclocal-m4.test: Likewise.
* tests/autodist-config-headers.test: Likewise.
* tests/autodist-configure-no-subdir.test: Likewise.
* tests/autodist-stamp-vti.test: Likewise.
* tests/autodist-subdir.test: Likewise.
* tests/autodist.test: Likewise.
* tests/check-exported-srcdir.test: Likewise.
* tests/check-tests-in-builddir.test: Likewise.
* tests/check-tests_environment.test: Likewise.
* tests/help-python.test: Likewise.
* tests/java-check.test: Likewise.
* tests/java-extra.test: Likewise.
* tests/java-noinst.test: Likewise.
* tests/lex-subobj-nodep.test: Likewise.
* tests/ltinit.test: Likewise.
* tests/m4-inclusion.test: Likewise.
* tests/maintclean-vpath.test: Likewise.
* tests/parallel-tests-subdir.test: Likewise.
* tests/pr8365-remake-timing.test: Likewise.
* tests/python-dist.test: Likewise.
* tests/python-vars.test: Likewise.
* tests/python-virtualenv.test: Likewise.
* tests/python5b.test: Likewise.
* tests/specflg-dummy.test: Likewise.
* tests/yacc-dist-nobuild-subdir.test: Likewise.
---
ChangeLog | 32 +++++++++++++++++++++++++++++++
tests/autodist-acconfig-no-subdir.test | 2 -
tests/autodist-acconfig.test | 2 -
tests/autodist-aclocal-m4.test | 2 -
tests/autodist-config-headers.test | 2 -
tests/autodist-configure-no-subdir.test | 2 -
tests/autodist-stamp-vti.test | 2 -
tests/autodist-subdir.test | 2 -
tests/autodist.test | 2 -
tests/check-exported-srcdir.test | 2 -
tests/check-tests-in-builddir.test | 2 -
tests/check-tests_environment.test | 2 -
tests/help-python.test | 2 -
tests/java-check.test | 2 -
tests/java-extra.test | 2 -
tests/java-noinst.test | 2 -
tests/lex-subobj-nodep.test | 2 -
tests/ltinit.test | 2 -
tests/m4-inclusion.test | 2 -
tests/maintclean-vpath.test | 2 -
tests/parallel-tests-subdir.test | 2 -
tests/pr8365-remake-timing.test | 2 -
tests/python-dist.test | 2 -
tests/python-vars.test | 2 -
tests/python-virtualenv.test | 2 -
tests/python5b.test | 2 -
tests/specflg-dummy.test | 2 -
tests/yacc-dist-nobuild-subdir.test | 2 -
28 files changed, 32 insertions(+), 54 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c4a7167..cc75375 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2011-04-14 Stefano Lattarini <stefano.lattar...@gmail.com>
+
+ tests: remove redundant settings of `errexit' shell flag
+ * tests/autodist-acconfig.test: Do not set the `errexit'
+ shell flag, as it is already set by `tests/defs'.
+ * tests/autodist-acconfig-no-subdir.test: Likewise.
+ * tests/autodist-aclocal-m4.test: Likewise.
+ * tests/autodist-config-headers.test: Likewise.
+ * tests/autodist-configure-no-subdir.test: Likewise.
+ * tests/autodist-stamp-vti.test: Likewise.
+ * tests/autodist-subdir.test: Likewise.
+ * tests/autodist.test: Likewise.
+ * tests/check-exported-srcdir.test: Likewise.
+ * tests/check-tests-in-builddir.test: Likewise.
+ * tests/check-tests_environment.test: Likewise.
+ * tests/help-python.test: Likewise.
+ * tests/java-check.test: Likewise.
+ * tests/java-extra.test: Likewise.
+ * tests/java-noinst.test: Likewise.
+ * tests/lex-subobj-nodep.test: Likewise.
+ * tests/ltinit.test: Likewise.
+ * tests/m4-inclusion.test: Likewise.
+ * tests/maintclean-vpath.test: Likewise.
+ * tests/parallel-tests-subdir.test: Likewise.
+ * tests/pr8365-remake-timing.test: Likewise.
+ * tests/python-dist.test: Likewise.
+ * tests/python-vars.test: Likewise.
+ * tests/python-virtualenv.test: Likewise.
+ * tests/python5b.test: Likewise.
+ * tests/specflg-dummy.test: Likewise.
+ * tests/yacc-dist-nobuild-subdir.test: Likewise.
+
2011-04-12 Stefano Lattarini <stefano.lattar...@gmail.com>
coverage: test for automake bug#8485 (known regression)
diff --git a/tests/autodist-acconfig-no-subdir.test b/tests/autodist-acconfig-no-subdir.test
index e6bd5a9..931feaf 100755
--- a/tests/autodist-acconfig-no-subdir.test
+++ b/tests/autodist-acconfig-no-subdir.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<END
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
diff --git a/tests/autodist-acconfig.test b/tests/autodist-acconfig.test
index 49ab2f0..5674e27 100755
--- a/tests/autodist-acconfig.test
+++ b/tests/autodist-acconfig.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<END
AC_OUTPUT
END
diff --git a/tests/autodist-aclocal-m4.test b/tests/autodist-aclocal-m4.test
index 3f53d59..7ebfd43 100755
--- a/tests/autodist-aclocal-m4.test
+++ b/tests/autodist-aclocal-m4.test
@@ -23,8 +23,6 @@
. ./defs || Exit 1
-set -e
-
{ echo 'm4_include([defs.m4])'
cat configure.in
echo 'AC_OUTPUT'
diff --git a/tests/autodist-config-headers.test b/tests/autodist-config-headers.test
index 66c9bea..76bd740 100755
--- a/tests/autodist-config-headers.test
+++ b/tests/autodist-config-headers.test
@@ -21,8 +21,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<END
AC_CONFIG_HEADERS([config.h sub/config.h cfg2.h:conf2.hin])
AC_OUTPUT
diff --git a/tests/autodist-configure-no-subdir.test b/tests/autodist-configure-no-subdir.test
index db640c4..d2bd60c 100755
--- a/tests/autodist-configure-no-subdir.test
+++ b/tests/autodist-configure-no-subdir.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<END
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
diff --git a/tests/autodist-stamp-vti.test b/tests/autodist-stamp-vti.test
index 4f37e14..2984372 100755
--- a/tests/autodist-stamp-vti.test
+++ b/tests/autodist-stamp-vti.test
@@ -21,8 +21,6 @@
required=makeinfo
. ./defs || Exit 1
-set -e
-
cat >> configure.in << END
AC_OUTPUT
END
diff --git a/tests/autodist-subdir.test b/tests/autodist-subdir.test
index db694f8..09dcc82 100755
--- a/tests/autodist-subdir.test
+++ b/tests/autodist-subdir.test
@@ -26,8 +26,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
diff --git a/tests/autodist.test b/tests/autodist.test
index 34b9526..681be09 100755
--- a/tests/autodist.test
+++ b/tests/autodist.test
@@ -21,8 +21,6 @@
. ./defs || Exit 1
-set -e
-
# Ensure we are run from the right directory.
# (The last thing we want is to delete some random user files.)
test -f ../defs-static
diff --git a/tests/check-exported-srcdir.test b/tests/check-exported-srcdir.test
index 5cec7fc..6d17320 100755
--- a/tests/check-exported-srcdir.test
+++ b/tests/check-exported-srcdir.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
show_info ()
{
if test x"$parallel_tests" = x"yes"; then
diff --git a/tests/check-tests-in-builddir.test b/tests/check-tests-in-builddir.test
index 2d0e423..58a602e 100755
--- a/tests/check-tests-in-builddir.test
+++ b/tests/check-tests-in-builddir.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_OUTPUT
END
diff --git a/tests/check-tests_environment.test b/tests/check-tests_environment.test
index a07ab95..e3dc76a 100755
--- a/tests/check-tests_environment.test
+++ b/tests/check-tests_environment.test
@@ -18,8 +18,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_OUTPUT
END
diff --git a/tests/help-python.test b/tests/help-python.test
index ba20013..e6a6fd3 100755
--- a/tests/help-python.test
+++ b/tests/help-python.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
cat > configure.in <<END
AC_INIT([$me], [1.0])
AM_PATH_PYTHON
diff --git a/tests/java-check.test b/tests/java-check.test
index a67b4e8..ffec9b6 100755
--- a/tests/java-check.test
+++ b/tests/java-check.test
@@ -21,8 +21,6 @@
required=javac
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_OUTPUT
END
diff --git a/tests/java-extra.test b/tests/java-extra.test
index 9837d75..cc5d893 100755
--- a/tests/java-extra.test
+++ b/tests/java-extra.test
@@ -22,8 +22,6 @@
required=javac
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
AC_OUTPUT
diff --git a/tests/java-noinst.test b/tests/java-noinst.test
index 6babc27..5fe66d8 100755
--- a/tests/java-noinst.test
+++ b/tests/java-noinst.test
@@ -20,8 +20,6 @@
required=javac
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_OUTPUT
END
diff --git a/tests/lex-subobj-nodep.test b/tests/lex-subobj-nodep.test
index 4449715..5f201cb 100755
--- a/tests/lex-subobj-nodep.test
+++ b/tests/lex-subobj-nodep.test
@@ -20,8 +20,6 @@
required=flex
. ./defs || Exit 1
-set -e
-
cat >>configure.in <<\END
AC_PROG_CC
AM_PROG_CC_C_O
diff --git a/tests/ltinit.test b/tests/ltinit.test
index b4eaad6..42c3913 100755
--- a/tests/ltinit.test
+++ b/tests/ltinit.test
@@ -21,8 +21,6 @@
required='libtoolize'
. ./defs || Exit 1
-set -e
-
cat >>configure.in <<'END'
AC_PROG_CC
dnl Older libtool versions don't define LT_PREREQ :-(
diff --git a/tests/m4-inclusion.test b/tests/m4-inclusion.test
index 927f521..c9106ae 100755
--- a/tests/m4-inclusion.test
+++ b/tests/m4-inclusion.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<'EOF'
sinclude([doesntexist.m4])
EOF
diff --git a/tests/maintclean-vpath.test b/tests/maintclean-vpath.test
index 8dd2a95..00c6d3f 100755
--- a/tests/maintclean-vpath.test
+++ b/tests/maintclean-vpath.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_CONFIG_FILES([bar sub/Makefile])
AC_OUTPUT
diff --git a/tests/parallel-tests-subdir.test b/tests/parallel-tests-subdir.test
index 18695fe..879c858 100755
--- a/tests/parallel-tests-subdir.test
+++ b/tests/parallel-tests-subdir.test
@@ -20,8 +20,6 @@
parallel_tests=yes
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_OUTPUT
END
diff --git a/tests/pr8365-remake-timing.test b/tests/pr8365-remake-timing.test
index 079b0c0..5dbebc6 100755
--- a/tests/pr8365-remake-timing.test
+++ b/tests/pr8365-remake-timing.test
@@ -24,8 +24,6 @@
. ./defs || Exit 1
-set -e
-
# We'll use calls to stat to get debugging information.
if stat /dev/null; then stat=stat; else stat=:; fi
diff --git a/tests/python-dist.test b/tests/python-dist.test
index fbf3ca5..d66ee80 100755
--- a/tests/python-dist.test
+++ b/tests/python-dist.test
@@ -19,8 +19,6 @@
# This test does not require python.
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AM_PATH_PYTHON([], [:], [:])
AC_OUTPUT
diff --git a/tests/python-vars.test b/tests/python-vars.test
index 7defee2..8e38d1f 100755
--- a/tests/python-vars.test
+++ b/tests/python-vars.test
@@ -20,8 +20,6 @@
required=python
. ./defs || Exit 1
-set -e
-
# In case the user's config.site defines pythondir or pyexecdir.
CONFIG_SITE=/dev/null; export CONFIG_SITE
diff --git a/tests/python-virtualenv.test b/tests/python-virtualenv.test
index 4bbfbfc..11055b0 100755
--- a/tests/python-virtualenv.test
+++ b/tests/python-virtualenv.test
@@ -20,8 +20,6 @@
required='python virtualenv'
. ./defs || Exit 1
-set -e
-
# In case the user's config.site defines pythondir or pyexecdir.
CONFIG_SITE=/dev/null; export CONFIG_SITE
diff --git a/tests/python5b.test b/tests/python5b.test
index 7f77cda..c903e3d 100755
--- a/tests/python5b.test
+++ b/tests/python5b.test
@@ -20,8 +20,6 @@
required=python
. ./defs || Exit 1
-set -e
-
cat >>configure.in << 'END'
# Hopefully the Python team will never release such a version.
AM_PATH_PYTHON([9999.9])
diff --git a/tests/specflg-dummy.test b/tests/specflg-dummy.test
index 614d6c2..0f4f33a 100755
--- a/tests/specflg-dummy.test
+++ b/tests/specflg-dummy.test
@@ -22,8 +22,6 @@
. ./defs || Exit 1
-set -e
-
# Disable shell globbing if possible.
(set +f) >/dev/null 2>&1 && set +f
diff --git a/tests/yacc-dist-nobuild-subdir.test b/tests/yacc-dist-nobuild-subdir.test
index b6811d7..f48d34b 100755
--- a/tests/yacc-dist-nobuild-subdir.test
+++ b/tests/yacc-dist-nobuild-subdir.test
@@ -21,8 +21,6 @@
required=yacc
. ./defs || Exit 1
-set -e
-
distdir=$me-1.0
cat >> configure.in << 'END'
--
1.7.2.3
