From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsOBg-00035m-29 for qemu-devel@nongnu.org; Wed, 22 Aug 2018 04:08:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsOBd-0007nu-LP for qemu-devel@nongnu.org; Wed, 22 Aug 2018 04:08:19 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:59412 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fsOBW-0007ec-0Q for qemu-devel@nongnu.org; Wed, 22 Aug 2018 04:08:12 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8673687A78 for ; Wed, 22 Aug 2018 08:08:07 +0000 (UTC) From: Juan Quintela Date: Wed, 22 Aug 2018 10:07:37 +0200 Message-Id: <20180822080751.11307-6-quintela@redhat.com> In-Reply-To: <20180822080751.11307-1-quintela@redhat.com> References: <20180822080751.11307-1-quintela@redhat.com> Subject: [Qemu-devel] [PULL 05/19] check: Only test rtl8139 when it is compiled in List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com, lvivier@redhat.com, peterx@redhat.com test-file-redirector uses rtl8139 in everything except s390. Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 0a7101c0bf..bac1a7efe0 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -215,8 +215,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 @@ -306,7 +306,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) @@ -356,7 +356,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) -- 2.17.1