[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2e090da: Revert commit 1f44a776729adf9c6468a76f8310616fde62eeaa f
From: |
Philipp Stephani |
Subject: |
master 2e090da: Revert commit 1f44a776729adf9c6468a76f8310616fde62eeaa for Flymake. |
Date: |
Sun, 25 Oct 2020 06:14:04 -0400 (EDT) |
branch: master
commit 2e090da77591c1e0f59815a34e2a4059f418c776
Author: Philipp Stephani <phst@google.com>
Commit: Philipp Stephani <phst@google.com>
Revert commit 1f44a776729adf9c6468a76f8310616fde62eeaa for Flymake.
Flymake supports all Emacs versions back to 26.1, so it can’t use
‘ert-resource-file’.
* test/lisp/progmodes/flymake-tests.el (flymake-tests-data-directory):
Recreate.
(flymake-tests--call-with-fixture): Stop using ‘ert-resource-file’.
---
test/lisp/progmodes/flymake-tests.el | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/test/lisp/progmodes/flymake-tests.el
b/test/lisp/progmodes/flymake-tests.el
index c62a2db..df72b52 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -23,10 +23,17 @@
;;; Code:
(require 'ert)
-(require 'ert-x)
(require 'flymake)
(eval-when-compile (require 'subr-x)) ; string-trim
+(defvar flymake-tests-data-directory
+ (expand-file-name "lisp/progmodes/flymake-resources"
+ (or (getenv "EMACS_TEST_DIRECTORY")
+ (expand-file-name "../../.."
+ (or load-file-name
+ buffer-file-name))))
+ "Directory containing flymake test data.")
+
;;
;;
@@ -56,7 +63,7 @@
"Call FN after flymake setup in FILE, using `flymake-proc`.
SEVERITY-PREDICATE is used to setup
`flymake-proc-diagnostic-type-pred'"
- (let* ((file (ert-resource-file file))
+ (let* ((file (expand-file-name file flymake-tests-data-directory))
(visiting (find-buffer-visiting file))
(buffer (or visiting (find-file-noselect file)))
(process-environment (cons "LC_ALL=C" process-environment))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 2e090da: Revert commit 1f44a776729adf9c6468a76f8310616fde62eeaa for Flymake.,
Philipp Stephani <=