From: Barry OReilly <gundaetiapo@gmail.com>
To: 14937@debbugs.gnu.org
Subject: bug#14937: vc-bzr.el test fails when bzr installed but using Git checkout of Emacs
Date: Tue, 23 Jul 2013 09:13:24 -0400 [thread overview]
Message-ID: <CAFM41H2SCwiCqb4VJKeW4W4cMpNgOerB+SktBQxfa9YBJPbKDA@mail.gmail.com> (raw)
Patch follows. May I install to trunk?
diff --git a/test/automated/vc-bzr.el b/test/automated/vc-bzr.el
index 2776435..09010aa 100644
--- a/test/automated/vc-bzr.el
+++ b/test/automated/vc-bzr.el
@@ -31,10 +31,14 @@
;; bzr installed. We could just put everything inside an IF
;; statement, but it would be nice if ERT had a "skipped" facility (?).
+(defun vc-bzr-test-p ()
+ (and (executable-find vc-bzr-program)
+ (file-accessible-directory-p ".bzr")))
+
(ert-deftest vc-bzr-test-bug9726 ()
"Test for http://debbugs.gnu.org/9726 ."
- :expected-result (if (executable-find vc-bzr-program) :passed :failed)
- (should (executable-find vc-bzr-program))
+ :expected-result (if (vc-bzr-test-p) :passed :failed)
+ (should (vc-bzr-test-p))
(let* ((tempdir (make-temp-file "vc-bzr-test" t))
(ignored-dir (expand-file-name "ignored-dir" tempdir))
(default-directory (file-name-as-directory tempdir)))
@@ -64,8 +68,8 @@
;; Not specific to bzr.
(ert-deftest vc-bzr-test-bug9781 ()
"Test for http://debbugs.gnu.org/9781 ."
- :expected-result (if (executable-find vc-bzr-program) :passed :failed)
- (should (executable-find vc-bzr-program))
+ :expected-result (if (vc-bzr-test-p) :passed :failed)
+ (should (vc-bzr-test-p))
(let* ((tempdir (make-temp-file "vc-bzr-test" t))
(subdir (expand-file-name "subdir" tempdir))
(file (expand-file-name "file" tempdir))
@@ -101,8 +105,8 @@
;; http://lists.gnu.org/archive/html/help-gnu-emacs/2012-04/msg00145.html
(ert-deftest vc-bzr-test-faulty-bzr-autoloads ()
"Test we can generate autoloads in a bzr directory when bzr is faulty."
- :expected-result (if (executable-find vc-bzr-program) :passed :failed)
- (should (executable-find vc-bzr-program))
+ :expected-result (if (vc-bzr-test-p) :passed :failed)
+ (should (vc-bzr-test-p))
(let* ((tempdir (make-temp-file "vc-bzr-test" t))
(file (expand-file-name "foo.el" tempdir))
(default-directory (file-name-as-directory tempdir))
next reply other threads:[~2013-07-23 13:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-23 13:13 Barry OReilly [this message]
2013-07-23 16:04 ` bug#14937: vc-bzr.el test fails when bzr installed but using Git checkout of Emacs Glenn Morris
2013-07-23 16:49 ` Barry OReilly
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAFM41H2SCwiCqb4VJKeW4W4cMpNgOerB+SktBQxfa9YBJPbKDA@mail.gmail.com \
--to=gundaetiapo@gmail.com \
--cc=14937@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.