From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 6 May 2025 10:22:45 +0000 (+0200)
Subject: Adapt Tramp tests
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c1e4887884d555017b641178b1ac6106b33d4d6;p=emacs.git

Adapt Tramp tests

* test/lisp/net/tramp-tests.el (tramp-test29-start-file-process)
(tramp-test30-make-process): Adapt tests.

(cherry picked from commit ed7b55f6bf1b8d0ceb40c9e196d8b31fd6afc21e)
---

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 56d696d5074..9a7213a8a92 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -5059,6 +5059,12 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 	    (with-timeout (10 (tramp--test-timeout-handler))
 	      (while (< (- (point-max) (point-min)) (length "foo"))
 		(while (accept-process-output proc 0 nil t))))
+            ;; Some `cat' implementations do not support the `cat -'
+            ;; call.  We skip then.
+            (skip-unless
+             (not
+              (string-match-p (rx "cat: -: input file is output file\n")
+                              (buffer-string))))
 	    (should (string-match-p "foo" (buffer-string))))
 
 	;; Cleanup.
@@ -5253,6 +5259,12 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'."
 	    (with-timeout (10 (tramp--test-timeout-handler))
 	      (while (< (- (point-max) (point-min)) (length "foo"))
 		(while (accept-process-output proc 0 nil t))))
+            ;; Some `cat' implementations do not support the `cat -'
+            ;; call.  We skip then.
+            (skip-unless
+             (not
+              (string-match-p (rx "cat: -: input file is output file\n")
+                              (buffer-string))))
 	    (should (string-match-p "foo" (buffer-string))))
 
 	;; Cleanup.