[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/4] docs: show stdout/stderr when meson fails build test
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 3/4] docs: show stdout/stderr when meson fails build test |
Date: |
Mon, 2 Nov 2020 13:09:25 +0000 |
It is hard to diagnose why Sphinx fails in a CI environment, as we
discard the stdout/err and just print a generic error message.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
docs/meson.build | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/docs/meson.build b/docs/meson.build
index 8c222f96bb..278098dd4f 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -20,14 +20,15 @@ if sphinx_build.found()
# version requirement). This will fail if sphinx-build is too old.
run_command('mkdir', ['-p', tmpdir / 'sphinx'])
run_command('touch', [tmpdir / 'sphinx/index.rst'])
- sphinx_build_test_out = run_command(SPHINX_ARGS + [
+ sphinx_cmd = run_command(SPHINX_ARGS + [
'-c', meson.current_source_dir(),
'-b', 'html', tmpdir / 'sphinx',
tmpdir / 'sphinx/out'])
- build_docs = (sphinx_build_test_out.returncode() == 0)
+ build_docs = (sphinx_cmd.returncode() == 0)
if not build_docs
- warning('@0@ exists but it is either too old or uses too old a Python
version'.format(get_option('sphinx_build')))
+ warning('@0@ exists but it is either too old or uses too old a Python
version\nstdout:@1@\nstderr:@2@'.format(
+ get_option('sphinx_build'), sphinx_cmd.stdout().strip(),
sphinx_cmd.stderr().strip()))
if get_option('docs').enabled()
error('Install a Python 3 version of python-sphinx')
endif
--
2.28.0