diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | io/ftwtest-sh | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e2ee9148d7..385ffab0aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-04-21 Joseph Myers <joseph@codesourcery.com> + + * io/ftwtest-sh: Also trap on exit to remove temporary files. + 2017-04-11 Adhemerval Zanella <adhemerval.zanella@linaro.org> * posix/globtest.sh: Add cleanup routine on trap 0. diff --git a/io/ftwtest-sh b/io/ftwtest-sh index 478171db78..8669eab485 100644 --- a/io/ftwtest-sh +++ b/io/ftwtest-sh @@ -45,7 +45,7 @@ export LC_ALL tmp=${objpfx}io tmpdir=$tmp/ftwtest.d -trap 'chmod -fR a+x $tmpdir; rm -fr $tmpdir $testout' 1 2 3 15 +trap 'chmod -fR a+x $tmpdir; rm -fr $tmpdir $testout' 0 1 2 3 15 if test -d $tmpdir; then chmod -fR a+x $tmpdir @@ -296,4 +296,6 @@ rm $testout rm -fr $tmpdir +trap '' 0 + exit 0 |