diff options
| author | Michael Albinus | 2019-09-26 09:33:47 +0200 |
|---|---|---|
| committer | Michael Albinus | 2019-09-26 09:33:47 +0200 |
| commit | 1667bc2fa7ab0dde34313bd149cf886b37707d56 (patch) | |
| tree | bd0317b71511a69ea5f8dda1ae61753081747aa5 | |
| parent | 07367e5b95fe31f3d4e994b42b081075501b9b60 (diff) | |
| download | emacs-1667bc2fa7ab0dde34313bd149cf886b37707d56.tar.gz emacs-1667bc2fa7ab0dde34313bd149cf886b37707d56.zip | |
Avoid errors in tramp-tests with a remote ksh shell
* test/lisp/net/tramp-tests.el (tramp--test-ksh-p): New defun.
(tramp-test41-utf8, tramp-test41-utf8-with-stat)
(tramp-test41-utf8-with-perl, tramp-test41-utf8-with-ls):
Skip, when remote shell is ksh.
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index d7e0a045106..ffaf8ef846b 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -5086,6 +5086,15 @@ Several special characters do not work properly there." | |||
| 5086 | (file-truename tramp-test-temporary-file-directory) nil | 5086 | (file-truename tramp-test-temporary-file-directory) nil |
| 5087 | (string-match "^HP-UX" (tramp-get-connection-property v "uname" "")))) | 5087 | (string-match "^HP-UX" (tramp-get-connection-property v "uname" "")))) |
| 5088 | 5088 | ||
| 5089 | (defun tramp--test-ksh-p () | ||
| 5090 | "Check, whether the remote shell is ksh. | ||
| 5091 | ksh93 makes some strange conversions of non-latin characters into | ||
| 5092 | a $'' syntax." | ||
| 5093 | ;; We must refill the cache. `file-truename' does it. | ||
| 5094 | (with-parsed-tramp-file-name | ||
| 5095 | (file-truename tramp-test-temporary-file-directory) nil | ||
| 5096 | (string-match "ksh$" (tramp-get-connection-property v "remote-shell" "")))) | ||
| 5097 | |||
| 5089 | (defun tramp--test-mock-p () | 5098 | (defun tramp--test-mock-p () |
| 5090 | "Check, whether the mock method is used. | 5099 | "Check, whether the mock method is used. |
| 5091 | This does not support external Emacs calls." | 5100 | This does not support external Emacs calls." |
| @@ -5481,6 +5490,7 @@ Use the `ls' command." | |||
| 5481 | (skip-unless (not (tramp--test-rsync-p))) | 5490 | (skip-unless (not (tramp--test-rsync-p))) |
| 5482 | (skip-unless (not (tramp--test-windows-nt-and-batch))) | 5491 | (skip-unless (not (tramp--test-windows-nt-and-batch))) |
| 5483 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) | 5492 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) |
| 5493 | (skip-unless (not (tramp--test-ksh-p))) | ||
| 5484 | 5494 | ||
| 5485 | (tramp--test-utf8)) | 5495 | (tramp--test-utf8)) |
| 5486 | 5496 | ||
| @@ -5494,6 +5504,7 @@ Use the `stat' command." | |||
| 5494 | (skip-unless (not (tramp--test-rsync-p))) | 5504 | (skip-unless (not (tramp--test-rsync-p))) |
| 5495 | (skip-unless (not (tramp--test-windows-nt-and-batch))) | 5505 | (skip-unless (not (tramp--test-windows-nt-and-batch))) |
| 5496 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) | 5506 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) |
| 5507 | (skip-unless (not (tramp--test-ksh-p))) | ||
| 5497 | (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil | 5508 | (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil |
| 5498 | (skip-unless (tramp-get-remote-stat v))) | 5509 | (skip-unless (tramp-get-remote-stat v))) |
| 5499 | 5510 | ||
| @@ -5514,6 +5525,7 @@ Use the `perl' command." | |||
| 5514 | (skip-unless (not (tramp--test-rsync-p))) | 5525 | (skip-unless (not (tramp--test-rsync-p))) |
| 5515 | (skip-unless (not (tramp--test-windows-nt-and-batch))) | 5526 | (skip-unless (not (tramp--test-windows-nt-and-batch))) |
| 5516 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) | 5527 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) |
| 5528 | (skip-unless (not (tramp--test-ksh-p))) | ||
| 5517 | (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil | 5529 | (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil |
| 5518 | (skip-unless (tramp-get-remote-perl v))) | 5530 | (skip-unless (tramp-get-remote-perl v))) |
| 5519 | 5531 | ||
| @@ -5537,6 +5549,7 @@ Use the `ls' command." | |||
| 5537 | (skip-unless (not (tramp--test-rsync-p))) | 5549 | (skip-unless (not (tramp--test-rsync-p))) |
| 5538 | (skip-unless (not (tramp--test-windows-nt-and-batch))) | 5550 | (skip-unless (not (tramp--test-windows-nt-and-batch))) |
| 5539 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) | 5551 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) |
| 5552 | (skip-unless (not (tramp--test-ksh-p))) | ||
| 5540 | 5553 | ||
| 5541 | (let ((tramp-connection-properties | 5554 | (let ((tramp-connection-properties |
| 5542 | (append | 5555 | (append |