Re: Shell quoting in Eshell (was: eshell-batch-file)

[Jim Porter <jporterbugs@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 706 bytes --]

On 6/15/2024 12:10 PM, Eli Zaretskii wrote:
>    Test esh-cmd-test/which/plain/external-program condition:
[snip]
> 	:value nil :explanation
> 	(nonequal-result (command "which sh")
> 			 (result #("D:/usr/MSYS/bin/sh.exe\n" 22 23 ...))
> 			 (expected "d:/usr/MSYS/bin/sh.exe\n"))))
>       FAILED  59/66  esh-cmd-test/which/plain/external-program (0.003953 sec) at lisp/eshell/esh-cmd-tests.el:538
> 
> IOW: you run "which SOMETHING" and pretend to know how it will
> capitalize the drive letter.

Ah ha! If that's the only failure, then I think this would work? (If 
there are other failures, then I could add a PREDICATE argument to 
'eshell-command-result-equal' and use that in the necessary places.)

[-- Attachment #2: eshell-which.diff --]
[-- Type: text/plain, Size: 1843 bytes --]

diff --git a/test/lisp/eshell/esh-cmd-tests.el b/test/lisp/eshell/esh-cmd-tests.el
index 166a0ba1fff..9799afa5665 100644
--- a/test/lisp/eshell/esh-cmd-tests.el
+++ b/test/lisp/eshell/esh-cmd-tests.el
@@ -538,8 +538,12 @@ esh-cmd-test/which/plain/eshell-builtin
 (ert-deftest esh-cmd-test/which/plain/external-program ()
   "Check that `which' finds external programs."
   (skip-unless (executable-find "sh"))
-  (eshell-command-result-equal "which sh"
-                               (concat (executable-find "sh") "\n")))
+  (ert-info (#'eshell-get-debug-logs :prefix "Command logs: ")
+    (let ((actual (eshell-test-command-result "which sh"))
+          (expected (concat (executable-find "sh") "\n")))
+      (should (if (file-name-case-insensitive-p actual)
+                  (string-equal-ignore-case actual expected)
+                (string-equal actual expected))))))
 
 (ert-deftest esh-cmd-test/which/plain/not-found ()
   "Check that `which' reports an error for not-found commands."
diff --git a/test/lisp/eshell/eshell-tests-helpers.el b/test/lisp/eshell/eshell-tests-helpers.el
index acbe57a7283..bfd829c95e9 100644
--- a/test/lisp/eshell/eshell-tests-helpers.el
+++ b/test/lisp/eshell/eshell-tests-helpers.el
@@ -179,12 +179,7 @@ eshell-test-command-result
 
 (defun eshell-command-result--equal (_command actual expected)
   "Compare the ACTUAL result of a COMMAND with its EXPECTED value."
-  (or (equal actual expected)
-      ;; Compare case-isensitively on case-insensitive filesystems.
-      (and (memq system-type '(windows-nt ms-dos))
-           (stringp actual)
-           (stringp expected)
-           (string-equal-ignore-case actual expected))))
+  (equal actual expected))
 
 (defun eshell-command-result--equal-explainer (command actual expected)
   "Explain the result of `eshell-command-result--equal'."