From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 4 Aug 2017 13:10:06 +0000 (+0300)
Subject: Fix dired-test-bug25609 on MS-Windows
X-Git-Tag: emacs-26.0.90~517^2~30
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc6ab63653fe2c07743ab4c6d864a4975bbf55ec;p=emacs.git

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.
---

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)