From dd13b2a561e31045fd3d3576bab99543cd4eb6cc Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 8 Nov 2016 14:11:23 +0100 Subject: 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 --- 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 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)) -- cgit v1.2.3