Message ID | 20191030144926.11873-10-alxndr@bu.edu |
---|---|
State | New |
Headers | show |
Series | Add virtual device fuzzing support | expand |
On Wed, Oct 30, 2019 at 02:49:55PM +0000, Oleinik, Alexander wrote: >From: Alexander Oleinik <alxndr@bu.edu> > >Most qos-related objects were specified in the qos-test-obj-y variable. >qos-test-obj-y also included qos-test.o which defines a main(). >This made it difficult to repurpose qos-test-obj-y to link anything >beside tests/qos-test against libqos. This change separates objects that >are libqos-specific and ones that are qos-test specific into different >variables. > >Signed-off-by: Alexander Oleinik <alxndr@bu.edu> Reviewed-by: Darren Kenny <darren.kenny@oracle.com> >--- > tests/Makefile.include | 71 +++++++++++++++++++++--------------------- > 1 file changed, 36 insertions(+), 35 deletions(-) > >diff --git a/tests/Makefile.include b/tests/Makefile.include >index 67853d10c3..1517c4817e 100644 >--- a/tests/Makefile.include >+++ b/tests/Makefile.include >@@ -699,52 +699,53 @@ tests/test-crypto-block$(EXESUF): tests/test-crypto-block.o $(test-crypto-obj-y) > > libqgraph-obj-y = tests/libqos/qgraph.o > >-libqos-obj-y = $(libqgraph-obj-y) tests/libqos/pci.o tests/libqos/fw_cfg.o >-libqos-obj-y += tests/libqos/malloc.o >-libqos-obj-y += tests/libqos/libqos.o >-libqos-spapr-obj-y = $(libqos-obj-y) tests/libqos/malloc-spapr.o >+libqos-core-obj-y = $(libqgraph-obj-y) tests/libqos/pci.o tests/libqos/fw_cfg.o >+libqos-core-obj-y += tests/libqos/malloc.o >+libqos-core-obj-y += tests/libqos/libqos.o >+libqos-spapr-obj-y = $(libqos-core-obj-y) tests/libqos/malloc-spapr.o > libqos-spapr-obj-y += tests/libqos/libqos-spapr.o > libqos-spapr-obj-y += tests/libqos/rtas.o > libqos-spapr-obj-y += tests/libqos/pci-spapr.o >-libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o >+libqos-pc-obj-y = $(libqos-core-obj-y) tests/libqos/pci-pc.o > libqos-pc-obj-y += tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o > libqos-pc-obj-y += tests/libqos/ahci.o > libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/usb.o > > # Devices >-qos-test-obj-y = tests/qos-test.o $(libqgraph-obj-y) >-qos-test-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y) >-qos-test-obj-y += tests/libqos/e1000e.o >-qos-test-obj-y += tests/libqos/i2c.o >-qos-test-obj-y += tests/libqos/i2c-imx.o >-qos-test-obj-y += tests/libqos/i2c-omap.o >-qos-test-obj-y += tests/libqos/sdhci.o >-qos-test-obj-y += tests/libqos/tpci200.o >-qos-test-obj-y += tests/libqos/virtio.o >-qos-test-obj-$(CONFIG_VIRTFS) += tests/libqos/virtio-9p.o >-qos-test-obj-y += tests/libqos/virtio-balloon.o >-qos-test-obj-y += tests/libqos/virtio-blk.o >-qos-test-obj-y += tests/libqos/virtio-mmio.o >-qos-test-obj-y += tests/libqos/virtio-net.o >-qos-test-obj-y += tests/libqos/virtio-pci.o >-qos-test-obj-y += tests/libqos/virtio-pci-modern.o >-qos-test-obj-y += tests/libqos/virtio-rng.o >-qos-test-obj-y += tests/libqos/virtio-scsi.o >-qos-test-obj-y += tests/libqos/virtio-serial.o >+libqos-obj-y = $(libqgraph-obj-y) >+libqos-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y) >+libqos-obj-y += tests/libqos/e1000e.o >+libqos-obj-y += tests/libqos/i2c.o >+libqos-obj-y += tests/libqos/i2c-imx.o >+libqos-obj-y += tests/libqos/i2c-omap.o >+libqos-obj-y += tests/libqos/sdhci.o >+libqos-obj-y += tests/libqos/tpci200.o >+libqos-obj-y += tests/libqos/virtio.o >+libqos-obj-$(CONFIG_VIRTFS) += tests/libqos/virtio-9p.o >+libqos-obj-y += tests/libqos/virtio-balloon.o >+libqos-obj-y += tests/libqos/virtio-blk.o >+libqos-obj-y += tests/libqos/virtio-mmio.o >+libqos-obj-y += tests/libqos/virtio-net.o >+libqos-obj-y += tests/libqos/virtio-pci.o >+libqos-obj-y += tests/libqos/virtio-pci-modern.o >+libqos-obj-y += tests/libqos/virtio-rng.o >+libqos-obj-y += tests/libqos/virtio-scsi.o >+libqos-obj-y += tests/libqos/virtio-serial.o > > # Machines >-qos-test-obj-y += tests/libqos/aarch64-xlnx-zcu102-machine.o >-qos-test-obj-y += tests/libqos/arm-imx25-pdk-machine.o >-qos-test-obj-y += tests/libqos/arm-n800-machine.o >-qos-test-obj-y += tests/libqos/arm-raspi2-machine.o >-qos-test-obj-y += tests/libqos/arm-sabrelite-machine.o >-qos-test-obj-y += tests/libqos/arm-smdkc210-machine.o >-qos-test-obj-y += tests/libqos/arm-virt-machine.o >-qos-test-obj-y += tests/libqos/arm-xilinx-zynq-a9-machine.o >-qos-test-obj-y += tests/libqos/ppc64_pseries-machine.o >-qos-test-obj-y += tests/libqos/x86_64_pc-machine.o >+libqos-obj-y += tests/libqos/aarch64-xlnx-zcu102-machine.o >+libqos-obj-y += tests/libqos/arm-imx25-pdk-machine.o >+libqos-obj-y += tests/libqos/arm-n800-machine.o >+libqos-obj-y += tests/libqos/arm-raspi2-machine.o >+libqos-obj-y += tests/libqos/arm-sabrelite-machine.o >+libqos-obj-y += tests/libqos/arm-smdkc210-machine.o >+libqos-obj-y += tests/libqos/arm-virt-machine.o >+libqos-obj-y += tests/libqos/arm-xilinx-zynq-a9-machine.o >+libqos-obj-y += tests/libqos/ppc64_pseries-machine.o >+libqos-obj-y += tests/libqos/x86_64_pc-machine.o > > # Tests >+qos-test-obj-y = tests/qos-test.o > qos-test-obj-y += tests/ac97-test.o > qos-test-obj-y += tests/ds1338-test.o > qos-test-obj-y += tests/e1000-test.o >@@ -776,7 +777,7 @@ check-unit-y += tests/test-qgraph$(EXESUF) > tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) > > check-qtest-generic-y += tests/qos-test$(EXESUF) >-tests/qos-test$(EXESUF): $(qos-test-obj-y) >+tests/qos-test$(EXESUF): $(qos-test-obj-y) $(libqos-obj-y) > > tests/qmp-test$(EXESUF): tests/qmp-test.o > tests/qmp-cmd-test$(EXESUF): tests/qmp-cmd-test.o >-- >2.23.0 > >
diff --git a/tests/Makefile.include b/tests/Makefile.include index 67853d10c3..1517c4817e 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -699,52 +699,53 @@ tests/test-crypto-block$(EXESUF): tests/test-crypto-block.o $(test-crypto-obj-y) libqgraph-obj-y = tests/libqos/qgraph.o -libqos-obj-y = $(libqgraph-obj-y) tests/libqos/pci.o tests/libqos/fw_cfg.o -libqos-obj-y += tests/libqos/malloc.o -libqos-obj-y += tests/libqos/libqos.o -libqos-spapr-obj-y = $(libqos-obj-y) tests/libqos/malloc-spapr.o +libqos-core-obj-y = $(libqgraph-obj-y) tests/libqos/pci.o tests/libqos/fw_cfg.o +libqos-core-obj-y += tests/libqos/malloc.o +libqos-core-obj-y += tests/libqos/libqos.o +libqos-spapr-obj-y = $(libqos-core-obj-y) tests/libqos/malloc-spapr.o libqos-spapr-obj-y += tests/libqos/libqos-spapr.o libqos-spapr-obj-y += tests/libqos/rtas.o libqos-spapr-obj-y += tests/libqos/pci-spapr.o -libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o +libqos-pc-obj-y = $(libqos-core-obj-y) tests/libqos/pci-pc.o libqos-pc-obj-y += tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o libqos-pc-obj-y += tests/libqos/ahci.o libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/usb.o # Devices -qos-test-obj-y = tests/qos-test.o $(libqgraph-obj-y) -qos-test-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y) -qos-test-obj-y += tests/libqos/e1000e.o -qos-test-obj-y += tests/libqos/i2c.o -qos-test-obj-y += tests/libqos/i2c-imx.o -qos-test-obj-y += tests/libqos/i2c-omap.o -qos-test-obj-y += tests/libqos/sdhci.o -qos-test-obj-y += tests/libqos/tpci200.o -qos-test-obj-y += tests/libqos/virtio.o -qos-test-obj-$(CONFIG_VIRTFS) += tests/libqos/virtio-9p.o -qos-test-obj-y += tests/libqos/virtio-balloon.o -qos-test-obj-y += tests/libqos/virtio-blk.o -qos-test-obj-y += tests/libqos/virtio-mmio.o -qos-test-obj-y += tests/libqos/virtio-net.o -qos-test-obj-y += tests/libqos/virtio-pci.o -qos-test-obj-y += tests/libqos/virtio-pci-modern.o -qos-test-obj-y += tests/libqos/virtio-rng.o -qos-test-obj-y += tests/libqos/virtio-scsi.o -qos-test-obj-y += tests/libqos/virtio-serial.o +libqos-obj-y = $(libqgraph-obj-y) +libqos-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y) +libqos-obj-y += tests/libqos/e1000e.o +libqos-obj-y += tests/libqos/i2c.o +libqos-obj-y += tests/libqos/i2c-imx.o +libqos-obj-y += tests/libqos/i2c-omap.o +libqos-obj-y += tests/libqos/sdhci.o +libqos-obj-y += tests/libqos/tpci200.o +libqos-obj-y += tests/libqos/virtio.o +libqos-obj-$(CONFIG_VIRTFS) += tests/libqos/virtio-9p.o +libqos-obj-y += tests/libqos/virtio-balloon.o +libqos-obj-y += tests/libqos/virtio-blk.o +libqos-obj-y += tests/libqos/virtio-mmio.o +libqos-obj-y += tests/libqos/virtio-net.o +libqos-obj-y += tests/libqos/virtio-pci.o +libqos-obj-y += tests/libqos/virtio-pci-modern.o +libqos-obj-y += tests/libqos/virtio-rng.o +libqos-obj-y += tests/libqos/virtio-scsi.o +libqos-obj-y += tests/libqos/virtio-serial.o # Machines -qos-test-obj-y += tests/libqos/aarch64-xlnx-zcu102-machine.o -qos-test-obj-y += tests/libqos/arm-imx25-pdk-machine.o -qos-test-obj-y += tests/libqos/arm-n800-machine.o -qos-test-obj-y += tests/libqos/arm-raspi2-machine.o -qos-test-obj-y += tests/libqos/arm-sabrelite-machine.o -qos-test-obj-y += tests/libqos/arm-smdkc210-machine.o -qos-test-obj-y += tests/libqos/arm-virt-machine.o -qos-test-obj-y += tests/libqos/arm-xilinx-zynq-a9-machine.o -qos-test-obj-y += tests/libqos/ppc64_pseries-machine.o -qos-test-obj-y += tests/libqos/x86_64_pc-machine.o +libqos-obj-y += tests/libqos/aarch64-xlnx-zcu102-machine.o +libqos-obj-y += tests/libqos/arm-imx25-pdk-machine.o +libqos-obj-y += tests/libqos/arm-n800-machine.o +libqos-obj-y += tests/libqos/arm-raspi2-machine.o +libqos-obj-y += tests/libqos/arm-sabrelite-machine.o +libqos-obj-y += tests/libqos/arm-smdkc210-machine.o +libqos-obj-y += tests/libqos/arm-virt-machine.o +libqos-obj-y += tests/libqos/arm-xilinx-zynq-a9-machine.o +libqos-obj-y += tests/libqos/ppc64_pseries-machine.o +libqos-obj-y += tests/libqos/x86_64_pc-machine.o # Tests +qos-test-obj-y = tests/qos-test.o qos-test-obj-y += tests/ac97-test.o qos-test-obj-y += tests/ds1338-test.o qos-test-obj-y += tests/e1000-test.o @@ -776,7 +777,7 @@ check-unit-y += tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) check-qtest-generic-y += tests/qos-test$(EXESUF) -tests/qos-test$(EXESUF): $(qos-test-obj-y) +tests/qos-test$(EXESUF): $(qos-test-obj-y) $(libqos-obj-y) tests/qmp-test$(EXESUF): tests/qmp-test.o tests/qmp-cmd-test$(EXESUF): tests/qmp-cmd-test.o