[Pkg-gnupg-commit] [gnupg2] 222/292: tests, w32: Make cleanup more robust.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit dd13b2a561e31045fd3d3576bab99543cd4eb6cc
Author: Justus Winter <justus at g10code.com>
Date:   Tue Nov 8 14:11:23 2016 +0100

    tests,w32: Make cleanup more robust.
    
    * tests/openpgp/run-tests.scm (run-tests-parallel): Catch errors when
    removing the working directory.  On Windows this can fail if there is
    still a process using one of the files there.
    (run-tests-sequential): Likewise.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/openpgp/run-tests.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/openpgp/run-tests.scm b/tests/openpgp/run-tests.scm
index 9e9bc3d..23ff8a2 100644
--- a/tests/openpgp/run-tests.scm
+++ b/tests/openpgp/run-tests.scm
@@ -118,7 +118,8 @@
       (if (null? tests')
 	  (let ((results (pool::wait)))
 	    (for-each (lambda (t)
-			(unlink-recursively t::directory)
+			(catch (echo "Removing" t::directory "failed:" *error*)
+			       (unlink-recursively t::directory))
 			(t::report)) results::procs)
 	    (exit (results::report)))
 	  (let* ((wd (mkdtemp))
@@ -134,7 +135,8 @@
       (if (null? tests')
 	  (let ((results (pool::wait)))
 	    (for-each (lambda (t)
-			(unlink-recursively t::directory))
+			(catch (echo "Removing" t::directory "failed:" *error*)
+			       (unlink-recursively t::directory)))
 		      results::procs)
 	    (exit (results::report)))
 	  (let* ((wd (mkdtemp))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git