Re: [Qemu-devel] [PULL 26/48] tests: Add virtio-net qtest

[Andreas Färber]

Am 10.02.2014 19:36, schrieb Andreas Färber:
> Cc: Michael S. Tsirkin <address@hidden>
> Reviewed-by: Stefan Hajnoczi <address@hidden>
> Signed-off-by: Andreas Färber <address@hidden>
> ---
>  tests/Makefile          |  7 +++++++
>  tests/virtio-net-test.c | 33 +++++++++++++++++++++++++++++++++
>  2 files changed, 40 insertions(+)
>  create mode 100644 tests/virtio-net-test.c
> 
> diff --git a/tests/Makefile b/tests/Makefile
> index 62ae7f8..2acd358 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -65,6 +65,10 @@ check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
>  # All QTests for now are POSIX-only, but the dependencies are
>  # really in libqtest, not in the testcases themselves.
>  
> +gcov-files-virtio-y += hw/virtio/virtio.c
> +check-qtest-virtio-y += tests/virtio-net-test$(EXESUF)
> +gcov-files-virtio-y += hw/net/virtio-net.c
> +
>  check-qtest-pci-y += tests/e1000-test$(EXESUF)
>  gcov-files-pci-y += hw/net/e1000.c
>  check-qtest-pci-y += tests/rtl8139-test$(EXESUF)

This does not work as intended. Needs path fixes:

diff --git a/tests/Makefile b/tests/Makefile
index 5424574..cfd0052 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -65,9 +65,9 @@ check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
 # All QTests for now are POSIX-only, but the dependencies are
 # really in libqtest, not in the testcases themselves.

-gcov-files-virtio-y += hw/virtio/virtio.c
+gcov-files-virtio-y += i386-softmmu/hw/virtio/virtio.c
 check-qtest-virtio-y += tests/virtio-net-test$(EXESUF)
-gcov-files-virtio-y += hw/net/virtio-net.c
+gcov-files-virtio-y += i386-softmmu/hw/net/virtio-net.c

 check-qtest-pci-y += tests/e1000-test$(EXESUF)
 gcov-files-pci-y += hw/net/e1000.c

Fixing for v2.

Andreas

> @@ -74,6 +78,8 @@ gcov-files-pci-y += hw/net/pcnet.c
>  gcov-files-pci-y += hw/net/pcnet-pci.c
>  check-qtest-pci-y += tests/eepro100-test$(EXESUF)
>  gcov-files-pci-y += hw/net/eepro100.c
> +check-qtest-pci-y += $(check-qtest-virtio-y)
> +gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c
>  
>  check-qtest-i386-y = tests/endianness-test$(EXESUF)
>  check-qtest-i386-y += tests/fdc-test$(EXESUF)
> @@ -219,6 +225,7 @@ tests/pcnet-test$(EXESUF): tests/pcnet-test.o
>  tests/eepro100-test$(EXESUF): tests/eepro100-test.o
>  tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
>  tests/ne2000-test$(EXESUF): tests/ne2000-test.o
> +tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o
>  tests/qom-test$(EXESUF): tests/qom-test.o
>  tests/blockdev-test$(EXESUF): tests/blockdev-test.o $(libqos-pc-obj-y)
>  tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o 
> $(libqos-pc-obj-y)

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg