From 1f97a8787957e49f1893b9ac73c95228f6ac1a13 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 13 Jan 2024 20:38:34 +0200 Subject: Fix info-xref-tests * doc/lispintro/emacs-lisp-intro.texi (How let Binds Variables): Fix cross-reference. (Bug#68428) * test/lisp/info-xref-tests.el (info-xref-test-write-file): Fix test on MS-Windows when run from MSYS Bash. --- test/lisp/info-xref-tests.el | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'test/lisp') diff --git a/test/lisp/info-xref-tests.el b/test/lisp/info-xref-tests.el index 72b6706a22c..c8eb18501f3 100644 --- a/test/lisp/info-xref-tests.el +++ b/test/lisp/info-xref-tests.el @@ -92,7 +92,15 @@ text. " ) (write-region nil nil file nil 'silent)) - (should (equal 0 (call-process "makeinfo" file)))) + (if (and (eq system-type 'windows-nt) + (executable-find "sh")) + ;; If we are running from MSYS Bash, makeinfo.bat might find the + ;; wrong version of Perl, so make sure to run the shell script + ;; named just 'makeinfo' instead, because it names the correct + ;; Perl. + (should (equal 0 (call-process "sh" nil t nil + "-c" (format "makeinfo '%s'" file)))) + (should (equal 0 (call-process "makeinfo" file))))) (ert-deftest info-xref-test-makeinfo () "Test that info-xref can parse basic makeinfo output." -- cgit v1.2.3