From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 16 Dec 2017 15:40:03 +0000 (+0100)
Subject: Improve fix for Bug#29712
X-Git-Tag: emacs-26.0.91~122
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac53084f9b;p=emacs.git

Improve fix for Bug#29712

* test/lisp/net/tramp-tests.el
(tramp-test32-environment-variables-and-port-numbers):
Adapt check for systems which do not support "echo -n".  (Bug#29712)
---

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index c1577008d31..d4f568feddd 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3637,8 +3637,6 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 (ert-deftest tramp-test32-environment-variables-and-port-numbers ()
   "Check that two connections with separate ports are different."
   (skip-unless (tramp--test-enabled))
-  ;; Bug#29712.
-  (skip-unless (not (eq system-type 'darwin)))
   ;; We test it only for the mock-up connection; otherwise there might
   ;; be problems with the used ports.
   (skip-unless (and (eq tramp-syntax 'default)
@@ -3663,7 +3661,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 		 (format "%s=%d" envvar port)
 		 tramp-remote-process-environment)))
 	  (should
-	   (string-equal
+	   (string-match
 	    (number-to-string port)
 	    (shell-command-to-string (format "echo -n $%s" envvar))))))