diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-11-03 18:13:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-11-03 18:13:38 +0200 |
| commit | 2ad06e28e34924bdb08df9cf9e385ab4451c1274 (patch) | |
| tree | 9b561b9fe5cac5dc39f400c9c079e2c5f68f4606 /test/lisp/files-tests.el | |
| parent | 0b21ecdb5ea9db8cf7a4a4ee59b29bf6273f2915 (diff) | |
| download | emacs-2ad06e28e34924bdb08df9cf9e385ab4451c1274.tar.gz emacs-2ad06e28e34924bdb08df9cf9e385ab4451c1274.tar.bz2 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/files-tests.el')
| -rw-r--r-- | test/lisp/files-tests.el | 8 |
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." (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 |