summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2015-07-23 21:49:40 +0200
committerMichael Albinus <michael.albinus@gmx.de>2015-07-23 21:49:40 +0200
commit8e03731cb9083330939b2c9b2d3318f32e93e41d (patch)
tree6d54b01522b80fb94b86ef3fab8a519944da7afe
parent8242c3aa36e606498afe21c22a3369ae0e82b13d (diff)
Fix some Tramp problems with HP-UX
* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell): Add "tab0" to stty call. * test/automated/tramp-tests.el (tramp-persistency-file-name): Set to nil. (tramp--test-hpux-p): New defun. (tramp--test-utf8): Use it.
-rw-r--r--lisp/net/tramp-sh.el4
-rw-r--r--test/automated/tramp-tests.el17
2 files changed, 16 insertions, 5 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index fbb5d8c634..670ff4b0cf 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4025,9 +4025,9 @@ process to set up. VEC specifies the connection."
(let ((tramp-end-of-output tramp-initial-end-of-output))
(tramp-open-shell vec (tramp-get-method-parameter vec 'tramp-remote-shell))
- ;; Disable echo.
+ ;; Disable tab and echo expansion.
(tramp-message vec 5 "Setting up remote shell environment")
- (tramp-send-command vec "stty -inlcr -echo kill '^U' erase '^H'" t)
+ (tramp-send-command vec "stty tab0 -inlcr -echo kill '^U' erase '^H'" t)
;; Check whether the echo has really been disabled. Some
;; implementations, like busybox of embedded GNU/Linux, don't
;; support disabling.
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 24cfa247c9..6972373bdf 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -49,6 +49,7 @@
(declare-function tramp-get-remote-stat "tramp-sh")
(declare-function tramp-get-remote-perl "tramp-sh")
(defvar tramp-copy-size-limit)
+(defvar tramp-persistency-file-name)
(defvar tramp-remote-process-environment)
;; There is no default value on w32 systems, which could work out of the box.
@@ -70,7 +71,8 @@
(setq password-cache-expiry nil
tramp-verbose 0
tramp-copy-size-limit nil
- tramp-message-show-message nil)
+ tramp-message-show-message nil
+ tramp-persistency-file-name nil)
;; This shall happen on hydra only.
(when (getenv "NIX_STORE")
@@ -1690,6 +1692,14 @@ This requires restrictions of file name syntax."
(or (eq system-type 'windows-nt)
(tramp-smb-file-name-p tramp-test-temporary-file-directory)))
+(defun tramp--test-hpux-p ()
+ "Check, whether the remote host runs HP-UX.
+Several special characters do not work properly there."
+ ;; We must refill the cache.
+ (with-parsed-tramp-file-name
+ (file-truename tramp-test-temporary-file-directory) nil
+ (string-match "^HP-UX" (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
@@ -1939,8 +1949,9 @@ Use the `ls' command."
(coding-system-for-write 'utf-8)
(file-name-coding-system 'utf-8))
(tramp--test-check-files
- "Γυρίστε το Γαλαξία με Ώτο Στοπ"
- "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت"
+ (unless (tramp--test-hpux-p) "Γυρίστε το Γαλαξία με Ώτο Στοπ")
+ (unless (tramp--test-hpux-p)
+ "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت")
"银河系漫游指南系列"
"Автостопом по гала́ктике")))