diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2015-12-06 18:55:50 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2015-12-06 18:55:50 +0100 |
| commit | 0e574ea35ea75fa91a38718966ffe6c17b8e93d8 (patch) | |
| tree | e0c14ac0d60f1d0e731b93cb4dd70249a1ef58b6 /test | |
| parent | cca5629f7856d88de940da942acbf5ca7f95a944 (diff) | |
| download | emacs-0e574ea35ea75fa91a38718966ffe6c17b8e93d8.tar.gz | |
Fix minor Tramp problems found on BSD
* lisp/net/tramp-sh.el (tramp-perl-file-truename): Do not append
trailing slash. Quote apostrophes.
(tramp-sh-handle-file-truename): Do not append trailing slash in
the "ls" case.
(tramp-get-ls-command-with-w-option): New defun.
(tramp-do-file-attributes-with-ls)
(tramp-do-directory-files-and-attributes-with-stat): Use it.
* test/automated/tramp-tests.el
(tramp-test31-special-characters-with-perl)
(tramp-test31-special-characters-with-ls)
(tramp-test32-utf8-with-perl, tramp-test32-utf8-with-ls):
Suppress also readlink.
Diffstat (limited to 'test')
| -rw-r--r-- | test/automated/tramp-tests.el | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index c5cab7d5991..8a1743cd200 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1987,7 +1987,10 @@ Use the `perl' command." (let ((tramp-connection-properties (append `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) - "stat" nil)) + "stat" nil) + ;; See `tramp-sh-handle-file-truename'. + (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) + "readlink" nil)) tramp-connection-properties))) (tramp--test-special-characters))) @@ -2005,7 +2008,10 @@ Use the `ls' command." `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) "perl" nil) (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) - "stat" nil)) + "stat" nil) + ;; See `tramp-sh-handle-file-truename'. + (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) + "readlink" nil)) tramp-connection-properties))) (tramp--test-special-characters))) @@ -2059,7 +2065,10 @@ Use the `perl' command." (let ((tramp-connection-properties (append `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) - "stat" nil)) + "stat" nil) + ;; See `tramp-sh-handle-file-truename'. + (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) + "readlink" nil)) tramp-connection-properties))) (tramp--test-utf8))) @@ -2077,7 +2086,10 @@ Use the `ls' command." `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) "perl" nil) (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) - "stat" nil)) + "stat" nil) + ;; See `tramp-sh-handle-file-truename'. + (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) + "readlink" nil)) tramp-connection-properties))) (tramp--test-utf8))) |