From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Barry OReilly Newsgroups: gmane.emacs.bugs 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 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 X-Trace: ger.gmane.org 1374585252 15468 80.91.229.3 (23 Jul 2013 13:14:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Jul 2013 13:14:12 +0000 (UTC) To: 14937@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jul 23 15:14:14 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1V1cPt-0006wL-VE for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Jul 2013 15:14:14 +0200 Original-Received: from localhost ([::1]:35335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1cPt-0004uR-Gt for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Jul 2013 09:14:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1cPo-0004u2-0W for bug-gnu-emacs@gnu.org; Tue, 23 Jul 2013 09:14:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1cPj-0002mJ-As for bug-gnu-emacs@gnu.org; Tue, 23 Jul 2013 09:14:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:50241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1cPj-0002mF-6Q for bug-gnu-emacs@gnu.org; Tue, 23 Jul 2013 09:14:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1V1cPi-0006Ld-JF for bug-gnu-emacs@gnu.org; Tue, 23 Jul 2013 09:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Barry OReilly Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Jul 2013 13:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 14937 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.137458522724349 (code B ref -1); Tue, 23 Jul 2013 13:14:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 23 Jul 2013 13:13:47 +0000 Original-Received: from localhost ([127.0.0.1]:44555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1V1cPR-0006KZ-0z for submit@debbugs.gnu.org; Tue, 23 Jul 2013 09:13:46 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:56439) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1V1cPN-0006KC-07 for submit@debbugs.gnu.org; Tue, 23 Jul 2013 09:13:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1cPF-0002dZ-Pb for submit@debbugs.gnu.org; Tue, 23 Jul 2013 09:13:35 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:34560) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1cPF-0002dU-LG for submit@debbugs.gnu.org; Tue, 23 Jul 2013 09:13:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1cP9-0004ir-Hl for bug-gnu-emacs@gnu.org; Tue, 23 Jul 2013 09:13:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1cP7-0002ZP-KT for bug-gnu-emacs@gnu.org; Tue, 23 Jul 2013 09:13:27 -0400 Original-Received: from mail-oa0-x234.google.com ([2607:f8b0:4003:c02::234]:46949) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1cP7-0002Z5-Ed for bug-gnu-emacs@gnu.org; Tue, 23 Jul 2013 09:13:25 -0400 Original-Received: by mail-oa0-f52.google.com with SMTP id g12so10991425oah.39 for ; Tue, 23 Jul 2013 06:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=5wjw5p90Et9ovEuW+gdVdnsHk9W3NGeRiulnHF0E5q8=; b=VNvpMFQXMg2OxmvqKPV8sGnt6TXhgpNT5diGPl7xR+wfXpeJG9AAxprMzsMKols1pB XkDEnROSlx/HTSLbW6sKfJjrEjMNWDXf5Do/ZK+b3kjt5pUqe6DN9a+3Wy6qc95ft13r JaWfecNEBElr7jUBuWw1VX0lCgiTSTzMhq9p9R9jxgzFnq+XvaoFGprgMifj4azGoOBX tTdo5ghuSQsERyXcD5amGJln5XbU1P+WNbhNK0385roISY780FdX+/wtbmP66R2H2MA6 RC/SAbqjyGYtU7PjkkZcLkxtfEZQ9PNJ2XDLnt7uXG1iuUpDqnEwaoD6ZcUOl0nzXs16 Bzag== X-Received: by 10.182.165.133 with SMTP id yy5mr25021488obb.89.1374585204674; Tue, 23 Jul 2013 06:13:24 -0700 (PDT) Original-Received: by 10.76.122.79 with HTTP; Tue, 23 Jul 2013 06:13:24 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:76593 Archived-At: 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))