init.sh: work around trap limitation of some shells

This limitation is already documented in the Autoconf manual.

* tests/init.sh (setup_): Move exit trap outside of shell function.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 8051cf06699105ac9829e2410a75c75e6a09e9a8..0535e28d9cb01962a050e5a7f3fe17b90373a701 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-29  Peter O'Gorman  <pogma@thewrittenword.com>  (tiny change)
+
+       init.sh: work around trap limitation of some shells
+       * tests/init.sh (setup_): Move exit trap outside of shell function.
+
 2010-07-29  Eric Blake  <eblake@redhat.com>
 
        strtod: aid debugging

diff --git a/tests/init.sh b/tests/init.sh
index 794352673f223c6592260c3352a3a793705c7961..bc82d69a9228994c36eb27c1245f281c971c3dc0 100644 (file)
--- 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