Merge from origin/emacs-30

0d493864cee Fix indentation of XML comments
1a2c29b5317 Improve Tramp's make-process handling for Solaris
a7dffc2ea38 Document 'time-stamp-time-zone' in Emacs Manual
0b4eb525b69 Make treesit--simple-indent-eval more permissive (bug#78065)
ed7b55f6bf1 Adapt Tramp tests
b172a1478c1 ; * doc/lispref/tips.texi (Library Headers): Fix wording ...
81629b2b2ba ; * lisp/gnus/mail-source.el (mail-sources): Fix a typo (...

1 files changed, 12 insertions, 0 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index eeb90539f61..1c11b0e285c 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -5393,6 +5393,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.
@@ -5587,6 +5593,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.