From db48b362417e3f86671c040610ddfa27596bd258 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 3 Aug 2010 13:01:16 -0700 Subject: [PATCH] init.sh: work around trap limitation of some shells * tests/init.sh (setup_): Move exit trap outside of shell function. This patch is imported from gnulib. --- tests/init.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/init.sh b/tests/init.sh index 7943526..bc82d69 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -255,9 +255,9 @@ setup_() || fail_ "failed to create temporary directory in $initial_cwd_" cd "$test_dir_" - # These trap statements ensure that the temporary directory, $test_dir_, - # is removed upon exit as well as upon receipt of any of the listed signals. - trap remove_tmp_ 0 + # This trap statement, along with a trap on 0 below, ensure that the + # temporary directory, $test_dir_, is removed upon exit as well as + # upon receipt of any of the listed signals. for sig_ in 1 2 3 13 15; do eval "trap 'Exit $(expr $sig_ + 128)' $sig_" done @@ -385,3 +385,6 @@ test -f "$srcdir/init.cfg" \ && . "$srcdir/init.cfg" setup_ "$@" +# This trap is here, rather than in the setup_ function, because some +# shells run the exit trap at shell function exit, rather than script exit. +trap remove_tmp_ 0 -- 2.7.4