diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2016-03-31 11:45:45 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2016-03-31 11:45:45 +0200 |
| commit | df441b362c25c4ad59ea3d83137328d0d4098eaf (patch) | |
| tree | 431b2dd5a66cf2e71d73a6d3549342b21228cbcc /test | |
| parent | 22443312188ff097b69d9ff4b87c2b4f7bbbc263 (diff) | |
| download | emacs-df441b362c25c4ad59ea3d83137328d0d4098eaf.tar.gz | |
Fix OS X specific settings in tramp-tests
* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Use it.
* lisp/net/tramp.el (tramp-get-local-locale): New defun.
* test/automated/tramp-tests.el (tramp--test-darwin-p): Remove.
(tramp--test-utf8): Improve settings of coding systems.
Do not use `tramp--test-darwin-p' anymore. (Bug#22145)
Diffstat (limited to 'test')
| -rw-r--r-- | test/automated/tramp-tests.el | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index d9563ec9174..a12ee387576 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1785,14 +1785,6 @@ Several special characters do not work properly there." (file-truename tramp-test-temporary-file-directory) nil (string-match "^HP-UX" (tramp-get-connection-property v "uname" "")))) -(defun tramp--test-darwin-p () - "Check, whether the remote host runs Mac OS X. -Several special characters do not work properly there." - ;; We must refill the cache. `file-truename' does it. - (with-parsed-tramp-file-name - (file-truename tramp-test-temporary-file-directory) nil - (string-match "^Darwin" (tramp-get-connection-property v "uname" "")))) - (defun tramp--test-check-files (&rest files) "Run a simple but comprehensive test over every file in FILES." ;; We must use `file-truename' for the temporary directory, because @@ -2041,15 +2033,17 @@ Use the `ls' command." (defun tramp--test-utf8 () "Perform the test in `tramp-test32-utf8*'." - (let ((coding-system-for-read 'utf-8) - (coding-system-for-write 'utf-8) - (file-name-coding-system 'utf-8)) + (let* ((utf8 (if (and (eq system-type 'darwin) + (memq 'utf-8-hfs (coding-system-list))) + 'utf-8-hfs 'utf-8)) + (coding-system-for-read utf8) + (coding-system-for-write utf8) + (file-name-coding-system utf8)) (tramp--test-check-files (unless (tramp--test-hpux-p) "Γυρίστε το Γαλαξία με Ώτο Στοπ") - (unless (or (tramp--test-hpux-p) (tramp--test-darwin-p)) + (unless (tramp--test-hpux-p) "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت") - (unless (tramp--test-darwin-p) - "银河系漫游指南系列") + "银河系漫游指南系列" "Автостопом по гала́ктике"))) (ert-deftest tramp-test32-utf8 () |