On 02/15/2018 11:16 AM, Daniel P. Berrangé wrote:
> When configure fails inside a docker job it is not easy to get access to
> the config.log file. It is nicer for developers if we just splatter the
> contents of config.log to stdout upon failure
>
> Suggested-by: Eric Blake <eblake@redhat.com>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
> tests/docker/common.rc | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/docker/common.rc b/tests/docker/common.rc
> index 7951555e3f..ecbea13443 100755
> --- a/tests/docker/common.rc
> +++ b/tests/docker/common.rc
> @@ -30,7 +30,8 @@ build_qemu()
> $@"
> echo "Configure options:"
> echo $config_opts
> - $QEMU_SRC/configure $config_opts && make $MAKEFLAGS
The old code dies if either configure or make has non-zero exit status.
> + $QEMU_SRC/configure $config_opts || cat config.log
> + make $MAKEFLAGS
But this turns a failure of configure into a successful exit status
(presuming that cat doesn't also fail), which means we try the make no
matter whether configure succeeded.
Better might be:
$QEMU_SRC/configure $config_opts || { cat config.log; exit 1; }
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org