procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A better fix for esh-proc-tests on MS-Windows

Browse source 
* test/lisp/eshell/esh-proc-tests.el
(esh-proc-test-quote-argument): New function.
(esh-proc-test/emacs-command): Use it instead of
'shell-quote-argument', which allows to go back to
system-independent code.
This commit is contained in:
Eli Zaretskii 2024-06-09 16:12:11 +03:00
parent 588a8439e0
commit 5c8a8b7dd3
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
test/lisp/eshell/esh-proc-tests.el
View file

@ -196,22 +196,18 @@ pipeline."
;; against; that way, users don't need to have GNU coreutils (or
;; similar) installed.
;; This is needed because system shell quoting semantics is not relevant
;; when Eshell is the shell.
(defun esh-proc-test-quote-argument (argument)
"Quote ARGUMENT using Posix semantics."
(shell-quote-argument argument t))
(defsubst esh-proc-test/emacs-command (command)
"Evaluate COMMAND in a new Emacs batch instance."
(if (eq system-type 'windows-nt)
;; The MS-Windows implementation of shell-quote-argument is too
;; much for arguments that already have quotes, so we quote "by
;; hand" here.
(concat (shell-quote-argument
(expand-file-name invocation-name invocation-directory))
" -Q --batch --eval "
"\""
(string-replace "\"" "\\\"" (prin1-to-string command))
"\"")
(mapconcat #'shell-quote-argument
`(,(expand-file-name invocation-name invocation-directory)
"-Q" "--batch" "--eval" ,(prin1-to-string command))
" ")))
(mapconcat #'esh-proc-test-quote-argument
`(,(expand-file-name invocation-name invocation-directory)
"-Q" "--batch" "--eval" ,(prin1-to-string command))
" "))
(defvar esh-proc-test/emacs-echo
(esh-proc-test/emacs-command '(princ "hello\n"))