diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2016-03-22 20:37:02 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2016-03-22 20:37:02 +0100 |
| commit | 582962a3a184135047c5809b1172691a1c5f2586 (patch) | |
| tree | d6a14f30725943bdb8eb3c5b6839a705cee090c2 /test/lisp | |
| parent | c4f4e643daac8438722885f6291f9fc700196faa (diff) | |
; Remove unwanted merge from emacs-25
Diffstat (limited to 'test/lisp')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index d9563ec917..a29e42e734 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/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 @@ -2046,10 +2038,9 @@ Use the `ls' command." (file-name-coding-system 'utf-8)) (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 () |