summaryrefslogtreecommitdiff
path: root/test/lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-08-04 14:48:33 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-08-04 14:48:38 +0200
commita3c870d7e2426bd401c2de60fa851176cf631f7c (patch)
tree4fe389af7f702d990e4b0a1be0c4e9cde4966a13 /test/lisp
parent934585a6498428f60d709e2ec0379f4667554c6b (diff)
downloademacs-a3c870d7e2426bd401c2de60fa851176cf631f7c.tar.gz
emacs-a3c870d7e2426bd401c2de60fa851176cf631f7c.tar.bz2
emacs-a3c870d7e2426bd401c2de60fa851176cf631f7c.zip
Fix svn tests on Macos
* test/lisp/vc/vc-tests.el (vc-test--svn-enabled): Macos machines may have a dummy svn program that helpfully just outputs "There's no svn program here", so also test for the svnadmin program (bug#42536).
Diffstat (limited to 'test/lisp')
-rw-r--r--test/lisp/vc/vc-tests.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el
index 8e5cc95ec94..01d196565dd 100644
--- a/test/lisp/vc/vc-tests.el
+++ b/test/lisp/vc/vc-tests.el
@@ -554,7 +554,8 @@ This checks also `vc-backend' and `vc-responsible-backend'."
(defvar vc-svn-program)
(defun vc-test--svn-enabled ()
- (executable-find vc-svn-program))
+ (and (executable-find "svnadmin")
+ (executable-find vc-svn-program)))
(defun vc-test--sccs-enabled ()
(executable-find "sccs"))