aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Browning2018-12-18 15:34:01 -0500
committerGlenn Morris2018-12-18 15:34:01 -0500
commitab8ed418596da550c79913ccc42e8c3842bca315 (patch)
tree4398c251977687ecd526c18c89c67eda8b0e69e0
parent80e98568aa41b106ebc9bbec9a44fe442a93803d (diff)
downloademacs-ab8ed418596da550c79913ccc42e8c3842bca315.tar.gz
emacs-ab8ed418596da550c79913ccc42e8c3842bca315.zip
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/...".
-rw-r--r--test/lisp/ibuffer-tests.el4
-rw-r--r--test/lisp/net/tramp-tests.el5
2 files changed, 5 insertions, 4 deletions
diff --git a/test/lisp/ibuffer-tests.el b/test/lisp/ibuffer-tests.el
index ff5162fefa5..c1d9ed9fc3b 100644
--- a/test/lisp/ibuffer-tests.el
+++ b/test/lisp/ibuffer-tests.el
@@ -312,8 +312,8 @@
312 (funcall create-non-file-buffer "ibuf-test-3.b" :size 50 312 (funcall create-non-file-buffer "ibuf-test-3.b" :size 50
313 :mode #'text-mode 313 :mode #'text-mode
314 :include-content "...but a multitude of drops?\n")) 314 :include-content "...but a multitude of drops?\n"))
315 (dirA (with-current-buffer bufA default-directory)) 315 (dirA (regexp-quote (with-current-buffer bufA default-directory)))
316 (dirB (with-current-buffer bufB default-directory))) 316 (dirB (regexp-quote (with-current-buffer bufB default-directory))))
317 (should (ibuffer-included-in-filters-p 317 (should (ibuffer-included-in-filters-p
318 bufA '((basename . "ibuf-test-3")))) 318 bufA '((basename . "ibuf-test-3"))))
319 (should (ibuffer-included-in-filters-p 319 (should (ibuffer-included-in-filters-p
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 8f810818af1..19edec214f7 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -4773,8 +4773,9 @@ process sentinels. They shall not disturb each other."
4773 (string-match 4773 (string-match
4774 (format 4774 (format
4775 "Loading %s" 4775 "Loading %s"
4776 (expand-file-name 4776 (regexp-quote
4777 "tramp-cmds" (file-name-directory (locate-library "tramp")))) 4777 (expand-file-name
4778 "tramp-cmds" (file-name-directory (locate-library "tramp")))))
4778 (shell-command-to-string 4779 (shell-command-to-string
4779 (format 4780 (format
4780 "%s -batch -Q -L %s -l tramp-sh --eval %s" 4781 "%s -batch -Q -L %s -l tramp-sh --eval %s"