[libvirt] [PATCH 11/12] tests: qemuxml2xml: make GIC handling optional

[Andrea Bolognani]

On Mon, 2019-04-01 at 12:47 -0400, Cole Robinson wrote:
[...]
>  # define DO_TEST(name, ...) \
> -    DO_TEST_FULL(name, WHEN_BOTH, GIC_NONE, __VA_ARGS__)
> +    DO_TEST_FULL(name, WHEN_BOTH, ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST)

Please move ARG_QEMU_CAPS and its arguments to a separate line.

[...]
> +    DO_TEST_FULL("seclabel-dynamic-baselabel", WHEN_INACTIVE,
> +            ARG_QEMU_CAPS, QEMU_CAPS_LAST);
> +    DO_TEST_FULL("seclabel-dynamic-override", WHEN_INACTIVE,
> +            ARG_QEMU_CAPS, QEMU_CAPS_LAST, NONE);
> +    DO_TEST_FULL("seclabel-dynamic-labelskip", WHEN_INACTIVE,
> +            ARG_QEMU_CAPS, NONE);
> +    DO_TEST_FULL("seclabel-dynamic-relabel", WHEN_INACTIVE,
> +            ARG_QEMU_CAPS, NONE);

The first two test cases use QEMU_CAPS_LAST instead of NONE. Also
the alignment is out of whack.

[...]
> +    DO_TEST_FULL("seclabel-dynamic-none-relabel", WHEN_INACTIVE,
> +            ARG_QEMU_CAPS, NONE);

This is misaligned, too.

[...]
> +    DO_TEST_FULL("aarch64-gic-none", WHEN_BOTH,
> +                 ARG_GIC, GIC_NONE, ARG_QEMU_CAPS, NONE);

For this and all of the other "aarch64-gic-*" test cases, put
ARG_GIC and ARG_QEMU_CAPS on separate lines.

With the above addressed,

  Reviewed-by: Andrea Bolognani <abologna at redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization