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)

diff --git a/test/lib-src/emacsclient-tests.el b/test/lib-src/emacsclient-tests.el
index 54dd41c5a6991a0b9105db815beca755457dfa76..d65f79876db427b0cc858be034be8471533c4001 100644 (file)
--- 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 444c2f99fa75071aa30c9cdb6da6fbf4e5e33264..aa124f099c70514d1672fd59716a723ed68e1572 100644 (file)
--- 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)