summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2017-08-04 16:10:06 +0300
committerEli Zaretskii <eliz@gnu.org>2017-08-04 16:10:06 +0300
commitbc6ab63653fe2c07743ab4c6d864a4975bbf55ec (patch)
treed2a5a64215b2e9ecbb20355e902a7e21919d5352
parentdb5d38ddb0de83d8f920b7a128fe3fd5156fdf85 (diff)
downloademacs-bc6ab63653fe2c07743ab4c6d864a4975bbf55ec.tar.gz
emacs-bc6ab63653fe2c07743ab4c6d864a4975bbf55ec.tar.bz2
emacs-bc6ab63653fe2c07743ab4c6d864a4975bbf55ec.zip
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.
-rw-r--r--test/lisp/dired-tests.el9
1 files changed, 9 insertions, 0 deletions
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)