From 4a6eabf615d6b82d4dc570afe801833dd03295ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Sun, 3 Jan 2021 21:49:22 +0100 Subject: [PATCH] Fix some xref-tests for systems with BSD find Some versions of BSD find, like those present on macOS systems, may return a file path with two intermediate slashes (eg. "path/to//resource"). As this is valid POSIX, just make the tests build their paths in a more portable way. --- test/lisp/progmodes/xref-tests.el | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/test/lisp/progmodes/xref-tests.el b/test/lisp/progmodes/xref-tests.el index eaafc5888c..32cb2960a1 100644 --- a/test/lisp/progmodes/xref-tests.el +++ b/test/lisp/progmodes/xref-tests.el @@ -101,11 +101,13 @@ xref--buf-pairs-iterator-cleans-up-markers (ert-deftest xref--xref-file-name-display-is-abs () (let ((xref-file-name-display 'abs)) (should (equal (delete-dups - (mapcar 'xref-location-group - (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)"))) + (mapcar + (lambda (e) + (expand-file-name (xref-location-group e))) + (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)"))) (list - (concat xref-tests--data-dir "file1.txt") - (concat xref-tests--data-dir "file2.txt")))))) + (expand-file-name "file1.txt" xref-tests--data-dir) + (expand-file-name "file2.txt" xref-tests--data-dir)))))) (ert-deftest xref--xref-file-name-display-is-nondirectory () (let ((xref-file-name-display 'nondirectory)) @@ -121,10 +123,12 @@ xref--xref-file-name-display-is-relative-to-project-root (file-name-directory (directory-file-name xref-tests--data-dir))) (project-find-functions #'(lambda (_) (cons 'transient data-parent-dir))) - (xref-file-name-display 'project-relative)) + (xref-file-name-display 'project-relative)) (should (equal (delete-dups - (mapcar 'xref-location-group - (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)"))) + (mapcar + (lambda (e) + (file-relative-name (xref-location-group e))) + (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)"))) (list "xref-resources/file1.txt" "xref-resources/file2.txt"))))) -- 2.28.0