emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master e73e7a8: Revert commit 1f44a776729adf9c6468a76f8310616fde62eeaa f


From: Philipp Stephani
Subject: master e73e7a8: Revert commit 1f44a776729adf9c6468a76f8310616fde62eeaa for XRef.
Date: Sun, 25 Oct 2020 06:25:13 -0400 (EDT)

branch: master
commit e73e7a8bd6782b24045ea64aa9147bee5f44d65d
Author: Philipp Stephani <phst@google.com>
Commit: Philipp Stephani <phst@google.com>

    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’
---
 test/lisp/progmodes/xref-tests.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/lisp/progmodes/xref-tests.el 
b/test/lisp/progmodes/xref-tests.el
index 060c9cb..038f9d0 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))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]