From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 13 Aug 2022 06:58:44 +0000 (+0300)
Subject: Fix a recently-added Eshell test on MS-Windows
X-Git-Tag: emacs-29.0.90~1447^2~199
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6de88b6b0261a549637270c0474998ac76eb65a9;p=emacs.git

Fix a recently-added Eshell test on MS-Windows

* test/lisp/eshell/esh-var-tests.el
(esh-var-test/last-result-var-ext-cmd): Fix the test on
MS-Windows by making sure the internal 'format' command
is invoked.  (Bug#57129)
---

diff --git a/test/lisp/eshell/esh-var-tests.el b/test/lisp/eshell/esh-var-tests.el
index 66dabd424bd..0c094ee5a79 100644
--- a/test/lisp/eshell/esh-var-tests.el
+++ b/test/lisp/eshell/esh-var-tests.el
@@ -561,10 +561,13 @@ This tests when `eshell-lisp-form-nil-is-failure' is nil."
   "Test using the \"last result\" ($$) variable with an external command"
   (skip-unless (executable-find "["))
   (with-temp-eshell
-   (eshell-command-result-p "[ foo = foo ]; format \"%s\" $$"
-                            "t\n")
-   (eshell-command-result-p "[ foo = bar ]; format \"%s\" $$"
-                            "nil\n")))
+   ;; MS-DOS/MS-Windows have an external command 'format', which we
+   ;; don't want here.
+   (let ((eshell-prefer-lisp-functions t))
+     (eshell-command-result-p "[ foo = foo ]; format \"%s\" $$"
+                              "t\n")
+     (eshell-command-result-p "[ foo = bar ]; format \"%s\" $$"
+                              "nil\n"))))
 
 (ert-deftest esh-var-test/last-result-var-split-indices ()
   "Test using the \"last result\" ($$) variable with split indices"