From bc6ab63653fe2c07743ab4c6d864a4975bbf55ec Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 4 Aug 2017 16:10:06 +0300 Subject: [PATCH] Fix dired-test-bug25609 on MS-Windows * test/lisp/dired-tests.el (dired-test-bug25609): On MS-Windows, pass temporary files through file-truename, to avoid bogus failures due to file-name comparison as strings. --- test/lisp/dired-tests.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el index 79333705c59..02dbf263b9a 100644 --- a/test/lisp/dired-tests.el +++ b/test/lisp/dired-tests.el @@ -58,7 +58,16 @@ (ert-deftest dired-test-bug25609 () "Test for http://debbugs.gnu.org/25609 ." (let* ((from (make-temp-file "foo" 'dir)) + ;; Make sure we have long file-names in 'from' and 'to', not + ;; their 8+3 short aliases, because the latter will confuse + ;; Dired commands invoked below. + (from (if (memq system-type '(ms-dos windows-nt)) + (file-truename from) + from)) (to (make-temp-file "bar" 'dir)) + (to (if (memq system-type '(ms-dos windows-nt)) + (file-truename to) + to)) (target (expand-file-name (file-name-nondirectory from) to)) (nested (expand-file-name (file-name-nondirectory from) target)) (dired-dwim-target t) -- 2.39.2