Commit ab8ed418 authored by Rob Browning's avatar Rob Browning Committed by Glenn Morris

Avoid test failures if directory name looks like a regexp

Taken from <https://sources.debian.org/patches/emacs/1:26.1+1-1>
* test/lisp/ibuffer-tests.el (ibuffer-filter-inclusion-3):
* test/lisp/net/tramp-tests.el (tramp-test42-remote-load-path):
Regexp-quote file names to avoid failures with directory names
of the form "build/emacs-i87jK3/emacs-26.1+1/...".
parent 80e98568
Pipeline #321 failed with stage
in 3 seconds
......@@ -312,8 +312,8 @@
(funcall create-non-file-buffer "ibuf-test-3.b" :size 50
:mode #'text-mode
:include-content "...but a multitude of drops?\n"))
(dirA (with-current-buffer bufA default-directory))
(dirB (with-current-buffer bufB default-directory)))
(dirA (regexp-quote (with-current-buffer bufA default-directory)))
(dirB (regexp-quote (with-current-buffer bufB default-directory))))
(should (ibuffer-included-in-filters-p
bufA '((basename . "ibuf-test-3"))))
(should (ibuffer-included-in-filters-p
......
......@@ -4773,8 +4773,9 @@ process sentinels. They shall not disturb each other."
(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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment