From 83a09ab03e1fb692f2994cf116319e89f7754a1f Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 25 Feb 2025 19:12:37 +0800 Subject: [PATCH] Fix a number of ERT tests for execution on Android * test/lib-src/emacsclient-tests.el (emacsclient-test-emacs): * test/lisp/server-tests.el (server-tests/emacsclient): Don't assume emacsclient is installed as emacsclient. (cherry picked from commit 7da9d2d7464496ff684d28b0d37f286ddae70d65) --- test/lib-src/emacsclient-tests.el | 2 +- test/lisp/server-tests.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/lib-src/emacsclient-tests.el b/test/lib-src/emacsclient-tests.el index 54dd41c5a69..d65f79876db 100644 --- a/test/lib-src/emacsclient-tests.el +++ b/test/lib-src/emacsclient-tests.el @@ -30,7 +30,7 @@ (defconst emacsclient-test-emacs (if installation-directory (expand-file-name "lib-src/emacsclient" installation-directory) - "emacsclient") + emacsclient-program-name) "The emacsclient binary to test.") (defmacro emacsclient-test-call-emacsclient (editor) diff --git a/test/lisp/server-tests.el b/test/lisp/server-tests.el index 444c2f99fa7..aa124f099c7 100644 --- a/test/lisp/server-tests.el +++ b/test/lisp/server-tests.el @@ -44,7 +44,7 @@ like that, we just skip the test.") (defconst server-tests/emacsclient (if installation-directory (expand-file-name "lib-src/emacsclient" installation-directory) - "emacsclient") + emacsclient-program-name) "The emacsclient binary to test.") (defmacro server-tests/wait-until (form) -- 2.39.5