From ab8ed418596da550c79913ccc42e8c3842bca315 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Tue, 18 Dec 2018 15:34:01 -0500 Subject: [PATCH 1/2] Avoid test failures if directory name looks like a regexp Taken from * test/lisp/ibuffer-tests.el (ibuffer-filter-inclusion-3): * test/lisp/net/tramp-tests.el (tramp-test42-remote-load-path): Regexp-quote file names to avoid failures with directory names of the form "build/emacs-i87jK3/emacs-26.1+1/...". --- test/lisp/ibuffer-tests.el | 4 ++-- test/lisp/net/tramp-tests.el | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/lisp/ibuffer-tests.el b/test/lisp/ibuffer-tests.el index ff5162fefa5..c1d9ed9fc3b 100644 --- a/test/lisp/ibuffer-tests.el +++ b/test/lisp/ibuffer-tests.el @@ -312,8 +312,8 @@ (funcall create-non-file-buffer "ibuf-test-3.b" :size 50 :mode #'text-mode :include-content "...but a multitude of drops?\n")) - (dirA (with-current-buffer bufA default-directory)) - (dirB (with-current-buffer bufB default-directory))) + (dirA (regexp-quote (with-current-buffer bufA default-directory))) + (dirB (regexp-quote (with-current-buffer bufB default-directory)))) (should (ibuffer-included-in-filters-p bufA '((basename . "ibuf-test-3")))) (should (ibuffer-included-in-filters-p diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 8f810818af1..19edec214f7 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -4773,8 +4773,9 @@ process sentinels. They shall not disturb each other." (string-match (format "Loading %s" - (expand-file-name - "tramp-cmds" (file-name-directory (locate-library "tramp")))) + (regexp-quote + (expand-file-name + "tramp-cmds" (file-name-directory (locate-library "tramp"))))) (shell-command-to-string (format "%s -batch -Q -L %s -l tramp-sh --eval %s" From 4c6c327d0c66a21416ed1b5e9738b7dd13e739f2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 18 Dec 2018 21:18:31 -0500 Subject: [PATCH 2/2] Restrict downcasing in elisp xref tests (bug#25534) The tests happen to not fail at the moment because find-library-name now has an extra feature, find-library--from-load-history, which happens to do a case-insensitive regexp match; but still it seems better not to rely on this. * test/lisp/progmodes/elisp-mode-tests.el (xref--case-insensitive): New variable. (xref-elisp-test-run, emacs-test-dir): Only downcase if the filesystem seems to be case-insensitive. --- test/lisp/progmodes/elisp-mode-tests.el | 28 ++++++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el index 941e85bc890..97148efde41 100644 --- a/test/lisp/progmodes/elisp-mode-tests.el +++ b/test/lisp/progmodes/elisp-mode-tests.el @@ -298,6 +298,16 @@ ))) +;; tmp may be on a different filesystem to the tests, but, ehh. +(defvar xref--case-insensitive + (let ((dir (make-temp-file "xref-test" t))) + (unwind-protect + (progn + (with-temp-file (expand-file-name "hElLo" dir) "hello") + (file-exists-p (expand-file-name "HELLO" dir))) + (delete-directory dir t))) + "Non-nil if file system seems to be case-insensitive.") + (defun xref-elisp-test-run (xrefs expected-xrefs) (should (= (length xrefs) (length expected-xrefs))) (while xrefs @@ -307,11 +317,13 @@ (expected-source (when (consp expected) (cdr expected)))) ;; Downcase the filenames for case-insensitive file systems. - (setf (xref-elisp-location-file (oref xref location)) - (downcase (xref-elisp-location-file (oref xref location)))) + (when xref--case-insensitive + (setf (xref-elisp-location-file (oref xref location)) + (downcase (xref-elisp-location-file (oref xref location)))) - (setf (xref-elisp-location-file (oref expected-xref location)) - (downcase (xref-elisp-location-file (oref expected-xref location)))) + (setf (xref-elisp-location-file (oref expected-xref location)) + (downcase (xref-elisp-location-file + (oref expected-xref location))))) (should (equal xref expected-xref)) @@ -346,10 +358,10 @@ to (xref-elisp-test-descr-to-target xref)." ;; `load-path' has the correct case, so this causes the expected test ;; values to have the wrong case). This is handled in ;; `xref-elisp-test-run'. -(defconst emacs-test-dir - (downcase - (file-truename (file-name-directory - (or load-file-name (buffer-file-name)))))) +(defvar emacs-test-dir + (funcall (if xref--case-insensitive 'downcase 'identity) + (file-truename (file-name-directory + (or load-file-name (buffer-file-name)))))) ;; alphabetical by test name