tramp-test42-remote-load-path: regexp-quote directory

Add 0011-tramp-test42-remote-load-path-regexp-quote-directory.patch to
fix the problem.  Otherwise the test may fail for some paths like
those seen in an sbuild chroot,
e.g. build/emacs-i87jK3/emacs-26.1+1/...

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

diff --cc debian/patches/0011-tramp-test42-remote-load-path-regexp-quote-directory.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0a0b6b826dd9542ff709197a7aad726f09e4deb7
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0011-tramp-test42-remote-load-path-regexp-quote-directory.patch
@@@ -1,0 -1,0 +1,27 @@@
++From ef1a7ddf208a19da9d2dc265b8027fc4f589fccf Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 17 Dec 2018 15:09:12 -0600
++Subject: tramp-test42-remote-load-path: regexp-quote directory
++
++Otherwise the test may fail for some paths like those seen in a Debian
++sbuild chroot, e.g. build/emacs-i87jK3/emacs-26.1+1/...
++---
++ test/lisp/net/tramp-tests.el | 5 +++--
++ 1 file changed, 3 insertions(+), 2 deletions(-)
++
++diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
++index 996a31d375f..60f2aaf034b 100644
++--- a/test/lisp/net/tramp-tests.el
+++++ b/test/lisp/net/tramp-tests.el
++@@ -4702,8 +4702,9 @@ tramp--test-timeout-handler
++      (string-match
++       (format
++        "Loading %s"
++-       (expand-file-name
++-     "tramp-cmds" (file-name-directory (locate-library "tramp"))))
+++       (regexp-quote
+++        (expand-file-name
+++         "tramp-cmds" (file-name-directory (locate-library "tramp")))))
++       (shell-command-to-string
++        (format
++      "%s -batch -Q -L %s -l tramp-sh --eval %s"

diff --cc debian/patches/series
index d05c4b05bf8d48bb8df61d25ef39e19e12f13f8a,0000000000000000000000000000000000000000..f141919faa8371d19100d63903f975006c464915
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,10 -1,0 +1,11 @@@
 +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
++0011-tramp-test42-remote-load-path-regexp-quote-directory.patch