about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--io/ftwtest-sh4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1300047a76..66a0cce49f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* io/ftwtest-sh: Also trap on exit to remove temporary files.
+
 2015-10-21  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/i386/libc-do-syscall.S: Replace
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