]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix svn tests on Macos
authorLars Ingebrigtsen <larsi@gnus.org>
Tue, 4 Aug 2020 12:48:33 +0000 (14:48 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Tue, 4 Aug 2020 12:48:38 +0000 (14:48 +0200)
* 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).

test/lisp/vc/vc-tests.el

index 8e5cc95ec94e82b4231aabf010423daf7cd95138..01d196565dd93900488af509b5350b71b40dd228 100644 (file)
@@ -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"))