Revert commit 1f44a77672
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’.
This commit is contained in:
parent
10ea719abc
commit
2e090da775
1 changed files with 9 additions and 2 deletions
|
@ -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))
|
||||
|
|
Loading…
Add table
Reference in a new issue