aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2016-11-08 13:11:23 +0000
committerJustus Winter <[email protected]>2016-11-08 15:02:55 +0000
commitdd13b2a561e31045fd3d3576bab99543cd4eb6cc (patch)
treef16e6c26b021ed7ac4a9cf83e0e6b5d615302ab3
parentcommon,w32: Simplify locking. (diff)
downloadgnupg-dd13b2a561e31045fd3d3576bab99543cd4eb6cc.tar.gz
gnupg-dd13b2a561e31045fd3d3576bab99543cd4eb6cc.zip
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 <[email protected]>
-rw-r--r--tests/openpgp/run-tests.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/openpgp/run-tests.scm b/tests/openpgp/run-tests.scm
index 9e9bc3d0e..23ff8a2b0 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))