diff options
| author | Glenn Morris | 2018-12-20 07:51:16 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-12-20 07:51:16 -0800 |
| commit | 81cac3e9ddb99addcbf5dbc8b8a58b2042db6fa6 (patch) | |
| tree | cb57b4e992afdb05d68be419712eea8bb6e2a436 /test/lisp/net | |
| parent | 46e22ae92660a83f6523f6e157b087f0c8b4ace3 (diff) | |
| parent | 4c6c327d0c66a21416ed1b5e9738b7dd13e739f2 (diff) | |
| download | emacs-81cac3e9ddb99addcbf5dbc8b8a58b2042db6fa6.tar.gz emacs-81cac3e9ddb99addcbf5dbc8b8a58b2042db6fa6.zip | |
Merge from origin/emacs-26
4c6c327 Restrict downcasing in elisp xref tests (bug#25534)
ab8ed41 Avoid test failures if directory name looks like a regexp
Diffstat (limited to 'test/lisp/net')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 4a74e8b78df..8c67687e32c 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -5352,8 +5352,9 @@ process sentinels. They shall not disturb each other." | |||
| 5352 | (string-match | 5352 | (string-match |
| 5353 | (format | 5353 | (format |
| 5354 | "Loading %s" | 5354 | "Loading %s" |
| 5355 | (expand-file-name | 5355 | (regexp-quote |
| 5356 | "tramp-cmds" (file-name-directory (locate-library "tramp")))) | 5356 | (expand-file-name |
| 5357 | "tramp-cmds" (file-name-directory (locate-library "tramp"))))) | ||
| 5357 | (shell-command-to-string | 5358 | (shell-command-to-string |
| 5358 | (format | 5359 | (format |
| 5359 | "%s -batch -Q -L %s -l tramp-sh --eval %s" | 5360 | "%s -batch -Q -L %s -l tramp-sh --eval %s" |