emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 2ad06e2: Fix file-tests.el on MS-Windows


From: Eli Zaretskii
Subject: master 2ad06e2: Fix file-tests.el on MS-Windows
Date: Sun, 3 Nov 2019 11:14:03 -0500 (EST)

branch: master
commit 2ad06e28e34924bdb08df9cf9e385ab4451c1274
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix file-tests.el on MS-Windows
    
    * test/lisp/files-tests.el
    (files-tests-file-name-non-special-start-file-process): On
    MS-Windows, wait till the process dies before returning from
    the files-tests--with-temp-non-special macro, to ensure the
    temporary directory is successfully deleted.
---
 test/lisp/files-tests.el | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 60387e1..d73c6a7 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1052,7 +1052,13 @@ unquoted file names."
           (should (search-forward emacs-version nil t))
           ;; Don't stop the test run with a query, as the subprocess
           ;; may or may not be dead by the time we reach here.
-          (set-process-query-on-exit-flag proc nil)))))
+          (set-process-query-on-exit-flag proc nil)
+          ;; On MS-Windows, wait for the process to die, since the OS
+          ;; will not let us delete a directory that is the cwd of a
+          ;; running process.
+          (when (eq system-type 'windows-nt)
+            (while (process-live-p proc)
+              (sleep-for 0.1)))))))
   (files-tests--with-temp-non-special-and-file-name-handler
       (tmpdir nospecial-dir t)
     (with-temp-buffer



reply via email to

[Prev in Thread] Current Thread [Next in Thread]