procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix two tests

Browse source 
* test/lisp/progmodes/elisp-mode-tests.el (xref-elisp-test-run):
Make sure file names can be compared as strings, by running them
through 'file-truename'.  Reported by Vin Shelton
<acs@alumni.princeton.edu>.
* test/lisp/emacs-lisp/bytecomp-tests.el ("warn-obsolete-hook.el")
("warn-obsolete-variable.el"): Use [^z-a] to match a newline as
well.  Reported by Vin Shelton <acs@alumni.princeton.edu>.
This commit is contained in:
Eli Zaretskii 2021-01-16 20:15:17 +02:00
parent 57ae3f29af
commit 0057294b2a
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/lisp/emacs-lisp/bytecomp-tests.el
View file

@ -617,13 +617,13 @@ Subtests signal errors if something goes wrong."
(make-obsolete-variable 'bytecomp--tests-obsolete-var nil "99.99") (make-obsolete-variable 'bytecomp--tests-obsolete-var nil "99.99")
(bytecomp--define-warning-file-test "warn-obsolete-hook.el" (bytecomp--define-warning-file-test "warn-obsolete-hook.el"
"bytecomp--tests-obs.*obsolete.*99.99") "bytecomp--tests-obs.*obsolete[^z-a]*99.99")
(bytecomp--define-warning-file-test "warn-obsolete-variable-same-file.el" (bytecomp--define-warning-file-test "warn-obsolete-variable-same-file.el"
"foo-obs.*obsolete.*99.99" t) "foo-obs.*obsolete.*99.99" t)
(bytecomp--define-warning-file-test "warn-obsolete-variable.el" (bytecomp--define-warning-file-test "warn-obsolete-variable.el"
"bytecomp--tests-obs.*obsolete.*99.99") "bytecomp--tests-obs.*obsolete[^z-a]*99.99")
(bytecomp--define-warning-file-test "warn-obsolete-variable-bound.el" (bytecomp--define-warning-file-test "warn-obsolete-variable-bound.el"
"bytecomp--tests-obs.*obsolete.*99.99" t) "bytecomp--tests-obs.*obsolete.*99.99" t)

14
test/lisp/progmodes/elisp-mode-tests.el
View file

@ -314,7 +314,19 @@
(let* ((xref (pop xrefs)) (let* ((xref (pop xrefs))
(expected (pop expected-xrefs)) (expected (pop expected-xrefs))
(expected-xref (or (when (consp expected) (car expected)) expected)) (expected-xref (or (when (consp expected) (car expected)) expected))
(expected-source (when (consp expected) (cdr expected)))) (expected-source (when (consp expected) (cdr expected)))
(xref-file (xref-elisp-location-file (oref xref location)))
(expected-file (xref-elisp-location-file
(oref expected-xref location))))
;; Make sure file names compare as strings.
(when (file-name-absolute-p xref-file)
(setf (xref-elisp-location-file (oref xref location))
(file-truename (xref-elisp-location-file (oref xref location)))))
(when (file-name-absolute-p expected-file)
(setf (xref-elisp-location-file (oref expected-xref location))
(file-truename (xref-elisp-location-file
(oref expected-xref location)))))
;; Downcase the filenames for case-insensitive file systems. ;; Downcase the filenames for case-insensitive file systems.
(when xref--case-insensitive (when xref--case-insensitive