From: Glenn Morris <rgm@gnu.org>
Date: Tue, 5 Sep 2017 22:55:49 +0000 (-0400)
Subject: Minor emacsclient-tests simplification
X-Git-Tag: emacs-26.0.90~247
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a2cf4d49f1548b438ce7dd1e99bb2bb8e4e99092;p=emacs.git

Minor emacsclient-tests simplification

* test/lib-src/emacsclient-tests.el (emacsclient-test-emacs):
Simplify.  Also work when running installed.
---

diff --git a/test/lib-src/emacsclient-tests.el b/test/lib-src/emacsclient-tests.el
index 61ead4f0f32..3a2396f7817 100644
--- a/test/lib-src/emacsclient-tests.el
+++ b/test/lib-src/emacsclient-tests.el
@@ -26,12 +26,10 @@
 (require 'ert)
 
 (defconst emacsclient-test-emacs
-  (expand-file-name "emacsclient" (concat
-                                   (file-name-directory
-                                    (directory-file-name
-                                     (file-name-directory invocation-directory)))
-                                   "lib-src"))
-  "Path to emacsclient binary in build tree.")
+  (if installation-directory
+      (expand-file-name "lib-src/emacsclient" installation-directory)
+    "emacsclient")
+  "The emacsclient binary to test.")
 
 (defun emacsclient-test-call-emacsclient ()
   "Run emacsclient."