From 0886b05af81d5aaa54be74bd72ab503e8bfd4db1 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 23 Dec 2011 18:02:21 +0100 Subject: [PATCH] tests: remove redundant uses of `set -e' * tests/deleted-am.test: Do not set the `errexit' shell flag, as it is already set by `tests/defs'. * tests/deleted-m4.test: Likewise. * tests/dist-missing-am.test: Likewise. * tests/dist-missing-am.test: Likewise. * tests/dist-missing-m4.test: Likewise. * tests/dist-missing-included-m4.test: Likewise. * tests/get-sysconf.test: Likewise. * tests/makefile-deps.test: Likewise. * tests/remake-m4-pr10111.test: Likewise. * tests/remake-am-pr10111.test: Likewise. * tests/remake-deleted-am.test: Likewise. * tests/remake-deleted-am2.test: Likewise. * tests/remake-deleted-am-subdir.test: Likewise. * tests/remake-renamed-am.test: Likewise. --- ChangeLog | 19 +++++++++++++++++++ tests/deleted-am.test | 2 -- tests/deleted-m4.test | 2 -- tests/dist-missing-am.test | 2 -- tests/dist-missing-included-m4.test | 2 -- tests/dist-missing-m4.test | 2 -- tests/get-sysconf.test | 2 -- tests/makefile-deps.test | 2 -- tests/remake-am-pr10111.test | 2 -- tests/remake-deleted-am-2.test | 2 -- tests/remake-deleted-am-subdir.test | 2 -- tests/remake-deleted-am.test | 2 -- tests/remake-m4-pr10111.test | 2 -- tests/remake-renamed-am.test | 2 -- 14 files changed, 19 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index b75627a6d..538e9918e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2011-12-23 Stefano Lattarini + + tests: remove redundant uses of `set -e' + * tests/deleted-am.test: Do not set the `errexit' shell flag, as + it is already set by `tests/defs'. + * tests/deleted-m4.test: Likewise. + * tests/dist-missing-am.test: Likewise. + * tests/dist-missing-am.test: Likewise. + * tests/dist-missing-m4.test: Likewise. + * tests/dist-missing-included-m4.test: Likewise. + * tests/get-sysconf.test: Likewise. + * tests/makefile-deps.test: Likewise. + * tests/remake-m4-pr10111.test: Likewise. + * tests/remake-am-pr10111.test: Likewise. + * tests/remake-deleted-am.test: Likewise. + * tests/remake-deleted-am2.test: Likewise. + * tests/remake-deleted-am-subdir.test: Likewise. + * tests/remake-renamed-am.test: Likewise. + 2011-12-22 Stefano Lattarini tests: fix failure due to debugging code forgotten into a test diff --git a/tests/deleted-am.test b/tests/deleted-am.test index fa41e9e10..fa7c6abcc 100755 --- a/tests/deleted-am.test +++ b/tests/deleted-am.test @@ -21,8 +21,6 @@ . ./defs || Exit 1 -set -e - echo AC_OUTPUT >> configure.in echo 'include $(top_srcdir)/foobar.am' > Makefile.am diff --git a/tests/deleted-m4.test b/tests/deleted-m4.test index 6b0b9af4b..82db3f073 100755 --- a/tests/deleted-m4.test +++ b/tests/deleted-m4.test @@ -21,8 +21,6 @@ . ./defs || Exit 1 -set -e - cat >> configure.in <<'END' m4_include([foobar.m4]) AC_OUTPUT diff --git a/tests/dist-missing-am.test b/tests/dist-missing-am.test index bb404bc9d..df9d5794b 100755 --- a/tests/dist-missing-am.test +++ b/tests/dist-missing-am.test @@ -21,8 +21,6 @@ . ./defs || Exit 1 -set -e - echo AC_OUTPUT >> configure.in cat > Makefile.am <<'END' diff --git a/tests/dist-missing-included-m4.test b/tests/dist-missing-included-m4.test index 56ba24c0f..432841712 100755 --- a/tests/dist-missing-included-m4.test +++ b/tests/dist-missing-included-m4.test @@ -22,8 +22,6 @@ . ./defs || Exit 1 -set -e - cat >> configure.in <<'END' m4_include([foobar.m4]) m4_include([zardoz.m4]) diff --git a/tests/dist-missing-m4.test b/tests/dist-missing-m4.test index a2618e980..02e95c7d5 100755 --- a/tests/dist-missing-m4.test +++ b/tests/dist-missing-m4.test @@ -22,8 +22,6 @@ . ./defs || Exit 1 -set -e - cat >> configure.in <<'END' m4_pattern_forbid([^MY_]) MY_FOOBAR || exit 1 diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test index 1a549a3f7..6e1163e4e 100755 --- a/tests/get-sysconf.test +++ b/tests/get-sysconf.test @@ -22,8 +22,6 @@ . ./defs || Exit 1 -set -e - # FIXME: remove these once we are merged into master. top_testsrcdir=$testsrcdir/.. testbuilddir=`(cd .. && pwd)` diff --git a/tests/makefile-deps.test b/tests/makefile-deps.test index 819c7d336..bfe0d676d 100755 --- a/tests/makefile-deps.test +++ b/tests/makefile-deps.test @@ -19,8 +19,6 @@ . ./defs || Exit 1 -set -e - : > Makefile.am $ACLOCAL diff --git a/tests/remake-am-pr10111.test b/tests/remake-am-pr10111.test index 888c9dd61..064cfe512 100755 --- a/tests/remake-am-pr10111.test +++ b/tests/remake-am-pr10111.test @@ -24,8 +24,6 @@ . ./defs || Exit 1 -set -e - cat >> configure.in <<'END' AC_OUTPUT END diff --git a/tests/remake-deleted-am-2.test b/tests/remake-deleted-am-2.test index 07142f662..07a419d94 100755 --- a/tests/remake-deleted-am-2.test +++ b/tests/remake-deleted-am-2.test @@ -20,8 +20,6 @@ . ./defs || Exit 1 -set -e - echo AC_OUTPUT >> configure.in $ACLOCAL diff --git a/tests/remake-deleted-am-subdir.test b/tests/remake-deleted-am-subdir.test index 9ed1078d0..32b6f37bd 100755 --- a/tests/remake-deleted-am-subdir.test +++ b/tests/remake-deleted-am-subdir.test @@ -20,8 +20,6 @@ . ./defs || Exit 1 -set -e - cat >> configure.in <<'END' AC_CONFIG_FILES([sub1/Makefile sub2/Makefile]) AC_OUTPUT diff --git a/tests/remake-deleted-am.test b/tests/remake-deleted-am.test index fa5a67203..3af9c0c70 100755 --- a/tests/remake-deleted-am.test +++ b/tests/remake-deleted-am.test @@ -19,8 +19,6 @@ . ./defs || Exit 1 -set -e - echo AC_OUTPUT >> configure.in $ACLOCAL diff --git a/tests/remake-m4-pr10111.test b/tests/remake-m4-pr10111.test index 2d89c2592..5aa57ba08 100755 --- a/tests/remake-m4-pr10111.test +++ b/tests/remake-m4-pr10111.test @@ -24,8 +24,6 @@ . ./defs || Exit 1 -set -e - cat >> configure.in <<'END' m4_include([foobar.m4]) AC_OUTPUT diff --git a/tests/remake-renamed-am.test b/tests/remake-renamed-am.test index b3a7a4139..6c041358c 100755 --- a/tests/remake-renamed-am.test +++ b/tests/remake-renamed-am.test @@ -20,8 +20,6 @@ . ./defs || Exit 1 -set -e - echo AC_OUTPUT >> configure.in cat > Makefile.am <<'END' -- 2.47.2