diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2024-04-01 18:50:20 +0800 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2024-04-01 18:50:20 +0800 |
| commit | 0fef2018445b257bf26814e6659bc2ff5b270d77 (patch) | |
| tree | 2310ce1fd8781a6203ec56e2f985f6adfcc2278d /test/lisp/info-xref-tests.el | |
| parent | 3a8546615a38337dc991f6546ade63a372edc2ca (diff) | |
| parent | 49f76dcc17055e60569b6096e8ea3c9961ebbf63 (diff) | |
| download | emacs-0fef2018445b257bf26814e6659bc2ff5b270d77.tar.gz | |
Merge branch 'athena/unstable' into athena/bookworm-backports
Diffstat (limited to 'test/lisp/info-xref-tests.el')
| -rw-r--r-- | test/lisp/info-xref-tests.el | 10 |
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." |