This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch linaro/2.21/master updated. glibc-2.21-53-ga67ffcf
- From: azanella at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 21 Apr 2017 13:08:41 -0000
- Subject: GNU C Library master sources branch linaro/2.21/master updated. glibc-2.21-53-ga67ffcf
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, linaro/2.21/master has been updated
via a67ffcfae3a020e70ef70d5f9f975e54354fb5e0 (commit)
from 136c42bf121185dd2cecd012fa614b24303b8497 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a67ffcfae3a020e70ef70d5f9f975e54354fb5e0
commit a67ffcfae3a020e70ef70d5f9f975e54354fb5e0
Author: Joseph Myers <joseph@codesourcery.com>
Date: Wed Oct 21 21:18:21 2015 +0000
Make io/ftwtest-sh remove temporary files on early exit.
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.
diff --git a/ChangeLog b/ChangeLog
index e2ee914..385ffab 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 478171d..8669eab 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
io/ftwtest-sh | 4 +++-
2 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources