summaryrefslogtreecommitdiff
path: root/test/lib-src/emacsclient-tests.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2017-09-05 18:55:49 -0400
committerGlenn Morris <rgm@gnu.org>2017-09-05 18:55:49 -0400
commita2cf4d49f1548b438ce7dd1e99bb2bb8e4e99092 (patch)
treeef6dfb75e1b5b23069782b689139b42cddf5acbf /test/lib-src/emacsclient-tests.el
parent732fdeb341e3b53568548254ef37c7413c4343bb (diff)
downloademacs-a2cf4d49f1548b438ce7dd1e99bb2bb8e4e99092.tar.gz
Minor emacsclient-tests simplification
* test/lib-src/emacsclient-tests.el (emacsclient-test-emacs): Simplify. Also work when running installed.
Diffstat (limited to 'test/lib-src/emacsclient-tests.el')
-rw-r--r--test/lib-src/emacsclient-tests.el10
1 files changed, 4 insertions, 6 deletions
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."