diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-01-16 20:15:17 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-01-16 20:15:17 +0200 |
| commit | 0057294b2ad6cdd2802e1b290a190fa42e723fb8 (patch) | |
| tree | 68d28807fa6070891a14aa12c6ea22843922fe94 /test | |
| parent | 57ae3f29af160d08a3a3568a7d969adecd25bcb7 (diff) | |
| download | emacs-0057294b2ad6cdd2802e1b290a190fa42e723fb8.tar.gz | |
Fix two tests
* 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>.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/emacs-lisp/bytecomp-tests.el | 4 | ||||
| -rw-r--r-- | test/lisp/progmodes/elisp-mode-tests.el | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el index a07af188fac..263736af4ed 100644 --- a/test/lisp/emacs-lisp/bytecomp-tests.el +++ b/test/lisp/emacs-lisp/bytecomp-tests.el @@ -617,13 +617,13 @@ Subtests signal errors if something goes wrong." (make-obsolete-variable 'bytecomp--tests-obsolete-var nil "99.99") (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" "foo-obs.*obsolete.*99.99" t) (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--tests-obs.*obsolete.*99.99" t) diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el index a10d5dab906..fd43707f277 100644 --- a/test/lisp/progmodes/elisp-mode-tests.el +++ b/test/lisp/progmodes/elisp-mode-tests.el @@ -314,7 +314,19 @@ (let* ((xref (pop xrefs)) (expected (pop expected-xrefs)) (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. (when xref--case-insensitive |