aboutsummaryrefslogtreecommitdiffstats
path: root/test/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2019-11-03 18:13:38 +0200
committerEli Zaretskii2019-11-03 18:13:38 +0200
commit2ad06e28e34924bdb08df9cf9e385ab4451c1274 (patch)
tree9b561b9fe5cac5dc39f400c9c079e2c5f68f4606 /test/lisp
parent0b21ecdb5ea9db8cf7a4a4ee59b29bf6273f2915 (diff)
downloademacs-2ad06e28e34924bdb08df9cf9e385ab4451c1274.tar.gz
emacs-2ad06e28e34924bdb08df9cf9e385ab4451c1274.zip
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.
Diffstat (limited to 'test/lisp')
-rw-r--r--test/lisp/files-tests.el8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 60387e1ab2e..d73c6a78421 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1052,7 +1052,13 @@ unquoted file names."
1052 (should (search-forward emacs-version nil t)) 1052 (should (search-forward emacs-version nil t))
1053 ;; Don't stop the test run with a query, as the subprocess 1053 ;; Don't stop the test run with a query, as the subprocess
1054 ;; may or may not be dead by the time we reach here. 1054 ;; may or may not be dead by the time we reach here.
1055 (set-process-query-on-exit-flag proc nil))))) 1055 (set-process-query-on-exit-flag proc nil)
1056 ;; On MS-Windows, wait for the process to die, since the OS
1057 ;; will not let us delete a directory that is the cwd of a
1058 ;; running process.
1059 (when (eq system-type 'windows-nt)
1060 (while (process-live-p proc)
1061 (sleep-for 0.1)))))))
1056 (files-tests--with-temp-non-special-and-file-name-handler 1062 (files-tests--with-temp-non-special-and-file-name-handler
1057 (tmpdir nospecial-dir t) 1063 (tmpdir nospecial-dir t)
1058 (with-temp-buffer 1064 (with-temp-buffer