[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 39265abf0c 2/2: * test/lisp/net/tramp-tests.el (tramp-test32-sh
From: |
Michael Albinus |
Subject: |
emacs-29 39265abf0c 2/2: * test/lisp/net/tramp-tests.el (tramp-test32-shell-command): Fix test. |
Date: |
Fri, 30 Dec 2022 03:27:14 -0500 (EST) |
branch: emacs-29
commit 39265abf0ccdfa9a91dbe42f1e0a26e64cd50835
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
* test/lisp/net/tramp-tests.el (tramp-test32-shell-command): Fix test.
---
test/lisp/net/tramp-tests.el | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 79b2fc803d..8d63bb3de9 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -5503,15 +5503,11 @@ INPUT, if non-nil, is a string sent to the process."
;; String to be sent.
(format "%s\n" (file-name-nondirectory tmp-name)))
(should
- (string-equal
- ;; tramp-adb.el echoes, so we must add the string.
- (if (and (tramp--test-adb-p)
- (not (tramp-direct-async-process-p)))
- (format
- "%s\n%s\n"
- (file-name-nondirectory tmp-name)
- (file-name-nondirectory tmp-name))
- (format "%s\n" (file-name-nondirectory tmp-name)))
+ (string-match-p
+ ;; Some shells echo, for example the "adb" or "docker" methods.
+ (tramp-compat-rx
+ bos (** 1 2 (literal (file-name-nondirectory tmp-name)) "\n")
+ eos)
(buffer-string))))
;; Cleanup.