summaryrefslogtreecommitdiff
path: root/test/lisp/info-xref-tests.el
diff options
context:
space:
mode:
Diffstat (limited to 'test/lisp/info-xref-tests.el')
-rw-r--r--test/lisp/info-xref-tests.el10
1 files changed, 9 insertions, 1 deletions
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."