On 17/01/2020 13.26, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> vhost-user-bridge isn't actually a test, it's just a helper
> (that should probably move somewhere else) - but the build was
> broken in the qtest move.
>
> Fixes: 833884f37adc9f125fa2
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> tests/Makefile.include | 1 +
> tests/qtest/Makefile.include | 1 -
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index c6827ce8c2..7833684bac 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -585,6 +585,7 @@ include $(SRC_PATH)/tests/qtest/Makefile.include
>
> tests/test-qga$(EXESUF): qemu-ga$(EXESUF)
> tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y)
> +tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
>
> SPEED = quick
>
> diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include
> index e6bb4ab28c..eb0f23b108 100644
> --- a/tests/qtest/Makefile.include
> +++ b/tests/qtest/Makefile.include
> @@ -290,7 +290,6 @@ tests/qtest/test-filter-redirector$(EXESUF): tests/qtest/test-filter-redirector.
> tests/qtest/test-x86-cpuid-compat$(EXESUF): tests/qtest/test-x86-cpuid-compat.o $(qtest-obj-y)
> tests/qtest/ivshmem-test$(EXESUF): tests/qtest/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
> tests/qtest/dbus-vmstate-test$(EXESUF): tests/qtest/dbus-vmstate-test.o tests/qtest/migration-helpers.o tests/qtest/dbus-vmstate1.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
> -tests/qtest/vhost-user-bridge$(EXESUF): tests/qtest/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
> tests/qtest/test-arm-mptimer$(EXESUF): tests/qtest/test-arm-mptimer.o
> tests/qtest/numa-test$(EXESUF): tests/qtest/numa-test.o
> tests/qtest/vmgenid-test$(EXESUF): tests/qtest/vmgenid-test.o tests/qtest/boot-sector.o tests/qtest/acpi-utils.o
>
Thanks!
Reviewed-by: Thomas Huth <thuth@redhat.com>
(and cc: qemu-trivial)