emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master a3c870d: Fix svn tests on Macos


From: Lars Ingebrigtsen
Subject: master a3c870d: Fix svn tests on Macos
Date: Tue, 4 Aug 2020 08:48:46 -0400 (EDT)

branch: master
commit a3c870d7e2426bd401c2de60fa851176cf631f7c
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    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).
---
 test/lisp/vc/vc-tests.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el
index 8e5cc95..01d1965 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"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]