From: Philipp Stephani <phst@google.com>
Date: Sun, 25 Oct 2020 10:24:11 +0000 (+0100)
Subject: Revert commit 1f44a776729adf9c6468a76f8310616fde62eeaa for XRef.
X-Git-Tag: emacs-28.0.90~5431
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e73e7a8bd6782b24045ea64aa9147bee5f44d65d;p=emacs.git

Revert commit 1f44a776729adf9c6468a76f8310616fde62eeaa for XRef.

XRef supports Emacs versions back to Emacs 26.3, so it can’t use newer
functions such as ‘ert-resource-directory’.

* test/lisp/progmodes/xref-tests.el (xref-tests-data-dir): Don’t use
‘ert-resource-directory’
---

diff --git a/test/lisp/progmodes/xref-tests.el b/test/lisp/progmodes/xref-tests.el
index 060c9cb5d1c..038f9d0e304 100644
--- a/test/lisp/progmodes/xref-tests.el
+++ b/test/lisp/progmodes/xref-tests.el
@@ -24,11 +24,13 @@
 ;;; Code:
 
 (require 'ert)
-(require 'ert-x)
 (require 'xref)
 (require 'cl-lib)
 
-(defvar xref-tests-data-dir (ert-resource-directory))
+(defvar xref-tests-data-dir
+  (expand-file-name "xref-resources/"
+                    (file-name-directory
+                     (or load-file-name buffer-file-name))))
 
 (ert-deftest xref-matches-in-directory-finds-none-for-some-regexp ()
   (should (null (xref-matches-in-directory "zzz" "*" xref-tests-data-dir nil))))