From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 4 Aug 2020 12:48:33 +0000 (+0200)
Subject: Fix svn tests on Macos
X-Git-Tag: emacs-28.0.90~6835
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a3c870d7e2426bd401c2de60fa851176cf631f7c;p=emacs.git

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).
---

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"))