| Message ID | 20180822095421.11765-7-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Don't check disabled drivers | expand |
On 2018-08-22 11:54, Juan Quintela wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > tests/Makefile.include | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 9a918f7655..116e93cdb6 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -243,8 +243,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 > > @@ -358,7 +358,7 @@ 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) > check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF) I guess we could add a line a la: gcov-files-ppc64-$(CONFIG_IVSHMEM_DEVICE) += hw/misc/ivshmem.c here, too, but since that's a pre-existing problem: Reviewed-by: Thomas Huth <thuth@redhat.com>
Thomas Huth <thuth@redhat.com> wrote: > On 2018-08-22 11:54, Juan Quintela wrote: >> Signed-off-by: Juan Quintela <quintela@redhat.com> >> --- >> tests/Makefile.include | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/tests/Makefile.include b/tests/Makefile.include >> index 9a918f7655..116e93cdb6 100644 >> --- a/tests/Makefile.include >> +++ b/tests/Makefile.include >> @@ -243,8 +243,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 >> >> @@ -358,7 +358,7 @@ 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) >> check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF) > > I guess we could add a line a la: > > gcov-files-ppc64-$(CONFIG_IVSHMEM_DEVICE) += hw/misc/ivshmem.c > > here, too, but since that's a pre-existing problem: > > Reviewed-by: Thomas Huth <thuth@redhat.com> Done, thanks. I got even more confused. check-qtest-pci-y is only tested on x86*, go figure. Later, Juan.
On 2018-08-22 16:36, Juan Quintela wrote: [...] > I got even more confused. check-qtest-pci-y is only tested on x86*, go > figure. Yes, that's ugly, indeed. We should maybe rework that so that all board which include pci.mak can use it... Thomas
diff --git a/tests/Makefile.include b/tests/Makefile.include index 9a918f7655..116e93cdb6 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -243,8 +243,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 @@ -358,7 +358,7 @@ 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) check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF) check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
Signed-off-by: Juan Quintela <quintela@redhat.com> --- tests/Makefile.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)