Mark the vc-bzr-test-faulty-bzr-autoloads as unstable for now

Add 0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch to
disable the test for now.  See the patch header for a description of
the error.

diff --cc debian/.git-dpm
index 3c79b2386ff749e068b9aee6c9e075e500171986,0000000000000000000000000000000000000000..3bb0e6312b87385c2246489eeac727711e7b7a7a
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- d13836843d9f34fa308d83bf3dd09ee9d00e142d
- d13836843d9f34fa308d83bf3dd09ee9d00e142d
 +# see git-dpm(1) from git-dpm package
++884f1267851cd7de56d81b69cac10041988cc007
++884f1267851cd7de56d81b69cac10041988cc007
 +511a2cebd6df0f71ec24b5939564fb58726ead84
 +511a2cebd6df0f71ec24b5939564fb58726ead84
 +emacs_26.1+1.orig.tar.xz
 +9318da32923e8a4a17ee23113302ff509c0d4056
 +24259708

diff --cc debian/patches/0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7f41d94c035a49f8fa2473f0591f85764d0de298
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
@@@ -1,0 -1,0 +1,74 @@@
++From 884f1267851cd7de56d81b69cac10041988cc007 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Sun, 16 Dec 2018 17:13:36 -0600
++Subject: Mark vc-bzr-test-fauilt-bzr-autoloads as unstable for now
++
++Currently the test fails like this:
++
++  Running 3 tests (2018-12-17 12:17:43-0600)
++     passed  1/3  vc-bzr-test-bug9726
++  Mark set
++  Press C-c C-c when you are done editing.
++  Enter a change comment.  Type C-c C-c when done
++     passed  2/3  vc-bzr-test-bug9781
++  Falling back on "slow" status detection ((file-missing "Opening input file" "No such file or directory" "/tmp/vc-bzr-testVlgmsb/bzr/.bzr/checkout/dirstate"))
++  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
++  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''
++
++  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
++  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''
++
++  Test vc-bzr-test-faulty-bzr-autoloads backtrace:
++    logand(nil 128)
++    vc-mode-line("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el" Bzr)
++    vc-refresh-state()
++    run-hooks(find-file-hook)
++    after-find-file(t t)
++    find-file-noselect-1(#<buffer loaddefs.el> "/tmp/vc-bzr-testVlgmsb/b
++    find-file-noselect("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el")
++    autoload-find-generated-file()
++    update-directory-autoloads("/tmp/vc-bzr-testVlgmsb/bzr/")
++    (progn (update-directory-autoloads default-directory) t)
++    (setq value-35 (progn (update-directory-autoloads default-directory)
++    (unwind-protect (setq value-35 (progn (update-directory-autoloads de
++    (if (unwind-protect (setq value-35 (progn (update-directory-autoload
++    (let (form-description-36) (if (unwind-protect (setq value-35 (progn
++    (let ((value-35 (gensym "ert-form-evaluation-aborted-"))) (let (form
++    (progn (call-process vc-bzr-program nil nil nil "init") (let ((temp-
++    (unwind-protect (progn (call-process vc-bzr-program nil nil nil "ini
++    (let* ((homedir (make-temp-file "vc-bzr-test" t)) (bzrdir (expand-fi
++    (lambda nil (let* ((fn-30 (function executable-find)) (args-31 (cond
++    ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
++    ert-run-test(#s(ert-test :name vc-bzr-test-faulty-bzr-autoloads :doc
++    ert-run-or-rerun-test(#s(ert--stats :selector (not (or (tag :expensi
++    ert-run-tests((not (or (tag :expensive-test) (tag :unstable))) #f(co
++    ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable)))
++    ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
++    eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
++    command-line-1(("-L" ":/home/locke/tmp/main-26.1/debian/build-src/te
++    command-line()
++    normal-top-level()
++  Test vc-bzr-test-faulty-bzr-autoloads condition:
++      (wrong-type-argument number-or-marker-p nil)
++     FAILED  3/3  vc-bzr-test-faulty-bzr-autoloads
++
++  Ran 3 tests, 2 results as expected, 1 unexpected (2018-12-17 12:17:46-0600)
++
++  1 unexpected results:
++     FAILED  vc-bzr-test-faulty-bzr-autoloads
++---
++ test/lisp/vc/vc-bzr-tests.el | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
++index 6b96f3b928d..a7c81025f45 100644
++--- a/test/lisp/vc/vc-bzr-tests.el
+++++ b/test/lisp/vc/vc-bzr-tests.el
++@@ -111,6 +111,7 @@
++ ;; https://lists.gnu.org/r/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."
+++  :tags '(:unstable)
++   (skip-unless (executable-find vc-bzr-program))
++   (let* ((homedir (make-temp-file "vc-bzr-test" t))
++          (bzrdir (expand-file-name "bzr" homedir))

diff --cc debian/patches/series
index aab53542d348054df6a933325529840cc75fac3f,0000000000000000000000000000000000000000..d05c4b05bf8d48bb8df61d25ef39e19e12f13f8a
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,9 -1,0 +1,10 @@@
 +0001-Prefer-usr-share-info-emacs.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 +0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch
 +0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch
++0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch