aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-10-21 21:18:21 +0000
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-04-21 10:07:56 -0300
commita67ffcfae3a020e70ef70d5f9f975e54354fb5e0 (patch)
tree21545c8279795fa9e5da24ba9704bfb4c2ea3396
parent136c42bf121185dd2cecd012fa614b24303b8497 (diff)
downloadtermbaud-linaro/2.21/master.tar.gz
termbaud-linaro/2.21/master.tar.xz
termbaud-linaro/2.21/master.zip
Make io/ftwtest-sh remove temporary files on early exit.linaro/2.21/master
The test io/ftwtest-sh creates a directory that at some points during the test does not have execute permission. To avoid leaving behind such a directory that prevents the build directory from being removed with a simple "rm -rf", it traps various signals to make the directory executable and remove it before exit. However, this doesn't cover the case where one of the tests simply fails (which happens with cross testing if testing on a remote system where the path to the build directory involves a symlink, or if that remote system fell over during testing - I think the latter is the case where the directory is left behind with bad permissions). This patch makes that test also trap signal 0 (exit) so that the directory gets properly removed in such failure cases as well. Tested in both configurations where the test passes and where it fails to verify that the result of the test is unchanged but the directory is no longer left behind where it was previously left behind. * io/ftwtest-sh: Also trap on exit to remove temporary files.
-rw-r--r--ChangeLog4
-rw-r--r--io/ftwtest-sh4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e2ee9148d77..385ffab0aa0 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 478171db78e..8669eab4854 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