* [Qemu-devel] [PULL 1/9] configure: We don't want to clean configuration files
2018-08-27 10:04 [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Juan Quintela
@ 2018-08-27 10:04 ` Juan Quintela
2018-08-27 10:04 ` [Qemu-devel] [PULL 2/9] check: Only test isa-testdev when it is compiled in Juan Quintela
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Juan Quintela @ 2018-08-27 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
If you don't want to compile everything, you configure
config-devices.mak. And then make clean remove it, and make will
create a default one without your configuration. Fix it by not
removing it on clean target. Remove it instead on distclean.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
Remove it instead on distclean.
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index b7c6e57de6..fe623e4634 100644
--- a/Makefile
+++ b/Makefile
@@ -752,7 +752,7 @@ clean:
if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
rm -f $$d/qemu-options.def; \
done
- rm -f $(SUBDIR_DEVICES_MAK) config-all-devices.mak
+ rm -f config-all-devices.mak
VERSION ?= $(shell cat VERSION)
@@ -764,6 +764,7 @@ qemu-%.tar.bz2:
distclean: clean
rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi
rm -f config-all-devices.mak config-all-disas.mak config.status
+ rm -f $(SUBDIR_DEVICES_MAK)
rm -f po/*.mo tests/qemu-iotests/common.env
rm -f roms/seabios/config.mak roms/vgabios/config.mak
rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 2/9] check: Only test isa-testdev when it is compiled in
2018-08-27 10:04 [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Juan Quintela
2018-08-27 10:04 ` [Qemu-devel] [PULL 1/9] configure: We don't want to clean configuration files Juan Quintela
@ 2018-08-27 10:04 ` Juan Quintela
2018-08-27 10:04 ` [Qemu-devel] [PULL 3/9] check: Only test usb-xhci-nec " Juan Quintela
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Juan Quintela @ 2018-08-27 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
Once there, untangle endianness-test and boot-serial-test.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
boot-serial-test don't depend on isa-testdev. Thanks Thomas.
---
tests/Makefile.include | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 636b3d7ff8..dee2f16e65 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -256,7 +256,7 @@ gcov-files-pci-y += hw/misc/ivshmem.c
check-qtest-pci-y += tests/megasas-test$(EXESUF)
gcov-files-pci-y += hw/scsi/megasas.c
-check-qtest-i386-y = tests/endianness-test$(EXESUF)
+check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-i386-y += tests/fdc-test$(EXESUF)
gcov-files-i386-y = hw/block/fdc.c
check-qtest-i386-y += tests/ide-test$(EXESUF)
@@ -331,15 +331,15 @@ check-qtest-m68k-y = tests/boot-serial-test$(EXESUF)
check-qtest-microblaze-y = tests/boot-serial-test$(EXESUF)
-check-qtest-mips-y = tests/endianness-test$(EXESUF)
+check-qtest-mips-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-check-qtest-mips64-y = tests/endianness-test$(EXESUF)
+check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-check-qtest-mips64el-y = tests/endianness-test$(EXESUF)
+check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-moxie-y = tests/boot-serial-test$(EXESUF)
-check-qtest-ppc-y = tests/endianness-test$(EXESUF)
+check-qtest-ppc-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
check-qtest-ppc-y += tests/drive_del-test$(EXESUF)
@@ -370,16 +370,16 @@ check-qtest-ppc64-y += tests/numa-test$(EXESUF)
check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF)
-check-qtest-sh4-y = tests/endianness-test$(EXESUF)
+check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-check-qtest-sh4eb-y = tests/endianness-test$(EXESUF)
+check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-sparc-y = tests/prom-env-test$(EXESUF)
check-qtest-sparc-y += tests/m48t59-test$(EXESUF)
gcov-files-sparc-y = hw/timer/m48t59.c
check-qtest-sparc-y += tests/boot-serial-test$(EXESUF)
-check-qtest-sparc64-y = tests/endianness-test$(EXESUF)
+check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-sparc64-y += tests/prom-env-test$(EXESUF)
check-qtest-sparc64-y += tests/boot-serial-test$(EXESUF)
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 3/9] check: Only test usb-xhci-nec when it is compiled in
2018-08-27 10:04 [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Juan Quintela
2018-08-27 10:04 ` [Qemu-devel] [PULL 1/9] configure: We don't want to clean configuration files Juan Quintela
2018-08-27 10:04 ` [Qemu-devel] [PULL 2/9] check: Only test isa-testdev when it is compiled in Juan Quintela
@ 2018-08-27 10:04 ` Juan Quintela
2018-08-27 10:04 ` [Qemu-devel] [PULL 4/9] x86_64-softmmu: Configuration is identical to i386-softmmu Juan Quintela
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Juan Quintela @ 2018-08-27 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/Makefile.include | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index dee2f16e65..b4c3043dcc 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -298,8 +298,9 @@ endif
gcov-files-i386-$(CONFIG_USB_EHCI) += hw/usb/hcd-ehci.c
gcov-files-i386-y += hw/usb/dev-hid.c
gcov-files-i386-y += hw/usb/dev-storage.c
-check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF)
-gcov-files-i386-y += hw/usb/hcd-xhci.c
+check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
+gcov-files-i386-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
+gcov-files-i386-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci-nec.c
check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
check-qtest-i386-y += tests/q35-test$(EXESUF)
check-qtest-i386-y += tests/vmgenid-test$(EXESUF)
@@ -359,8 +360,9 @@ check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
gcov-files-ppc64-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
gcov-files-ppc64-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c
-check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
-gcov-files-ppc64-y += hw/usb/hcd-xhci.c
+check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
+gcov-files-ppc64-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
+gcov-files-ppc64-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci-nec.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)
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 4/9] x86_64-softmmu: Configuration is identical to i386-softmmu
2018-08-27 10:04 [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Juan Quintela
` (2 preceding siblings ...)
2018-08-27 10:04 ` [Qemu-devel] [PULL 3/9] check: Only test usb-xhci-nec " Juan Quintela
@ 2018-08-27 10:04 ` Juan Quintela
2018-08-27 10:04 ` [Qemu-devel] [PULL 5/9] check: Only test ivshm when it is compiled in Juan Quintela
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Juan Quintela @ 2018-08-27 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
If we ever changed that, just make the things that are different
explicit.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
default-configs/x86_64-softmmu.mak | 67 +-----------------------------
1 file changed, 1 insertion(+), 66 deletions(-)
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 0390b4303c..64b2ee2960 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -1,68 +1,3 @@
# Default configuration for x86_64-softmmu
-include pci.mak
-include sound.mak
-include usb.mak
-CONFIG_QXL=$(CONFIG_SPICE)
-CONFIG_VGA_ISA=y
-CONFIG_VGA_CIRRUS=y
-CONFIG_VMWARE_VGA=y
-CONFIG_VMXNET3_PCI=y
-CONFIG_VIRTIO_VGA=y
-CONFIG_VMMOUSE=y
-CONFIG_IPMI=y
-CONFIG_IPMI_LOCAL=y
-CONFIG_IPMI_EXTERN=y
-CONFIG_ISA_IPMI_KCS=y
-CONFIG_ISA_IPMI_BT=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCSPK=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
-CONFIG_ACPI=y
-CONFIG_ACPI_X86=y
-CONFIG_ACPI_X86_ICH=y
-CONFIG_ACPI_MEMORY_HOTPLUG=y
-CONFIG_ACPI_CPU_HOTPLUG=y
-CONFIG_APM=y
-CONFIG_I8257=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_PIIX=y
-CONFIG_NE2000_ISA=y
-CONFIG_HPET=y
-CONFIG_APPLESMC=y
-CONFIG_I8259=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_TPM_TIS=$(CONFIG_TPM)
-CONFIG_TPM_CRB=$(CONFIG_TPM)
-CONFIG_MC146818RTC=y
-CONFIG_PCI_PIIX=y
-CONFIG_WDT_IB700=y
-CONFIG_ISA_DEBUG=y
-CONFIG_ISA_TESTDEV=y
-CONFIG_VMPORT=y
-CONFIG_SGA=y
-CONFIG_LPC_ICH9=y
-CONFIG_PCI_Q35=y
-CONFIG_APIC=y
-CONFIG_IOAPIC=y
-CONFIG_PVPANIC=y
-CONFIG_MEM_HOTPLUG=y
-CONFIG_NVDIMM=y
-CONFIG_ACPI_NVDIMM=y
-CONFIG_PCIE_PORT=y
-CONFIG_XIO3130=y
-CONFIG_IOH3420=y
-CONFIG_I82801B11=y
-CONFIG_SMBIOS=y
-CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
-CONFIG_PXB=y
-CONFIG_ACPI_VMGENID=y
-CONFIG_FW_CFG_DMA=y
-CONFIG_I2C=y
-CONFIG_SEV=$(CONFIG_KVM)
-CONFIG_VTD=y
-CONFIG_AMD_IOMMU=y
+include i386-softmmu.mak
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 5/9] check: Only test ivshm when it is compiled in
2018-08-27 10:04 [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Juan Quintela
` (3 preceding siblings ...)
2018-08-27 10:04 ` [Qemu-devel] [PULL 4/9] x86_64-softmmu: Configuration is identical to i386-softmmu Juan Quintela
@ 2018-08-27 10:04 ` Juan Quintela
2018-08-27 10:04 ` [Qemu-devel] [PULL 6/9] check: Only test boot-serial when sga " Juan Quintela
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Juan Quintela @ 2018-08-27 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/Makefile.include | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index b4c3043dcc..9edfdbe56f 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -251,8 +251,8 @@ gcov-files-pci-y += hw/display/virtio-gpu-pci.c
gcov-files-pci-$(CONFIG_VIRTIO_VGA) += hw/display/virtio-vga.c
check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
gcov-files-pci-$(CONFIG_HDA) += hw/audio/intel-hda.c hw/audio/hda-codec.c
-check-qtest-pci-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
-gcov-files-pci-y += hw/misc/ivshmem.c
+check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
+gcov-files-pci-$(CONFIG_IVSHMEM_DEVICE) += hw/misc/ivshmem.c
check-qtest-pci-y += tests/megasas-test$(EXESUF)
gcov-files-pci-y += hw/scsi/megasas.c
@@ -369,7 +369,8 @@ check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(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)
+check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
+gcov-files-ppc64-$(CONFIG_IVSHMEM_DEVICE) += hw/misc/ivshmem.c
check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF)
check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 6/9] check: Only test boot-serial when sga is compiled in
2018-08-27 10:04 [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Juan Quintela
` (4 preceding siblings ...)
2018-08-27 10:04 ` [Qemu-devel] [PULL 5/9] check: Only test ivshm when it is compiled in Juan Quintela
@ 2018-08-27 10:04 ` Juan Quintela
2018-08-27 10:04 ` [Qemu-devel] [PULL 7/9] check: Move VMXNET3 test to common Juan Quintela
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Juan Quintela @ 2018-08-27 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
This is only for x86* architecture.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/Makefile.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 9edfdbe56f..d0c0a92e67 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -265,7 +265,7 @@ check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
gcov-files-i386-y += hw/block/hd-geometry.c
check-qtest-i386-y += tests/boot-order-test$(EXESUF)
check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
-check-qtest-i386-y += tests/boot-serial-test$(EXESUF)
+check-qtest-i386-$(CONFIG_SGA) += tests/boot-serial-test$(EXESUF)
check-qtest-i386-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
check-qtest-i386-y += tests/rtc-test$(EXESUF)
check-qtest-i386-y += tests/ipmi-kcs-test$(EXESUF)
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 7/9] check: Move VMXNET3 test to common
2018-08-27 10:04 [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Juan Quintela
` (5 preceding siblings ...)
2018-08-27 10:04 ` [Qemu-devel] [PULL 6/9] check: Only test boot-serial when sga " Juan Quintela
@ 2018-08-27 10:04 ` Juan Quintela
2018-08-27 10:04 ` [Qemu-devel] [PULL 8/9] check: Move endianess " Juan Quintela
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Juan Quintela @ 2018-08-27 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
We protect it with CONFIG_VMXNET3_PCI now, so no need to also put it
on i386.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/Makefile.include | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index d0c0a92e67..e5eb5140d8 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -255,6 +255,8 @@ check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
gcov-files-pci-$(CONFIG_IVSHMEM_DEVICE) += hw/misc/ivshmem.c
check-qtest-pci-y += tests/megasas-test$(EXESUF)
gcov-files-pci-y += hw/scsi/megasas.c
+check-qtest-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF)
+gcov-files-$(CONFIG_VMXNET3_PCI) += hw/net/vmxnet3.c
check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-i386-y += tests/fdc-test$(EXESUF)
@@ -278,8 +280,6 @@ gcov-files-i386-$(CONFIG_WDT_IB700) += hw/watchdog/watchdog.c hw/watchdog/wdt_ib
check-qtest-i386-y += tests/tco-test$(EXESUF)
check-qtest-i386-y += $(check-qtest-pci-y)
gcov-files-i386-y += $(gcov-files-pci-y)
-check-qtest-i386-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF)
-gcov-files-i386-$(CONFIG_VMXNET3_PCI) += hw/net/vmxnet3.c
gcov-files-i386-y += hw/net/net_rx_pkt.c
gcov-files-i386-y += hw/net/net_tx_pkt.c
check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 8/9] check: Move endianess test to common
2018-08-27 10:04 [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Juan Quintela
` (6 preceding siblings ...)
2018-08-27 10:04 ` [Qemu-devel] [PULL 7/9] check: Move VMXNET3 test to common Juan Quintela
@ 2018-08-27 10:04 ` Juan Quintela
2018-08-27 10:04 ` [Qemu-devel] [PULL 9/9] check: Move wdt_ib700 " Juan Quintela
2018-08-27 15:43 ` [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Peter Maydell
9 siblings, 0 replies; 11+ messages in thread
From: Juan Quintela @ 2018-08-27 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
It is already protected by CONFIG_ISA_TESTDEV in all architectures.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/Makefile.include | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index e5eb5140d8..2b3b7382fc 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -257,8 +257,8 @@ check-qtest-pci-y += tests/megasas-test$(EXESUF)
gcov-files-pci-y += hw/scsi/megasas.c
check-qtest-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF)
gcov-files-$(CONFIG_VMXNET3_PCI) += hw/net/vmxnet3.c
+check-qtest-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-i386-y += tests/fdc-test$(EXESUF)
gcov-files-i386-y = hw/block/fdc.c
check-qtest-i386-y += tests/ide-test$(EXESUF)
@@ -332,15 +332,8 @@ check-qtest-m68k-y = tests/boot-serial-test$(EXESUF)
check-qtest-microblaze-y = tests/boot-serial-test$(EXESUF)
-check-qtest-mips-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-
-check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-
-check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-
check-qtest-moxie-y = tests/boot-serial-test$(EXESUF)
-check-qtest-ppc-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
check-qtest-ppc-y += tests/drive_del-test$(EXESUF)
@@ -373,16 +366,11 @@ check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
gcov-files-ppc64-$(CONFIG_IVSHMEM_DEVICE) += hw/misc/ivshmem.c
check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF)
-check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-
-check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-
check-qtest-sparc-y = tests/prom-env-test$(EXESUF)
check-qtest-sparc-y += tests/m48t59-test$(EXESUF)
gcov-files-sparc-y = hw/timer/m48t59.c
check-qtest-sparc-y += tests/boot-serial-test$(EXESUF)
-check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-sparc64-y += tests/prom-env-test$(EXESUF)
check-qtest-sparc64-y += tests/boot-serial-test$(EXESUF)
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 9/9] check: Move wdt_ib700 test to common
2018-08-27 10:04 [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Juan Quintela
` (7 preceding siblings ...)
2018-08-27 10:04 ` [Qemu-devel] [PULL 8/9] check: Move endianess " Juan Quintela
@ 2018-08-27 10:04 ` Juan Quintela
2018-08-27 15:43 ` [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Peter Maydell
9 siblings, 0 replies; 11+ messages in thread
From: Juan Quintela @ 2018-08-27 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, lvivier, peterx
It is protected by CONFIG_WDT_IB700.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
tests/Makefile.include | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 2b3b7382fc..87c81d1dcc 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -258,6 +258,8 @@ gcov-files-pci-y += hw/scsi/megasas.c
check-qtest-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF)
gcov-files-$(CONFIG_VMXNET3_PCI) += hw/net/vmxnet3.c
check-qtest-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
+check-qtest-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF)
+gcov-files-$(CONFIG_WDT_IB700) += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
check-qtest-i386-y += tests/fdc-test$(EXESUF)
gcov-files-i386-y = hw/block/fdc.c
@@ -275,8 +277,6 @@ check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF)
check-qtest-i386-y += tests/i440fx-test$(EXESUF)
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
check-qtest-i386-y += tests/drive_del-test$(EXESUF)
-check-qtest-i386-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF)
-gcov-files-i386-$(CONFIG_WDT_IB700) += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
check-qtest-i386-y += tests/tco-test$(EXESUF)
check-qtest-i386-y += $(check-qtest-pci-y)
gcov-files-i386-y += $(gcov-files-pci-y)
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in
2018-08-27 10:04 [Qemu-devel] [PULL 0/9] Disable tests when device is not compiled in Juan Quintela
` (8 preceding siblings ...)
2018-08-27 10:04 ` [Qemu-devel] [PULL 9/9] check: Move wdt_ib700 " Juan Quintela
@ 2018-08-27 15:43 ` Peter Maydell
9 siblings, 0 replies; 11+ messages in thread
From: Peter Maydell @ 2018-08-27 15:43 UTC (permalink / raw)
To: Juan Quintela
Cc: QEMU Developers, Laurent Vivier, Dr. David Alan Gilbert, Peter Xu
On 27 August 2018 at 11:04, Juan Quintela <quintela@redhat.com> wrote:
> The following changes since commit 235c82acca0491465e94be3cae2583b42d37c859:
>
> Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20180823' into staging (2018-08-25 13:08:57 +0100)
>
> are available in the Git repository at:
>
> git://github.com/juanquintela/qemu.git tags/check/20180827
>
> for you to fetch changes up to ee1f6c812b3240420dff07a3860060b7d4abfe09:
>
> check: Move wdt_ib700 test to common (2018-08-27 11:27:07 +0200)
>
> ----------------------------------------------------------------
> check/next for 20180827
>
> Hi
>
> This are the patches that are reviewed to disable tests when devices
> are not compiled in. I will stop now until the changes to qtest are
> finished.
>
> Later, Juan.
>
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 11+ messages in thread