]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix a recently-added Eshell test on MS-Windows
authorEli Zaretskii <eliz@gnu.org>
Sat, 13 Aug 2022 06:58:44 +0000 (09:58 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 13 Aug 2022 06:58:44 +0000 (09:58 +0300)
* 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)

test/lisp/eshell/esh-var-tests.el

index 66dabd424bd39607da1dc5d3ef444bbffbcea045..0c094ee5a79252fa4eda973f59062fd86a1716bf 100644 (file)
@@ -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"