On 17.07.2018 13:33, Juan Quintela wrote:
> test-file-redirector uses rtl8139 in everything except s390.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> tests/Makefile.include | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index a039b70f9b..c6156fe105 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -213,8 +213,8 @@ check-qtest-pci-y += tests/e1000-test$(EXESUF)
> gcov-files-pci-y += hw/net/e1000.c
> check-qtest-pci-y += tests/e1000e-test$(EXESUF)
> gcov-files-pci-y += hw/net/e1000e.c hw/net/e1000e_core.c
> -check-qtest-pci-y += tests/rtl8139-test$(EXESUF)
> -gcov-files-pci-y += hw/net/rtl8139.c
> +check-qtest-pci-$(CONFIG_RTL8139_PCI) += tests/rtl8139-test$(EXESUF)
> +gcov-files-pci-$(CONFIG_RTL8139_PCI) += hw/net/rtl8139.c
> check-qtest-pci-$(CONFIG_PCNET_PCI) += tests/pcnet-test$(EXESUF)
> gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet.c
> gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet-pci.c
> @@ -302,7 +302,7 @@ check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-swtpm-test$(EXESUF)
> check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-test$(EXESUF)
> check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
> check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
> -check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
> +check-qtest-i386-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
> check-qtest-i386-y += tests/migration-test$(EXESUF)
> check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF)
> check-qtest-i386-y += tests/numa-test$(EXESUF)
> @@ -352,7 +352,7 @@ gcov-files-ppc64-y += hw/usb/hcd-xhci.c
> check-qtest-ppc64-y += $(check-qtest-virtio-y)
> check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
> check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
> -check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
> +check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
> check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
> check-qtest-ppc64-y += tests/numa-test$(EXESUF)
> check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
Reviewed-by: Thomas Huth <thuth@redhat.com>