[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 85c8a9c: Fix files-tests broken on MS-Windows by a recent change
From: |
Eli Zaretskii |
Subject: |
master 85c8a9c: Fix files-tests broken on MS-Windows by a recent change |
Date: |
Sat, 7 Aug 2021 07:31:38 -0400 (EDT) |
branch: master
commit 85c8a9cd0cff0e2f6d5470423731d9f1e87e2cde
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Fix files-tests broken on MS-Windows by a recent change
* test/lisp/files-tests.el (files-colon-path): Use path-separator, and
account for drive letters in absolute file names on MS-Windows. (Bug#49918)
---
test/lisp/files-tests.el | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 523f51e..a612c06 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1462,9 +1462,11 @@ See <https://debbugs.gnu.org/36401>."
'("x:/foo/bar/baz/")))
(should (equal (parse-colon-path "/foo//bar/baz")
'("/foo/bar/baz/"))))
-
- (should (equal (parse-colon-path ".:/tmp")
- '("./" "/tmp/"))))
+ (let* ((path (concat "." path-separator "/tmp"))
+ (parsed-path (parse-colon-path path))
+ (name-start (if (memq system-type '(windows-nt ms-dos)) 2)))
+ (should (equal (car parsed-path) "./"))
+ (should (equal (substring (cadr parsed-path) name-start) "/tmp/"))))
(ert-deftest files-test-magic-mode-alist-doctype ()
"Test that DOCTYPE and variants put files in mhtml-mode."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 85c8a9c: Fix files-tests broken on MS-Windows by a recent change,
Eli Zaretskii <=