aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2015-07-23 21:49:40 +0200
committerMichael Albinus2015-07-23 21:49:40 +0200
commit8e03731cb9083330939b2c9b2d3318f32e93e41d (patch)
tree6d54b01522b80fb94b86ef3fab8a519944da7afe
parent8242c3aa36e606498afe21c22a3369ae0e82b13d (diff)
downloademacs-8e03731cb9083330939b2c9b2d3318f32e93e41d.tar.gz
emacs-8e03731cb9083330939b2c9b2d3318f32e93e41d.zip
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 fbb5d8c6349..670ff4b0cf7 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."
4025 (let ((tramp-end-of-output tramp-initial-end-of-output)) 4025 (let ((tramp-end-of-output tramp-initial-end-of-output))
4026 (tramp-open-shell vec (tramp-get-method-parameter vec 'tramp-remote-shell)) 4026 (tramp-open-shell vec (tramp-get-method-parameter vec 'tramp-remote-shell))
4027 4027
4028 ;; Disable echo. 4028 ;; Disable tab and echo expansion.
4029 (tramp-message vec 5 "Setting up remote shell environment") 4029 (tramp-message vec 5 "Setting up remote shell environment")
4030 (tramp-send-command vec "stty -inlcr -echo kill '^U' erase '^H'" t) 4030 (tramp-send-command vec "stty tab0 -inlcr -echo kill '^U' erase '^H'" t)
4031 ;; Check whether the echo has really been disabled. Some 4031 ;; Check whether the echo has really been disabled. Some
4032 ;; implementations, like busybox of embedded GNU/Linux, don't 4032 ;; implementations, like busybox of embedded GNU/Linux, don't
4033 ;; support disabling. 4033 ;; support disabling.
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 24cfa247c93..6972373bdf2 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -49,6 +49,7 @@
49(declare-function tramp-get-remote-stat "tramp-sh") 49(declare-function tramp-get-remote-stat "tramp-sh")
50(declare-function tramp-get-remote-perl "tramp-sh") 50(declare-function tramp-get-remote-perl "tramp-sh")
51(defvar tramp-copy-size-limit) 51(defvar tramp-copy-size-limit)
52(defvar tramp-persistency-file-name)
52(defvar tramp-remote-process-environment) 53(defvar tramp-remote-process-environment)
53 54
54;; There is no default value on w32 systems, which could work out of the box. 55;; There is no default value on w32 systems, which could work out of the box.
@@ -70,7 +71,8 @@
70(setq password-cache-expiry nil 71(setq password-cache-expiry nil
71 tramp-verbose 0 72 tramp-verbose 0
72 tramp-copy-size-limit nil 73 tramp-copy-size-limit nil
73 tramp-message-show-message nil) 74 tramp-message-show-message nil
75 tramp-persistency-file-name nil)
74 76
75;; This shall happen on hydra only. 77;; This shall happen on hydra only.
76(when (getenv "NIX_STORE") 78(when (getenv "NIX_STORE")
@@ -1690,6 +1692,14 @@ This requires restrictions of file name syntax."
1690 (or (eq system-type 'windows-nt) 1692 (or (eq system-type 'windows-nt)
1691 (tramp-smb-file-name-p tramp-test-temporary-file-directory))) 1693 (tramp-smb-file-name-p tramp-test-temporary-file-directory)))
1692 1694
1695(defun tramp--test-hpux-p ()
1696 "Check, whether the remote host runs HP-UX.
1697Several special characters do not work properly there."
1698 ;; We must refill the cache.
1699 (with-parsed-tramp-file-name
1700 (file-truename tramp-test-temporary-file-directory) nil
1701 (string-match "^HP-UX" (tramp-get-connection-property v "uname" ""))))
1702
1693(defun tramp--test-check-files (&rest files) 1703(defun tramp--test-check-files (&rest files)
1694 "Run a simple but comprehensive test over every file in FILES." 1704 "Run a simple but comprehensive test over every file in FILES."
1695 ;; We must use `file-truename' for the temporary directory, because 1705 ;; We must use `file-truename' for the temporary directory, because
@@ -1939,8 +1949,9 @@ Use the `ls' command."
1939 (coding-system-for-write 'utf-8) 1949 (coding-system-for-write 'utf-8)
1940 (file-name-coding-system 'utf-8)) 1950 (file-name-coding-system 'utf-8))
1941 (tramp--test-check-files 1951 (tramp--test-check-files
1942 "Γυρίστε το Γαλαξία με Ώτο Στοπ" 1952 (unless (tramp--test-hpux-p) "Γυρίστε το Γαλαξία με Ώτο Στοπ")
1943 "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت" 1953 (unless (tramp--test-hpux-p)
1954 "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت")
1944 "银河系漫游指南系列" 1955 "银河系漫游指南系列"
1945 "Автостопом по гала́ктике"))) 1956 "Автостопом по гала́ктике")))
1946 1957