summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-12-18 21:18:31 -0500
committerGlenn Morris <rgm@gnu.org>2018-12-18 21:18:31 -0500
commit4c6c327d0c66a21416ed1b5e9738b7dd13e739f2 (patch)
treee645a871753147f56341d63cfa028a3dbb394ce1
parentab8ed418596da550c79913ccc42e8c3842bca315 (diff)
downloademacs-4c6c327d0c66a21416ed1b5e9738b7dd13e739f2.tar.gz
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.
-rw-r--r--test/lisp/progmodes/elisp-mode-tests.el28
1 files 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