From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 7 Sep 2020 16:19:40 +0000 (+0200)
Subject: Fix test failure in custom--test-theme-variables
X-Git-Tag: emacs-28.0.90~6197
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5312e56d43c82ab5e1c3fe407e24bdf1014e4313;p=emacs.git

Fix test failure in custom--test-theme-variables

* test/lisp/custom-tests.el (custom--test-theme-variables): "make
check" in the main directory didn't work because the path was
wrong.  Use EMACS_TEST_DIRECTORY to find the test directory
instead.
---

diff --git a/test/lisp/custom-tests.el b/test/lisp/custom-tests.el
index 7853c84bb69..cabbf861f14 100644
--- a/test/lisp/custom-tests.el
+++ b/test/lisp/custom-tests.el
@@ -101,7 +101,9 @@
   "Test variables setting with enabling / disabling a custom theme."
   ;; We load custom-resources/custom--test-theme.el.
   (let ((custom-theme-load-path
-         `(,(expand-file-name "custom-resources" (file-name-directory #$)))))
+         `(,(expand-file-name
+	     "custom-resources"
+	     (expand-file-name "lisp" (getenv "EMACS_TEST_DIRECTORY"))))))
     (load-theme 'custom--test 'no-confirm 'no-enable)
     ;; The variables have still their initial values.
     (should (equal custom--test-user-option 'foo))