From 1cf7d18839c7f9d878a322f841e1be8845d83514 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 28 Dec 2011 13:23:31 +0100 Subject: [PATCH] test defs: fix indentation (cosmetic change) * defs (exit trap): Fix indentation left botched by previous patch 'v1.11b-51-g626bf65'. Signed-off-by: Stefano Lattarini --- defs | 113 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/defs b/defs index 4c1e40d..fcdbb7d 100644 --- a/defs +++ b/defs @@ -1001,64 +1001,63 @@ case " $required " in *\ gettext*) . ./t/gettext-macros.dir/get.sh;; esac distdir=$me-1.0 # Set up the exit trap. -# FIXME: adjust indentation, here and below. - trap 'exit_status=$? - set +e - cd "$am_top_builddir" - if test $am_using_tap = yes; then - if test "$planned_" = later && test $exit_status -eq 0; then - plan_ "now" - fi - test $exit_status -eq 0 && test $tap_pass_count_ -eq $tap_count_ \ - || keep_testdirs=yes - else - # This is to ensure that a test script does give a SKIP outcome just - # because a command in it happens to exit with status 77. This - # behaviour, while from time to time useful to developers, is not - # meant to be enabled by default, as it could cause spurious failures - # in the wild. Thus it will be enabled only when the variable - # "am_explicit_skips" is set to a "true" value. - case $am_explicit_skips in - [yY]|[yY]es|1) - if test $exit_status -eq 77 && test $am__test_skipped != yes; then - echo "$me: implicit skip turned into failure" - exit_status=78 - fi;; - esac - test $exit_status -eq 0 || keep_testdirs=yes +trap 'exit_status=$? + set +e + cd "$am_top_builddir" + if test $am_using_tap = yes; then + if test "$planned_" = later && test $exit_status -eq 0; then + plan_ "now" fi - am_keeping_testdirs || rm_rf_ $testSubDir - set +x - echo "$me: exit $exit_status" - exit $exit_status - ' 0 - trap "fatal_ 'caught signal SIGHUP'" 1 - trap "fatal_ 'caught signal SIGINT'" 2 - trap "fatal_ 'caught signal SIGTERM'" 15 - # Various shells seems to just ignore SIGQUIT under some circumstances, - # even if the signal is not blocked; however, if the signal it trapped, - # the trap gets correctly executed. So we also trap SIGQUIT. - # Here is a list of some shells that have been verified to exhibit the - # problematic behavior with SIGQUIT: - # - zsh 4.3.12 on Debian GNU/Linux - # - /bin/ksh and /usr/xpg4/bin/sh on Solaris 10 - # - Bash 3.2.51 on Solaris 10 and bash 4.1.5 on Debian GNU/Linux - # - AT&T ksh on Debian Gnu/Linux (deb package ksh, version 93u-1) - # OTOH, at least these shells that do *not* exhibit that behaviour: - # - modern version of the Almquist Shell (at least 0.5.5.1), on - # both Solaris and GNU/Linux - # - Solaris 10 /bin/sh - # - public domain Korn Shell, version 5.2.14, on Debian GNU/Linux - trap "fatal_ 'caught signal SIGQUIT'" 3 - # Ignore further SIGPIPE in the trap code. This is required to avoid - # a very weird issue with some shells, at least when the execution of - # the automake testsuite is driven by the 'prove' utility: if prove - # (or the make process that has spawned it) gets interrupted with - # Ctrl-C, the shell might go in a loop, continually getting a SIGPIPE, - # sometimes finally dumping core, other times hanging indefinitely. - # See also Test::Harness bug [rt.cpan.org #70855], archived at - # - trap "trap '' 13; fatal_ 'caught signal SIGPIPE'" 13 + test $exit_status -eq 0 && test $tap_pass_count_ -eq $tap_count_ \ + || keep_testdirs=yes + else + # This is to ensure that a test script does give a SKIP outcome just + # because a command in it happens to exit with status 77. This + # behaviour, while from time to time useful to developers, is not + # meant to be enabled by default, as it could cause spurious failures + # in the wild. Thus it will be enabled only when the variable + # "am_explicit_skips" is set to a "true" value. + case $am_explicit_skips in + [yY]|[yY]es|1) + if test $exit_status -eq 77 && test $am__test_skipped != yes; then + echo "$me: implicit skip turned into failure" + exit_status=78 + fi;; + esac + test $exit_status -eq 0 || keep_testdirs=yes + fi + am_keeping_testdirs || rm_rf_ $testSubDir + set +x + echo "$me: exit $exit_status" + exit $exit_status +' 0 +trap "fatal_ 'caught signal SIGHUP'" 1 +trap "fatal_ 'caught signal SIGINT'" 2 +trap "fatal_ 'caught signal SIGTERM'" 15 +# Various shells seems to just ignore SIGQUIT under some circumstances, +# even if the signal is not blocked; however, if the signal it trapped, +# the trap gets correctly executed. So we also trap SIGQUIT. +# Here is a list of some shells that have been verified to exhibit the +# problematic behavior with SIGQUIT: +# - zsh 4.3.12 on Debian GNU/Linux +# - /bin/ksh and /usr/xpg4/bin/sh on Solaris 10 +# - Bash 3.2.51 on Solaris 10 and bash 4.1.5 on Debian GNU/Linux +# - AT&T ksh on Debian Gnu/Linux (deb package ksh, version 93u-1) +# OTOH, at least these shells that do *not* exhibit that behaviour: +# - modern version of the Almquist Shell (at least 0.5.5.1), on +# both Solaris and GNU/Linux +# - Solaris 10 /bin/sh +# - public domain Korn Shell, version 5.2.14, on Debian GNU/Linux +trap "fatal_ 'caught signal SIGQUIT'" 3 +# Ignore further SIGPIPE in the trap code. This is required to avoid +# a very weird issue with some shells, at least when the execution of +# the automake testsuite is driven by the 'prove' utility: if prove +# (or the make process that has spawned it) gets interrupted with +# Ctrl-C, the shell might go in a loop, continually getting a SIGPIPE, +# sometimes finally dumping core, other times hanging indefinitely. +# See also Test::Harness bug [rt.cpan.org #70855], archived at +# +trap "trap '' 13; fatal_ 'caught signal SIGPIPE'" 13 # Create and populate the temporary directory, if and as required. if test x"$am_create_testdir" = x"no"; then -- 2.7.4