Skip to contentSkip to conversation

Move qtests to a separate folder

PATCH In review Thomas Huth 2 participants 9 messages Dec 18, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover Move qtests to a separate folder

Our "tests" directory is very overcrowded - we store the qtests, unit test and other files there. That makes it difficult to determine which file belongs to each test subsystem, and the wildcards in the MAINTAINERS file are inaccurate, too.

Let's clean up this mess. The first patches disentangle some dependencies, and the last three patches then move the qtests and libqos (which is a subsystem of the qtests) to a new folder called "tests/qtest/".

v2:
- Rebase to current master branch
- Move all tests/tpm* files to tests/qtest (since they are part of the corresponding qtests)
- Double-checked all entries in MAINTAINERS, so they should hopefully be correct now

Thomas Huth (7):
tests/Makefile: test-char does not need libqtest tests/ptimer: Remove unnecessary inclusion of libqtest.h tests/Makefile: Remove 'tests/' and '$(EXESUF)' from the check-qtest
variables
tests/Makefile: Separate unit test dependencies from qtest
dependencies
test: Move qtests to a separate directory
tests/Makefile: Move qtest-related settings to a separate
Makefile.include
tests/libqos: Move the libqos files under tests/qtest/

 .gitlab-ci.yml                                |  11 +-
 MAINTAINERS                                   |  88 +++--
 configure                                     |   4 +-
 tests/Makefile.include                        | 334 +-----------------
 tests/ptimer-test.c                           |   1 -
 tests/qtest/Makefile.include                  | 310 ++++++++++++++++
 tests/{ => qtest}/ac97-test.c                 |   0
 tests/{ => qtest}/acpi-utils.c                |   0
 tests/{ => qtest}/acpi-utils.h                |   0
 tests/{ => qtest}/ahci-test.c                 |   0
 tests/{ => qtest}/arm-cpu-features.c          |   0
 .../bios-tables-test-allowed-diff.h           |   0
 tests/{ => qtest}/bios-tables-test.c          |   0
 tests/{ => qtest}/boot-order-test.c           |   0
 tests/{ => qtest}/boot-sector.c               |   0
 tests/{ => qtest}/boot-sector.h               |   0
 tests/{ => qtest}/boot-serial-test.c          |   0
 tests/{ => qtest}/cdrom-test.c                |   0
 tests/{ => qtest}/cpu-plug-test.c             |   0
 tests/{ => qtest}/device-introspect-test.c    |   0
 tests/{ => qtest}/device-plug-test.c          |   0
 tests/{ => qtest}/display-vga-test.c          |   0
 tests/{ => qtest}/drive_del-test.c            |   0
 tests/{ => qtest}/ds1338-test.c               |   0
 tests/{ => qtest}/e1000-test.c                |   0
 tests/{ => qtest}/e1000e-test.c               |   0
 tests/{ => qtest}/eepro100-test.c             |   0
 tests/{ => qtest}/endianness-test.c           |   0
 tests/{ => qtest}/es1370-test.c               |   0
 tests/{ => qtest}/fdc-test.c                  |   0
 tests/{ => qtest}/fw_cfg-test.c               |   0
 tests/{ => qtest}/hd-geo-test.c               |   0
 tests/{ => qtest}/hexloader-test.c            |   0
 tests/{ => qtest}/i440fx-test.c               |   0
 tests/{ => qtest}/i82801b11-test.c            |   0
 tests/{ => qtest}/ide-test.c                  |   0
 tests/{ => qtest}/intel-hda-test.c            |   0
 tests/{ => qtest}/ioh3420-test.c              |   0
 tests/{ => qtest}/ipmi-bt-test.c              |   0
 tests/{ => qtest}/ipmi-kcs-test.c             |   0
 tests/{ => qtest}/ipoctal232-test.c           |   0
 tests/{ => qtest}/ivshmem-test.c              |   0
 .../libqos/aarch64-xlnx-zcu102-machine.c      |   0
 tests/{ => qtest}/libqos/ahci.c               |   0
 tests/{ => qtest}/libqos/ahci.h               |   0
 .../libqos/arm-imx25-pdk-machine.c            |   0
 tests/{ => qtest}/libqos/arm-n800-machine.c   |   0
 tests/{ => qtest}/libqos/arm-raspi2-machine.c |   0
 .../libqos/arm-sabrelite-machine.c            |   0
 .../{ => qtest}/libqos/arm-smdkc210-machine.c |   0
 tests/{ => qtest}/libqos/arm-virt-machine.c   |   0
 .../libqos/arm-xilinx-zynq-a9-machine.c       |   0
 tests/{ => qtest}/libqos/e1000e.c             |   0
 tests/{ => qtest}/libqos/e1000e.h             |   0
 tests/{ => qtest}/libqos/fw_cfg.c             |   0
 tests/{ => qtest}/libqos/fw_cfg.h             |   0
 tests/{ => qtest}/libqos/i2c-imx.c            |   0
 tests/{ => qtest}/libqos/i2c-omap.c           |   0
 tests/{ => qtest}/libqos/i2c.c                |   0
 tests/{ => qtest}/libqos/i2c.h                |   0
 tests/{ => qtest}/libqos/libqos-pc.c          |   0
 tests/{ => qtest}/libqos/libqos-pc.h          |   0
 tests/{ => qtest}/libqos/libqos-spapr.c       |   0
 tests/{ => qtest}/libqos/libqos-spapr.h       |   0
 tests/{ => qtest}/libqos/libqos.c             |   0
 tests/{ => qtest}/libqos/libqos.h             |   0
 tests/{ => qtest}/libqos/malloc-pc.c          |   0
 tests/{ => qtest}/libqos/malloc-pc.h          |   0
 tests/{ => qtest}/libqos/malloc-spapr.c       |   0
 tests/{ => qtest}/libqos/malloc-spapr.h       |   0
 tests/{ => qtest}/libqos/malloc.c             |   0
 tests/{ => qtest}/libqos/malloc.h             |   0
 tests/{ => qtest}/libqos/pci-pc.c             |   0
 tests/{ => qtest}/libqos/pci-pc.h             |   0
 tests/{ => qtest}/libqos/pci-spapr.c          |   0
 tests/{ => qtest}/libqos/pci-spapr.h          |   0
 tests/{ => qtest}/libqos/pci.c                |   0
 tests/{ => qtest}/libqos/pci.h                |   0
 .../libqos/ppc64_pseries-machine.c            |   0
 tests/{ => qtest}/libqos/qgraph.c             |   0
 tests/{ => qtest}/libqos/qgraph.h             |   0
 tests/{ => qtest}/libqos/qgraph_internal.h    |   0
 tests/{ => qtest}/libqos/rtas.c               |   0
 tests/{ => qtest}/libqos/rtas.h               |   0
 tests/{ => qtest}/libqos/sdhci.c              |   0
 tests/{ => qtest}/libqos/sdhci.h              |   0
 tests/{ => qtest}/libqos/tpci200.c            |   0
 tests/{ => qtest}/libqos/usb.c                |   0
 tests/{ => qtest}/libqos/usb.h                |   0
 tests/{ => qtest}/libqos/virtio-9p.c          |   0
 tests/{ => qtest}/libqos/virtio-9p.h          |   0
 tests/{ => qtest}/libqos/virtio-balloon.c     |   0
 tests/{ => qtest}/libqos/virtio-balloon.h     |   0
 tests/{ => qtest}/libqos/virtio-blk.c         |   0
 tests/{ => qtest}/libqos/virtio-blk.h         |   0
 tests/{ => qtest}/libqos/virtio-mmio.c        |   0
 tests/{ => qtest}/libqos/virtio-mmio.h        |   0
 tests/{ => qtest}/libqos/virtio-net.c         |   0
 tests/{ => qtest}/libqos/virtio-net.h         |   0
 tests/{ => qtest}/libqos/virtio-pci-modern.c  |   0
 tests/{ => qtest}/libqos/virtio-pci-modern.h  |   0
 tests/{ => qtest}/libqos/virtio-pci.c         |   0
 tests/{ => qtest}/libqos/virtio-pci.h         |   0
 tests/{ => qtest}/libqos/virtio-rng.c         |   0
 tests/{ => qtest}/libqos/virtio-rng.h         |   0
 tests/{ => qtest}/libqos/virtio-scsi.c        |   0
 tests/{ => qtest}/libqos/virtio-scsi.h        |   0
 tests/{ => qtest}/libqos/virtio-serial.c      |   0
 tests/{ => qtest}/libqos/virtio-serial.h      |   0
 tests/{ => qtest}/libqos/virtio.c             |   0
 tests/{ => qtest}/libqos/virtio.h             |   0
 tests/{ => qtest}/libqos/x86_64_pc-machine.c  |   0
 tests/{ => qtest}/libqtest-single.h           |   0
 tests/{ => qtest}/libqtest.c                  |   0
 tests/{ => qtest}/libqtest.h                  |   0
 tests/{ => qtest}/m25p80-test.c               |   0
 tests/{ => qtest}/m48t59-test.c               |   0
 tests/{ => qtest}/machine-none-test.c         |   0
 tests/{ => qtest}/megasas-test.c              |   0
 tests/{ => qtest}/microbit-test.c             |   0
 tests/{ => qtest}/migration-test.c            |   0
 tests/{ => qtest}/modules-test.c              |   0
 tests/{ => qtest}/ne2000-test.c               |   0
 tests/{ => qtest}/numa-test.c                 |   0
 tests/{ => qtest}/nvme-test.c                 |   0
 tests/{ => qtest}/pca9552-test.c              |   0
 tests/{ => qtest}/pci-test.c                  |   0
 tests/{ => qtest}/pcnet-test.c                |   0
 tests/{ => qtest}/pflash-cfi02-test.c         |   0
 tests/{ => qtest}/pnv-xscom-test.c            |   0
 tests/{ => qtest}/prom-env-test.c             |   0
 tests/{ => qtest}/pvpanic-test.c              |   0
 tests/{ => qtest}/pxe-test.c                  |   0
 tests/{ => qtest}/q35-test.c                  |   0
 tests/{ => qtest}/qmp-cmd-test.c              |   0
 tests/{ => qtest}/qmp-test.c                  |   0
 tests/{ => qtest}/qom-test.c                  |   0
 tests/{ => qtest}/qos-test.c                  |   0
 tests/{ => qtest}/rtas-test.c                 |   0
 tests/{ => qtest}/rtc-test.c                  |   0
 tests/{ => qtest}/rtl8139-test.c              |   0
 tests/{ => qtest}/sdhci-test.c                |   0
 tests/{ => qtest}/spapr-phb-test.c            |   0
 tests/{ => qtest}/tco-test.c                  |   0
 tests/{ => qtest}/test-arm-mptimer.c          |   0
 tests/{ => qtest}/test-filter-mirror.c        |   0
 tests/{ => qtest}/test-filter-redirector.c    |   0
 tests/{ => qtest}/test-hmp.c                  |   0
 tests/{ => qtest}/test-netfilter.c            |   0
 tests/{ => qtest}/test-x86-cpuid-compat.c     |   0
 tests/{ => qtest}/tmp105-test.c               |   0
 tests/{ => qtest}/tpm-crb-swtpm-test.c        |   0
 tests/{ => qtest}/tpm-crb-test.c              |   0
 tests/{ => qtest}/tpm-emu.c                   |   0
 tests/{ => qtest}/tpm-emu.h                   |   0
 tests/{ => qtest}/tpm-tests.c                 |   0
 tests/{ => qtest}/tpm-tests.h                 |   0
 tests/{ => qtest}/tpm-tis-swtpm-test.c        |   0
 tests/{ => qtest}/tpm-tis-test.c              |   0
 tests/{ => qtest}/tpm-util.c                  |   0
 tests/{ => qtest}/tpm-util.h                  |   0
 tests/{ => qtest}/usb-hcd-ehci-test.c         |   0
 tests/{ => qtest}/usb-hcd-ohci-test.c         |   0
 tests/{ => qtest}/usb-hcd-uhci-test.c         |   0
 tests/{ => qtest}/usb-hcd-xhci-test.c         |   0
 tests/{ => qtest}/vhost-user-test.c           |   0
 tests/{ => qtest}/virtio-9p-test.c            |   0
 tests/{ => qtest}/virtio-blk-test.c           |   0
 tests/{ => qtest}/virtio-ccw-test.c           |   0
 tests/{ => qtest}/virtio-net-test.c           |   0
 tests/{ => qtest}/virtio-rng-test.c           |   0
 tests/{ => qtest}/virtio-scsi-test.c          |   0
 tests/{ => qtest}/virtio-serial-test.c        |   0
 tests/{ => qtest}/virtio-test.c               |   0
 tests/{ => qtest}/vmgenid-test.c              |   0
 tests/{ => qtest}/vmxnet3-test.c              |   0
 tests/{ => qtest}/wdt_ib700-test.c            |   0
 177 files changed, 374 insertions(+), 374 deletions(-)
 create mode 100644 tests/qtest/Makefile.include
 rename tests/{ => qtest}/ac97-test.c (100%)
 rename tests/{ => qtest}/acpi-utils.c (100%)
 rename tests/{ => qtest}/acpi-utils.h (100%)
 rename tests/{ => qtest}/ahci-test.c (100%)
 rename tests/{ => qtest}/arm-cpu-features.c (100%)
 rename tests/{ => qtest}/bios-tables-test-allowed-diff.h (100%)
 rename tests/{ => qtest}/bios-tables-test.c (100%)
 rename tests/{ => qtest}/boot-order-test.c (100%)
 rename tests/{ => qtest}/boot-sector.c (100%)
 rename tests/{ => qtest}/boot-sector.h (100%)
 rename tests/{ => qtest}/boot-serial-test.c (100%)
 rename tests/{ => qtest}/cdrom-test.c (100%)
 rename tests/{ => qtest}/cpu-plug-test.c (100%)
 rename tests/{ => qtest}/device-introspect-test.c (100%)
 rename tests/{ => qtest}/device-plug-test.c (100%)
 rename tests/{ => qtest}/display-vga-test.c (100%)
 rename tests/{ => qtest}/drive_del-test.c (100%)
 rename tests/{ => qtest}/ds1338-test.c (100%)
 rename tests/{ => qtest}/e1000-test.c (100%)
 rename tests/{ => qtest}/e1000e-test.c (100%)
 rename tests/{ => qtest}/eepro100-test.c (100%)
 rename tests/{ => qtest}/endianness-test.c (100%)
 rename tests/{ => qtest}/es1370-test.c (100%)
 rename tests/{ => qtest}/fdc-test.c (100%)
 rename tests/{ => qtest}/fw_cfg-test.c (100%)
 rename tests/{ => qtest}/hd-geo-test.c (100%)
 rename tests/{ => qtest}/hexloader-test.c (100%)
 rename tests/{ => qtest}/i440fx-test.c (100%)
 rename tests/{ => qtest}/i82801b11-test.c (100%)
 rename tests/{ => qtest}/ide-test.c (100%)
 rename tests/{ => qtest}/intel-hda-test.c (100%)
 rename tests/{ => qtest}/ioh3420-test.c (100%)
 rename tests/{ => qtest}/ipmi-bt-test.c (100%)
 rename tests/{ => qtest}/ipmi-kcs-test.c (100%)
 rename tests/{ => qtest}/ipoctal232-test.c (100%)
 rename tests/{ => qtest}/ivshmem-test.c (100%)
 rename tests/{ => qtest}/libqos/aarch64-xlnx-zcu102-machine.c (100%)
 rename tests/{ => qtest}/libqos/ahci.c (100%)
 rename tests/{ => qtest}/libqos/ahci.h (100%)
 rename tests/{ => qtest}/libqos/arm-imx25-pdk-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-n800-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-raspi2-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-sabrelite-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-smdkc210-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-virt-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-xilinx-zynq-a9-machine.c (100%)
 rename tests/{ => qtest}/libqos/e1000e.c (100%)
 rename tests/{ => qtest}/libqos/e1000e.h (100%)
 rename tests/{ => qtest}/libqos/fw_cfg.c (100%)
 rename tests/{ => qtest}/libqos/fw_cfg.h (100%)
 rename tests/{ => qtest}/libqos/i2c-imx.c (100%)
 rename tests/{ => qtest}/libqos/i2c-omap.c (100%)
 rename tests/{ => qtest}/libqos/i2c.c (100%)
 rename tests/{ => qtest}/libqos/i2c.h (100%)
 rename tests/{ => qtest}/libqos/libqos-pc.c (100%)
 rename tests/{ => qtest}/libqos/libqos-pc.h (100%)
 rename tests/{ => qtest}/libqos/libqos-spapr.c (100%)
 rename tests/{ => qtest}/libqos/libqos-spapr.h (100%)
 rename tests/{ => qtest}/libqos/libqos.c (100%)
 rename tests/{ => qtest}/libqos/libqos.h (100%)
 rename tests/{ => qtest}/libqos/malloc-pc.c (100%)
 rename tests/{ => qtest}/libqos/malloc-pc.h (100%)
 rename tests/{ => qtest}/libqos/malloc-spapr.c (100%)
 rename tests/{ => qtest}/libqos/malloc-spapr.h (100%)
 rename tests/{ => qtest}/libqos/malloc.c (100%)
 rename tests/{ => qtest}/libqos/malloc.h (100%)
 rename tests/{ => qtest}/libqos/pci-pc.c (100%)
 rename tests/{ => qtest}/libqos/pci-pc.h (100%)
 rename tests/{ => qtest}/libqos/pci-spapr.c (100%)
 rename tests/{ => qtest}/libqos/pci-spapr.h (100%)
 rename tests/{ => qtest}/libqos/pci.c (100%)
 rename tests/{ => qtest}/libqos/pci.h (100%)
 rename tests/{ => qtest}/libqos/ppc64_pseries-machine.c (100%)
 rename tests/{ => qtest}/libqos/qgraph.c (100%)
 rename tests/{ => qtest}/libqos/qgraph.h (100%)
 rename tests/{ => qtest}/libqos/qgraph_internal.h (100%)
 rename tests/{ => qtest}/libqos/rtas.c (100%)
 rename tests/{ => qtest}/libqos/rtas.h (100%)
 rename tests/{ => qtest}/libqos/sdhci.c (100%)
 rename tests/{ => qtest}/libqos/sdhci.h (100%)
 rename tests/{ => qtest}/libqos/tpci200.c (100%)
 rename tests/{ => qtest}/libqos/usb.c (100%)
 rename tests/{ => qtest}/libqos/usb.h (100%)
 rename tests/{ => qtest}/libqos/virtio-9p.c (100%)
 rename tests/{ => qtest}/libqos/virtio-9p.h (100%)
 rename tests/{ => qtest}/libqos/virtio-balloon.c (100%)
 rename tests/{ => qtest}/libqos/virtio-balloon.h (100%)
 rename tests/{ => qtest}/libqos/virtio-blk.c (100%)
 rename tests/{ => qtest}/libqos/virtio-blk.h (100%)
 rename tests/{ => qtest}/libqos/virtio-mmio.c (100%)
 rename tests/{ => qtest}/libqos/virtio-mmio.h (100%)
 rename tests/{ => qtest}/libqos/virtio-net.c (100%)
 rename tests/{ => qtest}/libqos/virtio-net.h (100%)
 rename tests/{ => qtest}/libqos/virtio-pci-modern.c (100%)
 rename tests/{ => qtest}/libqos/virtio-pci-modern.h (100%)
 rename tests/{ => qtest}/libqos/virtio-pci.c (100%)
 rename tests/{ => qtest}/libqos/virtio-pci.h (100%)
 rename tests/{ => qtest}/libqos/virtio-rng.c (100%)
 rename tests/{ => qtest}/libqos/virtio-rng.h (100%)
 rename tests/{ => qtest}/libqos/virtio-scsi.c (100%)
 rename tests/{ => qtest}/libqos/virtio-scsi.h (100%)
 rename tests/{ => qtest}/libqos/virtio-serial.c (100%)
 rename tests/{ => qtest}/libqos/virtio-serial.h (100%)
 rename tests/{ => qtest}/libqos/virtio.c (100%)
 rename tests/{ => qtest}/libqos/virtio.h (100%)
 rename tests/{ => qtest}/libqos/x86_64_pc-machine.c (100%)
 rename tests/{ => qtest}/libqtest-single.h (100%)
 rename tests/{ => qtest}/libqtest.c (100%)
 rename tests/{ => qtest}/libqtest.h (100%)
 rename tests/{ => qtest}/m25p80-test.c (100%)
 rename tests/{ => qtest}/m48t59-test.c (100%)
 rename tests/{ => qtest}/machine-none-test.c (100%)
 rename tests/{ => qtest}/megasas-test.c (100%)
 rename tests/{ => qtest}/microbit-test.c (100%)
 rename tests/{ => qtest}/migration-test.c (100%)
 rename tests/{ => qtest}/modules-test.c (100%)
 rename tests/{ => qtest}/ne2000-test.c (100%)
 rename tests/{ => qtest}/numa-test.c (100%)
 rename tests/{ => qtest}/nvme-test.c (100%)
 rename tests/{ => qtest}/pca9552-test.c (100%)
 rename tests/{ => qtest}/pci-test.c (100%)
 rename tests/{ => qtest}/pcnet-test.c (100%)
 rename tests/{ => qtest}/pflash-cfi02-test.c (100%)
 rename tests/{ => qtest}/pnv-xscom-test.c (100%)
 rename tests/{ => qtest}/prom-env-test.c (100%)
 rename tests/{ => qtest}/pvpanic-test.c (100%)
 rename tests/{ => qtest}/pxe-test.c (100%)
 rename tests/{ => qtest}/q35-test.c (100%)
 rename tests/{ => qtest}/qmp-cmd-test.c (100%)
 rename tests/{ => qtest}/qmp-test.c (100%)
 rename tests/{ => qtest}/qom-test.c (100%)
 rename tests/{ => qtest}/qos-test.c (100%)
 rename tests/{ => qtest}/rtas-test.c (100%)
 rename tests/{ => qtest}/rtc-test.c (100%)
 rename tests/{ => qtest}/rtl8139-test.c (100%)
 rename tests/{ => qtest}/sdhci-test.c (100%)
 rename tests/{ => qtest}/spapr-phb-test.c (100%)
 rename tests/{ => qtest}/tco-test.c (100%)
 rename tests/{ => qtest}/test-arm-mptimer.c (100%)
 rename tests/{ => qtest}/test-filter-mirror.c (100%)
 rename tests/{ => qtest}/test-filter-redirector.c (100%)
 rename tests/{ => qtest}/test-hmp.c (100%)
 rename tests/{ => qtest}/test-netfilter.c (100%)
 rename tests/{ => qtest}/test-x86-cpuid-compat.c (100%)
 rename tests/{ => qtest}/tmp105-test.c (100%)
 rename tests/{ => qtest}/tpm-crb-swtpm-test.c (100%)
 rename tests/{ => qtest}/tpm-crb-test.c (100%)
 rename tests/{ => qtest}/tpm-emu.c (100%)
 rename tests/{ => qtest}/tpm-emu.h (100%)
 rename tests/{ => qtest}/tpm-tests.c (100%)
 rename tests/{ => qtest}/tpm-tests.h (100%)
 rename tests/{ => qtest}/tpm-tis-swtpm-test.c (100%)
 rename tests/{ => qtest}/tpm-tis-test.c (100%)
 rename tests/{ => qtest}/tpm-util.c (100%)
 rename tests/{ => qtest}/tpm-util.h (100%)
 rename tests/{ => qtest}/usb-hcd-ehci-test.c (100%)
 rename tests/{ => qtest}/usb-hcd-ohci-test.c (100%)
 rename tests/{ => qtest}/usb-hcd-uhci-test.c (100%)
 rename tests/{ => qtest}/usb-hcd-xhci-test.c (100%)
 rename tests/{ => qtest}/vhost-user-test.c (100%)
 rename tests/{ => qtest}/virtio-9p-test.c (100%)
 rename tests/{ => qtest}/virtio-blk-test.c (100%)
 rename tests/{ => qtest}/virtio-ccw-test.c (100%)
 rename tests/{ => qtest}/virtio-net-test.c (100%)
 rename tests/{ => qtest}/virtio-rng-test.c (100%)
 rename tests/{ => qtest}/virtio-scsi-test.c (100%)
 rename tests/{ => qtest}/virtio-serial-test.c (100%)
 rename tests/{ => qtest}/virtio-test.c (100%)
 rename tests/{ => qtest}/vmgenid-test.c (100%)
 rename tests/{ => qtest}/vmxnet3-test.c (100%)
 rename tests/{ => qtest}/wdt_ib700-test.c (100%)
Signature · 1 line
2.18.1
#1 lore raw

PATCH v2 1/7 tests/Makefile: test-char does not need libqtest

No need to link the libqtest objects here.

---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.include +1 -1
index b381387048..16eb4aa7ba 100644
@@ -538,7 +538,7 @@ tests/check-qlit$(EXESUF): tests/check-qlit.o $(test-util-obj-y)
 tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom-obj-y)
 tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-obj-y)
 
-tests/test-char$(EXESUF): tests/test-char.o $(test-util-obj-y) $(qtest-obj-y) $(test-io-obj-y) $(chardev-obj-y) tests/socket-helpers.o
+tests/test-char$(EXESUF): tests/test-char.o $(test-util-obj-y) $(test-io-obj-y) $(chardev-obj-y) tests/socket-helpers.o
 tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y)
 tests/test-aio$(EXESUF): tests/test-aio.o $(test-block-obj-y)
 tests/test-aio-multithread$(EXESUF): tests/test-aio-multithread.o $(test-block-obj-y)
Signature · 1 line
2.18.1
#2 lore raw

PATCH v2 2/7 tests/ptimer: Remove unnecessary inclusion of libqtest.h

In reply to Thomas Huth

ptimer-test is a unit test, not a qtest, so libqtest.h is not required here.

---
 tests/ptimer-test.c | 1 -
 1 file changed, 1 deletion(-)
tests/ptimer-test.c +0 -1
index e16c30ce57..9176b96c1c 100644
@@ -14,7 +14,6 @@
 #include "qemu/main-loop.h"
 #include "hw/ptimer.h"
 
-#include "libqtest.h"
 #include "ptimer-test.h"
 
 static bool triggered;
Signature · 1 line
2.18.1
#3 lore raw

PATCH v2 3/7 tests/Makefile: Remove 'tests/' and '$(EXESUF)' from the check-qtest variables

In reply to Thomas Huth

It's much easier if we simply add the folder prefix and the exe suffix later via a substitution instead.

---
 tests/Makefile.include | 258 +++++++++++++++++++++--------------------
 1 file changed, 130 insertions(+), 128 deletions(-)
tests/Makefile.include +130 -128
index 16eb4aa7ba..9992e0e58c 100644
@@ -152,151 +152,153 @@ check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) += tests/check-block.
 # All QTests for now are POSIX-only, but the dependencies are
 # really in libqtest, not in the testcases themselves.
 
-check-qtest-generic-y += tests/qmp-test$(EXESUF)
-check-qtest-generic-y += tests/qmp-cmd-test$(EXESUF)
-check-qtest-generic-$(CONFIG_MODULES) += tests/modules-test$(EXESUF)
-
-check-qtest-generic-y += tests/device-introspect-test$(EXESUF)
-check-qtest-generic-y += tests/cdrom-test$(EXESUF)
-
-check-qtest-pci-$(CONFIG_RTL8139_PCI) += tests/rtl8139-test$(EXESUF)
-check-qtest-pci-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
-check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
-check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
-
-check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-check-qtest-i386-y += tests/fdc-test$(EXESUF)
-check-qtest-i386-y += tests/ide-test$(EXESUF)
-check-qtest-i386-y += tests/ahci-test$(EXESUF)
-check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
-check-qtest-i386-y += tests/boot-order-test$(EXESUF)
-check-qtest-i386-y += tests/bios-tables-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-$(CONFIG_ISA_IPMI_KCS) += tests/ipmi-kcs-test$(EXESUF)
+check-qtest-generic-y += qmp-test
+check-qtest-generic-y += qmp-cmd-test
+check-qtest-generic-$(CONFIG_MODULES) += modules-test
+
+check-qtest-generic-y += device-introspect-test
+check-qtest-generic-y += cdrom-test
+
+check-qtest-pci-$(CONFIG_RTL8139_PCI) += rtl8139-test
+check-qtest-pci-$(CONFIG_VGA) += display-vga-test
+check-qtest-pci-$(CONFIG_HDA) += intel-hda-test
+check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += ivshmem-test
+
+check-qtest-i386-$(CONFIG_ISA_TESTDEV) = endianness-test
+check-qtest-i386-y += fdc-test
+check-qtest-i386-y += ide-test
+check-qtest-i386-y += ahci-test
+check-qtest-i386-y += hd-geo-test
+check-qtest-i386-y += boot-order-test
+check-qtest-i386-y += bios-tables-test
+check-qtest-i386-$(CONFIG_SGA) += boot-serial-test
+check-qtest-i386-$(CONFIG_SLIRP) += pxe-test
+check-qtest-i386-y += rtc-test
+check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) += ipmi-kcs-test
 ifdef CONFIG_LINUX
-check-qtest-i386-$(CONFIG_ISA_IPMI_BT) += tests/ipmi-bt-test$(EXESUF)
+check-qtest-i386-$(CONFIG_ISA_IPMI_BT) += ipmi-bt-test
 endif
-check-qtest-i386-y += tests/i440fx-test$(EXESUF)
-check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
-check-qtest-i386-y += tests/device-plug-test$(EXESUF)
-check-qtest-i386-y += tests/drive_del-test$(EXESUF)
-check-qtest-i386-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF)
-check-qtest-i386-y += tests/tco-test$(EXESUF)
+check-qtest-i386-y += i440fx-test
+check-qtest-i386-y += fw_cfg-test
+check-qtest-i386-y += device-plug-test
+check-qtest-i386-y += drive_del-test
+check-qtest-i386-$(CONFIG_WDT_IB700) += wdt_ib700-test
+check-qtest-i386-y += tco-test
 check-qtest-i386-y += $(check-qtest-pci-y)
-check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
-check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
-check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
-check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
-check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += tests/usb-hcd-ehci-test$(EXESUF)
-check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
-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)
-check-qtest-i386-$(CONFIG_TPM_CRB) += tests/tpm-crb-swtpm-test$(EXESUF)
-check-qtest-i386-$(CONFIG_TPM_CRB) += tests/tpm-crb-test$(EXESUF)
-check-qtest-i386-$(CONFIG_TPM_TIS) += tests/tpm-tis-swtpm-test$(EXESUF)
-check-qtest-i386-$(CONFIG_TPM_TIS) += 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_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)
+check-qtest-i386-$(CONFIG_PVPANIC) += pvpanic-test
+check-qtest-i386-$(CONFIG_I82801B11) += i82801b11-test
+check-qtest-i386-$(CONFIG_IOH3420) += ioh3420-test
+check-qtest-i386-$(CONFIG_USB_UHCI) += usb-hcd-uhci-test
+check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += usb-hcd-ehci-test
+check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += usb-hcd-xhci-test
+check-qtest-i386-y += cpu-plug-test
+check-qtest-i386-y += q35-test
+check-qtest-i386-y += vmgenid-test
+check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test
+check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test
+check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-swtpm-test
+check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-test
+check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter
+check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror
+check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector
+check-qtest-i386-y += migration-test
+check-qtest-i386-y += test-x86-cpuid-compat
+check-qtest-i386-y += numa-test
+
 check-qtest-x86_64-y += $(check-qtest-i386-y)
 
-check-qtest-alpha-y += tests/boot-serial-test$(EXESUF)
-check-qtest-alpha-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
+check-qtest-alpha-y += boot-serial-test
+check-qtest-alpha-$(CONFIG_VGA) += display-vga-test
 
-check-qtest-hppa-y += tests/boot-serial-test$(EXESUF)
-check-qtest-hppa-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
+check-qtest-hppa-y += boot-serial-test
+check-qtest-hppa-$(CONFIG_VGA) += display-vga-test
 
-check-qtest-m68k-y = tests/boot-serial-test$(EXESUF)
+check-qtest-m68k-y = boot-serial-test
 
-check-qtest-microblaze-y += tests/boot-serial-test$(EXESUF)
+check-qtest-microblaze-y += boot-serial-test
 
-check-qtest-mips-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-check-qtest-mips-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
+check-qtest-mips-$(CONFIG_ISA_TESTDEV) = endianness-test
+check-qtest-mips-$(CONFIG_VGA) += display-vga-test
 
-check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-check-qtest-mips64-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
+check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = endianness-test
+check-qtest-mips64-$(CONFIG_VGA) += display-vga-test
 
-check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-check-qtest-mips64el-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
+check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) = endianness-test
+check-qtest-mips64el-$(CONFIG_VGA) += display-vga-test
 
-check-qtest-moxie-y += tests/boot-serial-test$(EXESUF)
+check-qtest-moxie-y += boot-serial-test
 
-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)
-check-qtest-ppc-y += tests/boot-serial-test$(EXESUF)
-check-qtest-ppc-$(CONFIG_M48T59) += tests/m48t59-test$(EXESUF)
+check-qtest-ppc-$(CONFIG_ISA_TESTDEV) = endianness-test
+check-qtest-ppc-y += boot-order-test
+check-qtest-ppc-y += prom-env-test
+check-qtest-ppc-y += drive_del-test
+check-qtest-ppc-y += boot-serial-test
+check-qtest-ppc-$(CONFIG_M48T59) += m48t59-test
 
 check-qtest-ppc64-y += $(check-qtest-ppc-y)
-check-qtest-ppc64-$(CONFIG_PSERIES) += tests/device-plug-test$(EXESUF)
-check-qtest-ppc64-$(CONFIG_POWERNV) += tests/pnv-xscom-test$(EXESUF)
-check-qtest-ppc64-y += tests/migration-test$(EXESUF)
-check-qtest-ppc64-$(CONFIG_PSERIES) += tests/rtas-test$(EXESUF)
-check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
-check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
-check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
-check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
-check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
-check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
-check-qtest-ppc64-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
-check-qtest-ppc64-y += tests/numa-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)
-
-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)
-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)
-
-check-qtest-arm-y += tests/arm-cpu-features$(EXESUF)
-check-qtest-arm-y += tests/microbit-test$(EXESUF)
-check-qtest-arm-y += tests/m25p80-test$(EXESUF)
-check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF)
-check-qtest-arm-y += tests/boot-serial-test$(EXESUF)
-check-qtest-arm-y += tests/hexloader-test$(EXESUF)
-check-qtest-arm-$(CONFIG_PFLASH_CFI02) += tests/pflash-cfi02-test$(EXESUF)
-
-check-qtest-aarch64-y += tests/arm-cpu-features$(EXESUF)
-check-qtest-aarch64-y += tests/numa-test$(EXESUF)
-check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
-check-qtest-aarch64-y += tests/migration-test$(EXESUF)
+check-qtest-ppc64-$(CONFIG_PSERIES) += device-plug-test
+check-qtest-ppc64-$(CONFIG_POWERNV) += pnv-xscom-test
+check-qtest-ppc64-y += migration-test
+check-qtest-ppc64-$(CONFIG_PSERIES) += rtas-test
+check-qtest-ppc64-$(CONFIG_SLIRP) += pxe-test
+check-qtest-ppc64-$(CONFIG_USB_UHCI) += usb-hcd-uhci-test
+check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += usb-hcd-xhci-test
+check-qtest-ppc64-$(CONFIG_SLIRP) += test-netfilter
+check-qtest-ppc64-$(CONFIG_POSIX) += test-filter-mirror
+check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += test-filter-redirector
+check-qtest-ppc64-$(CONFIG_VGA) += display-vga-test
+check-qtest-ppc64-y += numa-test
+check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += ivshmem-test
+check-qtest-ppc64-y += cpu-plug-test
+
+check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = endianness-test
+
+check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) = endianness-test
+
+check-qtest-sparc-y += prom-env-test
+check-qtest-sparc-y += m48t59-test
+check-qtest-sparc-y += boot-serial-test
+
+check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) = endianness-test
+check-qtest-sparc64-y += prom-env-test
+check-qtest-sparc64-y += boot-serial-test
+
+check-qtest-arm-y += arm-cpu-features
+check-qtest-arm-y += microbit-test
+check-qtest-arm-y += m25p80-test
+check-qtest-arm-y += test-arm-mptimer
+check-qtest-arm-y += boot-serial-test
+check-qtest-arm-y += hexloader-test
+check-qtest-arm-$(CONFIG_PFLASH_CFI02) += pflash-cfi02-test
+
+check-qtest-aarch64-y += arm-cpu-features
+check-qtest-aarch64-y += numa-test
+check-qtest-aarch64-y += boot-serial-test
+check-qtest-aarch64-y += migration-test
+
 # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditional
 ifneq ($(ARCH),arm)
-check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
+check-qtest-aarch64-y += bios-tables-test
 endif
 
 check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
 
 check-qtest-xtensaeb-y += $(check-qtest-xtensa-y)
 
-check-qtest-s390x-y = tests/boot-serial-test$(EXESUF)
-check-qtest-s390x-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
-check-qtest-s390x-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
-check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
-check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
-check-qtest-s390x-y += tests/drive_del-test$(EXESUF)
-check-qtest-s390x-y += tests/device-plug-test$(EXESUF)
-check-qtest-s390x-y += tests/virtio-ccw-test$(EXESUF)
-check-qtest-s390x-y += tests/cpu-plug-test$(EXESUF)
-check-qtest-s390x-y += tests/migration-test$(EXESUF)
-
-check-qtest-generic-y += tests/machine-none-test$(EXESUF)
-check-qtest-generic-y += tests/qom-test$(EXESUF)
-check-qtest-generic-y += tests/test-hmp$(EXESUF)
+check-qtest-s390x-y = boot-serial-test
+check-qtest-s390x-$(CONFIG_SLIRP) += pxe-test
+check-qtest-s390x-$(CONFIG_SLIRP) += test-netfilter
+check-qtest-s390x-$(CONFIG_POSIX) += test-filter-mirror
+check-qtest-s390x-$(CONFIG_POSIX) += test-filter-redirector
+check-qtest-s390x-y += drive_del-test
+check-qtest-s390x-y += device-plug-test
+check-qtest-s390x-y += virtio-ccw-test
+check-qtest-s390x-y += cpu-plug-test
+check-qtest-s390x-y += migration-test
+
+check-qtest-generic-y += machine-none-test
+check-qtest-generic-y += qom-test
+check-qtest-generic-y += test-hmp
 
 qapi-schema += alternate-any.json
 qapi-schema += alternate-array.json
@@ -778,7 +780,7 @@ qos-test-obj-y += tests/vmxnet3-test.o
 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)
+check-qtest-generic-y += qos-test
 tests/qos-test$(EXESUF): $(qos-test-obj-y)
 
 tests/qmp-test$(EXESUF): tests/qmp-test.o
@@ -862,8 +864,8 @@ tests/migration/initrd-stress.img: tests/migration/stress$(EXESUF)
 TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
 ifeq ($(CONFIG_POSIX),y)
 QTEST_TARGETS = $(TARGETS)
-check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
-check-qtest-y += $(check-qtest-generic-y)
+check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%=tests/%$(EXESUF)))
+check-qtest-y += $(check-qtest-generic-y:%=tests/%$(EXESUF))
 else
 QTEST_TARGETS =
 endif
@@ -913,7 +915,7 @@ endef
 
 .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS))
 $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/all $(check-qtest-y)
-	$(call do_test_human,$(check-qtest-$*-y) $(check-qtest-generic-y), \
+	$(call do_test_human,$(check-qtest-$*-y:%=tests/%$(EXESUF)) $(check-qtest-generic-y:%=tests/%$(EXESUF)), \
 	  QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
 	  QTEST_QEMU_IMG=qemu-img$(EXESUF))
 
@@ -926,7 +928,7 @@ check-speed: $(check-speed-y)
 # gtester tests with TAP output
 
 $(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qtest-%.tap: %-softmmu/all $(check-qtest-y)
-	$(call do_test_tap, $(check-qtest-$*-y) $(check-qtest-generic-y), \
+	$(call do_test_tap, $(check-qtest-$*-y:%=tests/%$(EXESUF)) $(check-qtest-generic-y:%=tests/%$(EXESUF)), \
 	  QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
 	  QTEST_QEMU_IMG=qemu-img$(EXESUF))
 
@@ -1195,7 +1197,7 @@ check-block: $(patsubst %,check-%, $(check-block-y))
 check: check-block check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
 check-clean:
 	rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
-	rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
+	rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y:%=tests/%$(EXESUF))) $(check-qtest-generic-y:%=tests/%$(EXESUF)))
 	rm -f tests/test-qapi-gen-timestamp
 	rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
 
Signature · 1 line
2.18.1
#4 lore raw

PATCH v2 4/7 tests/Makefile: Separate unit test dependencies from qtest dependencies

In reply to Thomas Huth

Some of the unit test dependencies are declared right in the block of the qtest dependencies. Let's move them to the other unit tests instead.

---
 tests/Makefile.include | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
tests/Makefile.include +5 -5
index 9992e0e58c..e3b199cf09 100644
@@ -589,6 +589,11 @@ tests/test-vmstate$(EXESUF): tests/test-vmstate.o \
 tests/test-timed-average$(EXESUF): tests/test-timed-average.o $(test-util-obj-y)
 tests/test-base64$(EXESUF): tests/test-base64.o $(test-util-obj-y)
 tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o hw/core/ptimer.o
+tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y)
+tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-qapi-obj-y)
+tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y)
+tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
+tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y)
 
 tests/test-logging$(EXESUF): tests/test-logging.o $(test-util-obj-y)
 
@@ -830,18 +835,13 @@ tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
 tests/cpu-plug-test$(EXESUF): tests/cpu-plug-test.o
 tests/migration-test$(EXESUF): tests/migration-test.o
 tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o
-tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y)
-tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-qapi-obj-y)
-tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y)
 tests/test-netfilter$(EXESUF): tests/test-netfilter.o $(qtest-obj-y)
 tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)
 tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y)
 tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtest-obj-y)
 tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
 tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
-tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
 tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o
-tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y)
 tests/numa-test$(EXESUF): tests/numa-test.o
 tests/vmgenid-test$(EXESUF): tests/vmgenid-test.o tests/boot-sector.o tests/acpi-utils.o
 tests/cdrom-test$(EXESUF): tests/cdrom-test.o tests/boot-sector.o $(libqos-obj-y)
Signature · 1 line
2.18.1
#5 lore raw

PATCH v2 5/7 test: Move qtests to a separate directory

In reply to Thomas Huth

The tests directory itself is pretty overcrowded, and it's hard to see which test belongs to which test subsystem (unit, qtest, ...). Let's move the qtests to a separate folder for more clarity.

---
 .gitlab-ci.yml                                |  11 +-
 MAINTAINERS                                   |  79 ++++---
 configure                                     |   4 +-
 tests/Makefile.include                        | 203 +++++++++---------
 tests/{ => qtest}/ac97-test.c                 |   0
 tests/{ => qtest}/acpi-utils.c                |   0
 tests/{ => qtest}/acpi-utils.h                |   0
 tests/{ => qtest}/ahci-test.c                 |   0
 tests/{ => qtest}/arm-cpu-features.c          |   0
 .../bios-tables-test-allowed-diff.h           |   0
 tests/{ => qtest}/bios-tables-test.c          |   0
 tests/{ => qtest}/boot-order-test.c           |   0
 tests/{ => qtest}/boot-sector.c               |   0
 tests/{ => qtest}/boot-sector.h               |   0
 tests/{ => qtest}/boot-serial-test.c          |   0
 tests/{ => qtest}/cdrom-test.c                |   0
 tests/{ => qtest}/cpu-plug-test.c             |   0
 tests/{ => qtest}/device-introspect-test.c    |   0
 tests/{ => qtest}/device-plug-test.c          |   0
 tests/{ => qtest}/display-vga-test.c          |   0
 tests/{ => qtest}/drive_del-test.c            |   0
 tests/{ => qtest}/ds1338-test.c               |   0
 tests/{ => qtest}/e1000-test.c                |   0
 tests/{ => qtest}/e1000e-test.c               |   0
 tests/{ => qtest}/eepro100-test.c             |   0
 tests/{ => qtest}/endianness-test.c           |   0
 tests/{ => qtest}/es1370-test.c               |   0
 tests/{ => qtest}/fdc-test.c                  |   0
 tests/{ => qtest}/fw_cfg-test.c               |   0
 tests/{ => qtest}/hd-geo-test.c               |   0
 tests/{ => qtest}/hexloader-test.c            |   0
 tests/{ => qtest}/i440fx-test.c               |   0
 tests/{ => qtest}/i82801b11-test.c            |   0
 tests/{ => qtest}/ide-test.c                  |   0
 tests/{ => qtest}/intel-hda-test.c            |   0
 tests/{ => qtest}/ioh3420-test.c              |   0
 tests/{ => qtest}/ipmi-bt-test.c              |   0
 tests/{ => qtest}/ipmi-kcs-test.c             |   0
 tests/{ => qtest}/ipoctal232-test.c           |   0
 tests/{ => qtest}/ivshmem-test.c              |   0
 tests/{ => qtest}/libqtest-single.h           |   0
 tests/{ => qtest}/libqtest.c                  |   0
 tests/{ => qtest}/libqtest.h                  |   0
 tests/{ => qtest}/m25p80-test.c               |   0
 tests/{ => qtest}/m48t59-test.c               |   0
 tests/{ => qtest}/machine-none-test.c         |   0
 tests/{ => qtest}/megasas-test.c              |   0
 tests/{ => qtest}/microbit-test.c             |   0
 tests/{ => qtest}/migration-test.c            |   0
 tests/{ => qtest}/modules-test.c              |   0
 tests/{ => qtest}/ne2000-test.c               |   0
 tests/{ => qtest}/numa-test.c                 |   0
 tests/{ => qtest}/nvme-test.c                 |   0
 tests/{ => qtest}/pca9552-test.c              |   0
 tests/{ => qtest}/pci-test.c                  |   0
 tests/{ => qtest}/pcnet-test.c                |   0
 tests/{ => qtest}/pflash-cfi02-test.c         |   0
 tests/{ => qtest}/pnv-xscom-test.c            |   0
 tests/{ => qtest}/prom-env-test.c             |   0
 tests/{ => qtest}/pvpanic-test.c              |   0
 tests/{ => qtest}/pxe-test.c                  |   0
 tests/{ => qtest}/q35-test.c                  |   0
 tests/{ => qtest}/qmp-cmd-test.c              |   0
 tests/{ => qtest}/qmp-test.c                  |   0
 tests/{ => qtest}/qom-test.c                  |   0
 tests/{ => qtest}/qos-test.c                  |   0
 tests/{ => qtest}/rtas-test.c                 |   0
 tests/{ => qtest}/rtc-test.c                  |   0
 tests/{ => qtest}/rtl8139-test.c              |   0
 tests/{ => qtest}/sdhci-test.c                |   0
 tests/{ => qtest}/spapr-phb-test.c            |   0
 tests/{ => qtest}/tco-test.c                  |   0
 tests/{ => qtest}/test-arm-mptimer.c          |   0
 tests/{ => qtest}/test-filter-mirror.c        |   0
 tests/{ => qtest}/test-filter-redirector.c    |   0
 tests/{ => qtest}/test-hmp.c                  |   0
 tests/{ => qtest}/test-netfilter.c            |   0
 tests/{ => qtest}/test-x86-cpuid-compat.c     |   0
 tests/{ => qtest}/tmp105-test.c               |   0
 tests/{ => qtest}/tpm-crb-swtpm-test.c        |   0
 tests/{ => qtest}/tpm-crb-test.c              |   0
 tests/{ => qtest}/tpm-emu.c                   |   0
 tests/{ => qtest}/tpm-emu.h                   |   0
 tests/{ => qtest}/tpm-tests.c                 |   0
 tests/{ => qtest}/tpm-tests.h                 |   0
 tests/{ => qtest}/tpm-tis-swtpm-test.c        |   0
 tests/{ => qtest}/tpm-tis-test.c              |   0
 tests/{ => qtest}/tpm-util.c                  |   0
 tests/{ => qtest}/tpm-util.h                  |   0
 tests/{ => qtest}/usb-hcd-ehci-test.c         |   0
 tests/{ => qtest}/usb-hcd-ohci-test.c         |   0
 tests/{ => qtest}/usb-hcd-uhci-test.c         |   0
 tests/{ => qtest}/usb-hcd-xhci-test.c         |   0
 tests/{ => qtest}/vhost-user-test.c           |   0
 tests/{ => qtest}/virtio-9p-test.c            |   0
 tests/{ => qtest}/virtio-blk-test.c           |   0
 tests/{ => qtest}/virtio-ccw-test.c           |   0
 tests/{ => qtest}/virtio-net-test.c           |   0
 tests/{ => qtest}/virtio-rng-test.c           |   0
 tests/{ => qtest}/virtio-scsi-test.c          |   0
 tests/{ => qtest}/virtio-serial-test.c        |   0
 tests/{ => qtest}/virtio-test.c               |   0
 tests/{ => qtest}/vmgenid-test.c              |   0
 tests/{ => qtest}/vmxnet3-test.c              |   0
 tests/{ => qtest}/wdt_ib700-test.c            |   0
 105 files changed, 148 insertions(+), 149 deletions(-)
 rename tests/{ => qtest}/ac97-test.c (100%)
 rename tests/{ => qtest}/acpi-utils.c (100%)
 rename tests/{ => qtest}/acpi-utils.h (100%)
 rename tests/{ => qtest}/ahci-test.c (100%)
 rename tests/{ => qtest}/arm-cpu-features.c (100%)
 rename tests/{ => qtest}/bios-tables-test-allowed-diff.h (100%)
 rename tests/{ => qtest}/bios-tables-test.c (100%)
 rename tests/{ => qtest}/boot-order-test.c (100%)
 rename tests/{ => qtest}/boot-sector.c (100%)
 rename tests/{ => qtest}/boot-sector.h (100%)
 rename tests/{ => qtest}/boot-serial-test.c (100%)
 rename tests/{ => qtest}/cdrom-test.c (100%)
 rename tests/{ => qtest}/cpu-plug-test.c (100%)
 rename tests/{ => qtest}/device-introspect-test.c (100%)
 rename tests/{ => qtest}/device-plug-test.c (100%)
 rename tests/{ => qtest}/display-vga-test.c (100%)
 rename tests/{ => qtest}/drive_del-test.c (100%)
 rename tests/{ => qtest}/ds1338-test.c (100%)
 rename tests/{ => qtest}/e1000-test.c (100%)
 rename tests/{ => qtest}/e1000e-test.c (100%)
 rename tests/{ => qtest}/eepro100-test.c (100%)
 rename tests/{ => qtest}/endianness-test.c (100%)
 rename tests/{ => qtest}/es1370-test.c (100%)
 rename tests/{ => qtest}/fdc-test.c (100%)
 rename tests/{ => qtest}/fw_cfg-test.c (100%)
 rename tests/{ => qtest}/hd-geo-test.c (100%)
 rename tests/{ => qtest}/hexloader-test.c (100%)
 rename tests/{ => qtest}/i440fx-test.c (100%)
 rename tests/{ => qtest}/i82801b11-test.c (100%)
 rename tests/{ => qtest}/ide-test.c (100%)
 rename tests/{ => qtest}/intel-hda-test.c (100%)
 rename tests/{ => qtest}/ioh3420-test.c (100%)
 rename tests/{ => qtest}/ipmi-bt-test.c (100%)
 rename tests/{ => qtest}/ipmi-kcs-test.c (100%)
 rename tests/{ => qtest}/ipoctal232-test.c (100%)
 rename tests/{ => qtest}/ivshmem-test.c (100%)
 rename tests/{ => qtest}/libqtest-single.h (100%)
 rename tests/{ => qtest}/libqtest.c (100%)
 rename tests/{ => qtest}/libqtest.h (100%)
 rename tests/{ => qtest}/m25p80-test.c (100%)
 rename tests/{ => qtest}/m48t59-test.c (100%)
 rename tests/{ => qtest}/machine-none-test.c (100%)
 rename tests/{ => qtest}/megasas-test.c (100%)
 rename tests/{ => qtest}/microbit-test.c (100%)
 rename tests/{ => qtest}/migration-test.c (100%)
 rename tests/{ => qtest}/modules-test.c (100%)
 rename tests/{ => qtest}/ne2000-test.c (100%)
 rename tests/{ => qtest}/numa-test.c (100%)
 rename tests/{ => qtest}/nvme-test.c (100%)
 rename tests/{ => qtest}/pca9552-test.c (100%)
 rename tests/{ => qtest}/pci-test.c (100%)
 rename tests/{ => qtest}/pcnet-test.c (100%)
 rename tests/{ => qtest}/pflash-cfi02-test.c (100%)
 rename tests/{ => qtest}/pnv-xscom-test.c (100%)
 rename tests/{ => qtest}/prom-env-test.c (100%)
 rename tests/{ => qtest}/pvpanic-test.c (100%)
 rename tests/{ => qtest}/pxe-test.c (100%)
 rename tests/{ => qtest}/q35-test.c (100%)
 rename tests/{ => qtest}/qmp-cmd-test.c (100%)
 rename tests/{ => qtest}/qmp-test.c (100%)
 rename tests/{ => qtest}/qom-test.c (100%)
 rename tests/{ => qtest}/qos-test.c (100%)
 rename tests/{ => qtest}/rtas-test.c (100%)
 rename tests/{ => qtest}/rtc-test.c (100%)
 rename tests/{ => qtest}/rtl8139-test.c (100%)
 rename tests/{ => qtest}/sdhci-test.c (100%)
 rename tests/{ => qtest}/spapr-phb-test.c (100%)
 rename tests/{ => qtest}/tco-test.c (100%)
 rename tests/{ => qtest}/test-arm-mptimer.c (100%)
 rename tests/{ => qtest}/test-filter-mirror.c (100%)
 rename tests/{ => qtest}/test-filter-redirector.c (100%)
 rename tests/{ => qtest}/test-hmp.c (100%)
 rename tests/{ => qtest}/test-netfilter.c (100%)
 rename tests/{ => qtest}/test-x86-cpuid-compat.c (100%)
 rename tests/{ => qtest}/tmp105-test.c (100%)
 rename tests/{ => qtest}/tpm-crb-swtpm-test.c (100%)
 rename tests/{ => qtest}/tpm-crb-test.c (100%)
 rename tests/{ => qtest}/tpm-emu.c (100%)
 rename tests/{ => qtest}/tpm-emu.h (100%)
 rename tests/{ => qtest}/tpm-tests.c (100%)
 rename tests/{ => qtest}/tpm-tests.h (100%)
 rename tests/{ => qtest}/tpm-tis-swtpm-test.c (100%)
 rename tests/{ => qtest}/tpm-tis-test.c (100%)
 rename tests/{ => qtest}/tpm-util.c (100%)
 rename tests/{ => qtest}/tpm-util.h (100%)
 rename tests/{ => qtest}/usb-hcd-ehci-test.c (100%)
 rename tests/{ => qtest}/usb-hcd-ohci-test.c (100%)
 rename tests/{ => qtest}/usb-hcd-uhci-test.c (100%)
 rename tests/{ => qtest}/usb-hcd-xhci-test.c (100%)
 rename tests/{ => qtest}/vhost-user-test.c (100%)
 rename tests/{ => qtest}/virtio-9p-test.c (100%)
 rename tests/{ => qtest}/virtio-blk-test.c (100%)
 rename tests/{ => qtest}/virtio-ccw-test.c (100%)
 rename tests/{ => qtest}/virtio-net-test.c (100%)
 rename tests/{ => qtest}/virtio-rng-test.c (100%)
 rename tests/{ => qtest}/virtio-scsi-test.c (100%)
 rename tests/{ => qtest}/virtio-serial-test.c (100%)
 rename tests/{ => qtest}/virtio-test.c (100%)
 rename tests/{ => qtest}/vmgenid-test.c (100%)
 rename tests/{ => qtest}/vmxnet3-test.c (100%)
 rename tests/{ => qtest}/wdt_ib700-test.c (100%)
.gitlab-ci.yml +6 -5
index e3db1b847c..9af4fb548a 100644
@@ -73,11 +73,12 @@ build-tci:
  - ./configure --enable-tcg-interpreter
       --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; done)"
  - make -j2
- - make tests/boot-serial-test tests/cdrom-test tests/pxe-test
+ - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest/pxe-test
  - for tg in $TARGETS ; do
      export QTEST_QEMU_BINARY="${tg}-softmmu/qemu-system-${tg}" ;
-     ./tests/boot-serial-test || exit 1 ;
-     ./tests/cdrom-test || exit 1 ;
+     ./tests/qtest/boot-serial-test || exit 1 ;
+     ./tests/qtest/cdrom-test || exit 1 ;
    done
- - QTEST_QEMU_BINARY="x86_64-softmmu/qemu-system-x86_64" ./tests/pxe-test
- - QTEST_QEMU_BINARY="s390x-softmmu/qemu-system-s390x" ./tests/pxe-test -m slow
+ - QTEST_QEMU_BINARY="x86_64-softmmu/qemu-system-x86_64" ./tests/qtest/pxe-test
+ - QTEST_QEMU_BINARY="s390x-softmmu/qemu-system-s390x"
+   ./tests/qtest/pxe-test -m slow
MAINTAINERS +38 -41

272 lines not on this page · raw message

configure +2 -2
index 84b413dbfc..121f1317e2 100755
@@ -7952,8 +7952,8 @@ fi
 # so the build tree will be missing the link back to the new file, and
 # tests might fail. Prefer to keep the relevant files in their own
 # directory and symlink the directory instead.
-DIRS="tests tests/tcg tests/tcg/lm32 tests/libqos tests/qapi-schema tests/qemu-iotests tests/vm"
-DIRS="$DIRS tests/fp tests/qgraph"
+DIRS="tests tests/tcg tests/tcg/lm32 tests/libqos tests/qapi-schema tests/qtest"
+DIRS="$DIRS tests/qemu-iotests tests/vm tests/fp tests/qgraph"
 DIRS="$DIRS docs docs/interop fsdev scsi"
 DIRS="$DIRS pc-bios/optionrom pc-bios/s390-ccw"
 DIRS="$DIRS roms/seabios roms/vgabios"
tests/Makefile.include +102 -101

266 lines not on this page · raw message

tests/qtest/ac97-test.c renamed from tests/ac97-test.c +0 -0
similarity index 100%
rename from tests/ac97-test.c
rename to tests/qtest/ac97-test.c
tests/qtest/acpi-utils.c renamed from tests/acpi-utils.c +0 -0
similarity index 100%
rename from tests/acpi-utils.c
rename to tests/qtest/acpi-utils.c
tests/qtest/acpi-utils.h renamed from tests/acpi-utils.h +0 -0
similarity index 100%
rename from tests/acpi-utils.h
rename to tests/qtest/acpi-utils.h
tests/qtest/ahci-test.c renamed from tests/ahci-test.c +0 -0
similarity index 100%
rename from tests/ahci-test.c
rename to tests/qtest/ahci-test.c
tests/qtest/arm-cpu-features.c renamed from tests/arm-cpu-features.c +0 -0
similarity index 100%
rename from tests/arm-cpu-features.c
rename to tests/qtest/arm-cpu-features.c
tests/qtest/bios-tables-test-allowed-diff.h renamed from tests/bios-tables-test-allowed-diff.h +0 -0
similarity index 100%
rename from tests/bios-tables-test-allowed-diff.h
rename to tests/qtest/bios-tables-test-allowed-diff.h
tests/qtest/bios-tables-test.c renamed from tests/bios-tables-test.c +0 -0
similarity index 100%
rename from tests/bios-tables-test.c
rename to tests/qtest/bios-tables-test.c
tests/qtest/boot-order-test.c renamed from tests/boot-order-test.c +0 -0
similarity index 100%
rename from tests/boot-order-test.c
rename to tests/qtest/boot-order-test.c
tests/qtest/boot-sector.c renamed from tests/boot-sector.c +0 -0
similarity index 100%
rename from tests/boot-sector.c
rename to tests/qtest/boot-sector.c
tests/qtest/boot-sector.h renamed from tests/boot-sector.h +0 -0
similarity index 100%
rename from tests/boot-sector.h
rename to tests/qtest/boot-sector.h
tests/qtest/boot-serial-test.c renamed from tests/boot-serial-test.c +0 -0
similarity index 100%
rename from tests/boot-serial-test.c
rename to tests/qtest/boot-serial-test.c
tests/qtest/cdrom-test.c renamed from tests/cdrom-test.c +0 -0
similarity index 100%
rename from tests/cdrom-test.c
rename to tests/qtest/cdrom-test.c
tests/qtest/cpu-plug-test.c renamed from tests/cpu-plug-test.c +0 -0
similarity index 100%
rename from tests/cpu-plug-test.c
rename to tests/qtest/cpu-plug-test.c
tests/qtest/device-introspect-test.c renamed from tests/device-introspect-test.c +0 -0
similarity index 100%
rename from tests/device-introspect-test.c
rename to tests/qtest/device-introspect-test.c
tests/qtest/device-plug-test.c renamed from tests/device-plug-test.c +0 -0
similarity index 100%
rename from tests/device-plug-test.c
rename to tests/qtest/device-plug-test.c
tests/qtest/display-vga-test.c renamed from tests/display-vga-test.c +0 -0
similarity index 100%
rename from tests/display-vga-test.c
rename to tests/qtest/display-vga-test.c
tests/qtest/drive_del-test.c renamed from tests/drive_del-test.c +0 -0
similarity index 100%
rename from tests/drive_del-test.c
rename to tests/qtest/drive_del-test.c
tests/qtest/ds1338-test.c renamed from tests/ds1338-test.c +0 -0
similarity index 100%
rename from tests/ds1338-test.c
rename to tests/qtest/ds1338-test.c
tests/qtest/e1000-test.c renamed from tests/e1000-test.c +0 -0
similarity index 100%
rename from tests/e1000-test.c
rename to tests/qtest/e1000-test.c
tests/qtest/e1000e-test.c renamed from tests/e1000e-test.c +0 -0
similarity index 100%
rename from tests/e1000e-test.c
rename to tests/qtest/e1000e-test.c
tests/qtest/eepro100-test.c renamed from tests/eepro100-test.c +0 -0
similarity index 100%
rename from tests/eepro100-test.c
rename to tests/qtest/eepro100-test.c
tests/qtest/endianness-test.c renamed from tests/endianness-test.c +0 -0
similarity index 100%
rename from tests/endianness-test.c
rename to tests/qtest/endianness-test.c
tests/qtest/es1370-test.c renamed from tests/es1370-test.c +0 -0
similarity index 100%
rename from tests/es1370-test.c
rename to tests/qtest/es1370-test.c
tests/qtest/fdc-test.c renamed from tests/fdc-test.c +0 -0
similarity index 100%
rename from tests/fdc-test.c
rename to tests/qtest/fdc-test.c
tests/qtest/fw_cfg-test.c renamed from tests/fw_cfg-test.c +0 -0
similarity index 100%
rename from tests/fw_cfg-test.c
rename to tests/qtest/fw_cfg-test.c
tests/qtest/hd-geo-test.c renamed from tests/hd-geo-test.c +0 -0
similarity index 100%
rename from tests/hd-geo-test.c
rename to tests/qtest/hd-geo-test.c
tests/qtest/hexloader-test.c renamed from tests/hexloader-test.c +0 -0
similarity index 100%
rename from tests/hexloader-test.c
rename to tests/qtest/hexloader-test.c
tests/qtest/i440fx-test.c renamed from tests/i440fx-test.c +0 -0
similarity index 100%
rename from tests/i440fx-test.c
rename to tests/qtest/i440fx-test.c
tests/qtest/i82801b11-test.c renamed from tests/i82801b11-test.c +0 -0
similarity index 100%
rename from tests/i82801b11-test.c
rename to tests/qtest/i82801b11-test.c
tests/qtest/ide-test.c renamed from tests/ide-test.c +0 -0
similarity index 100%
rename from tests/ide-test.c
rename to tests/qtest/ide-test.c
tests/qtest/intel-hda-test.c renamed from tests/intel-hda-test.c +0 -0
similarity index 100%
rename from tests/intel-hda-test.c
rename to tests/qtest/intel-hda-test.c
tests/qtest/ioh3420-test.c renamed from tests/ioh3420-test.c +0 -0
similarity index 100%
rename from tests/ioh3420-test.c
rename to tests/qtest/ioh3420-test.c
tests/qtest/ipmi-bt-test.c renamed from tests/ipmi-bt-test.c +0 -0
similarity index 100%
rename from tests/ipmi-bt-test.c
rename to tests/qtest/ipmi-bt-test.c
tests/qtest/ipmi-kcs-test.c renamed from tests/ipmi-kcs-test.c +0 -0
similarity index 100%
rename from tests/ipmi-kcs-test.c
rename to tests/qtest/ipmi-kcs-test.c
tests/qtest/ipoctal232-test.c renamed from tests/ipoctal232-test.c +0 -0
similarity index 100%
rename from tests/ipoctal232-test.c
rename to tests/qtest/ipoctal232-test.c
tests/qtest/ivshmem-test.c renamed from tests/ivshmem-test.c +0 -0
similarity index 100%
rename from tests/ivshmem-test.c
rename to tests/qtest/ivshmem-test.c
tests/qtest/libqtest-single.h renamed from tests/libqtest-single.h +0 -0
similarity index 100%
rename from tests/libqtest-single.h
rename to tests/qtest/libqtest-single.h
tests/qtest/libqtest.c renamed from tests/libqtest.c +0 -0
similarity index 100%
rename from tests/libqtest.c
rename to tests/qtest/libqtest.c
tests/qtest/libqtest.h renamed from tests/libqtest.h +0 -0
similarity index 100%
rename from tests/libqtest.h
rename to tests/qtest/libqtest.h
tests/qtest/m25p80-test.c renamed from tests/m25p80-test.c +0 -0
similarity index 100%
rename from tests/m25p80-test.c
rename to tests/qtest/m25p80-test.c
tests/qtest/m48t59-test.c renamed from tests/m48t59-test.c +0 -0
similarity index 100%
rename from tests/m48t59-test.c
rename to tests/qtest/m48t59-test.c
tests/qtest/machine-none-test.c renamed from tests/machine-none-test.c +0 -0
similarity index 100%
rename from tests/machine-none-test.c
rename to tests/qtest/machine-none-test.c
tests/qtest/megasas-test.c renamed from tests/megasas-test.c +0 -0
similarity index 100%
rename from tests/megasas-test.c
rename to tests/qtest/megasas-test.c
tests/qtest/microbit-test.c renamed from tests/microbit-test.c +0 -0
similarity index 100%
rename from tests/microbit-test.c
rename to tests/qtest/microbit-test.c
tests/qtest/migration-test.c renamed from tests/migration-test.c +0 -0
similarity index 100%
rename from tests/migration-test.c
rename to tests/qtest/migration-test.c
tests/qtest/modules-test.c renamed from tests/modules-test.c +0 -0
similarity index 100%
rename from tests/modules-test.c
rename to tests/qtest/modules-test.c
tests/qtest/ne2000-test.c renamed from tests/ne2000-test.c +0 -0
similarity index 100%
rename from tests/ne2000-test.c
rename to tests/qtest/ne2000-test.c
tests/qtest/numa-test.c renamed from tests/numa-test.c +0 -0
similarity index 100%
rename from tests/numa-test.c
rename to tests/qtest/numa-test.c
tests/qtest/nvme-test.c renamed from tests/nvme-test.c +0 -0
similarity index 100%
rename from tests/nvme-test.c
rename to tests/qtest/nvme-test.c
tests/qtest/pca9552-test.c renamed from tests/pca9552-test.c +0 -0
similarity index 100%
rename from tests/pca9552-test.c
rename to tests/qtest/pca9552-test.c
tests/qtest/pci-test.c renamed from tests/pci-test.c +0 -0
similarity index 100%
rename from tests/pci-test.c
rename to tests/qtest/pci-test.c
tests/qtest/pcnet-test.c renamed from tests/pcnet-test.c +0 -0
similarity index 100%
rename from tests/pcnet-test.c
rename to tests/qtest/pcnet-test.c
tests/qtest/pflash-cfi02-test.c renamed from tests/pflash-cfi02-test.c +0 -0
similarity index 100%
rename from tests/pflash-cfi02-test.c
rename to tests/qtest/pflash-cfi02-test.c
tests/qtest/pnv-xscom-test.c renamed from tests/pnv-xscom-test.c +0 -0
similarity index 100%
rename from tests/pnv-xscom-test.c
rename to tests/qtest/pnv-xscom-test.c
tests/qtest/prom-env-test.c renamed from tests/prom-env-test.c +0 -0
similarity index 100%
rename from tests/prom-env-test.c
rename to tests/qtest/prom-env-test.c
tests/qtest/pvpanic-test.c renamed from tests/pvpanic-test.c +0 -0
similarity index 100%
rename from tests/pvpanic-test.c
rename to tests/qtest/pvpanic-test.c
tests/qtest/pxe-test.c renamed from tests/pxe-test.c +0 -0
similarity index 100%
rename from tests/pxe-test.c
rename to tests/qtest/pxe-test.c
tests/qtest/q35-test.c renamed from tests/q35-test.c +0 -0
similarity index 100%
rename from tests/q35-test.c
rename to tests/qtest/q35-test.c
tests/qtest/qmp-cmd-test.c renamed from tests/qmp-cmd-test.c +0 -0
similarity index 100%
rename from tests/qmp-cmd-test.c
rename to tests/qtest/qmp-cmd-test.c
tests/qtest/qmp-test.c renamed from tests/qmp-test.c +0 -0
similarity index 100%
rename from tests/qmp-test.c
rename to tests/qtest/qmp-test.c
tests/qtest/qom-test.c renamed from tests/qom-test.c +0 -0
similarity index 100%
rename from tests/qom-test.c
rename to tests/qtest/qom-test.c
tests/qtest/qos-test.c renamed from tests/qos-test.c +0 -0
similarity index 100%
rename from tests/qos-test.c
rename to tests/qtest/qos-test.c
tests/qtest/rtas-test.c renamed from tests/rtas-test.c +0 -0
similarity index 100%
rename from tests/rtas-test.c
rename to tests/qtest/rtas-test.c
tests/qtest/rtc-test.c renamed from tests/rtc-test.c +0 -0
similarity index 100%
rename from tests/rtc-test.c
rename to tests/qtest/rtc-test.c
tests/qtest/rtl8139-test.c renamed from tests/rtl8139-test.c +0 -0
similarity index 100%
rename from tests/rtl8139-test.c
rename to tests/qtest/rtl8139-test.c
tests/qtest/sdhci-test.c renamed from tests/sdhci-test.c +0 -0
similarity index 100%
rename from tests/sdhci-test.c
rename to tests/qtest/sdhci-test.c
tests/qtest/spapr-phb-test.c renamed from tests/spapr-phb-test.c +0 -0
similarity index 100%
rename from tests/spapr-phb-test.c
rename to tests/qtest/spapr-phb-test.c
tests/qtest/tco-test.c renamed from tests/tco-test.c +0 -0
similarity index 100%
rename from tests/tco-test.c
rename to tests/qtest/tco-test.c
tests/qtest/test-arm-mptimer.c renamed from tests/test-arm-mptimer.c +0 -0
similarity index 100%
rename from tests/test-arm-mptimer.c
rename to tests/qtest/test-arm-mptimer.c
tests/qtest/test-filter-mirror.c renamed from tests/test-filter-mirror.c +0 -0
similarity index 100%
rename from tests/test-filter-mirror.c
rename to tests/qtest/test-filter-mirror.c
tests/qtest/test-filter-redirector.c renamed from tests/test-filter-redirector.c +0 -0
similarity index 100%
rename from tests/test-filter-redirector.c
rename to tests/qtest/test-filter-redirector.c
tests/qtest/test-hmp.c renamed from tests/test-hmp.c +0 -0
similarity index 100%
rename from tests/test-hmp.c
rename to tests/qtest/test-hmp.c
tests/qtest/test-netfilter.c renamed from tests/test-netfilter.c +0 -0
similarity index 100%
rename from tests/test-netfilter.c
rename to tests/qtest/test-netfilter.c
tests/qtest/test-x86-cpuid-compat.c renamed from tests/test-x86-cpuid-compat.c +0 -0
similarity index 100%
rename from tests/test-x86-cpuid-compat.c
rename to tests/qtest/test-x86-cpuid-compat.c
tests/qtest/tmp105-test.c renamed from tests/tmp105-test.c +0 -0
similarity index 100%
rename from tests/tmp105-test.c
rename to tests/qtest/tmp105-test.c
tests/qtest/tpm-crb-swtpm-test.c renamed from tests/tpm-crb-swtpm-test.c +0 -0
similarity index 100%
rename from tests/tpm-crb-swtpm-test.c
rename to tests/qtest/tpm-crb-swtpm-test.c
tests/qtest/tpm-crb-test.c renamed from tests/tpm-crb-test.c +0 -0
similarity index 100%
rename from tests/tpm-crb-test.c
rename to tests/qtest/tpm-crb-test.c
tests/qtest/tpm-emu.c renamed from tests/tpm-emu.c +0 -0
similarity index 100%
rename from tests/tpm-emu.c
rename to tests/qtest/tpm-emu.c
tests/qtest/tpm-emu.h renamed from tests/tpm-emu.h +0 -0
similarity index 100%
rename from tests/tpm-emu.h
rename to tests/qtest/tpm-emu.h
tests/qtest/tpm-tests.c renamed from tests/tpm-tests.c +0 -0
similarity index 100%
rename from tests/tpm-tests.c
rename to tests/qtest/tpm-tests.c
tests/qtest/tpm-tests.h renamed from tests/tpm-tests.h +0 -0
similarity index 100%
rename from tests/tpm-tests.h
rename to tests/qtest/tpm-tests.h
tests/qtest/tpm-tis-swtpm-test.c renamed from tests/tpm-tis-swtpm-test.c +0 -0
similarity index 100%
rename from tests/tpm-tis-swtpm-test.c
rename to tests/qtest/tpm-tis-swtpm-test.c
tests/qtest/tpm-tis-test.c renamed from tests/tpm-tis-test.c +0 -0
similarity index 100%
rename from tests/tpm-tis-test.c
rename to tests/qtest/tpm-tis-test.c
tests/qtest/tpm-util.c renamed from tests/tpm-util.c +0 -0
similarity index 100%
rename from tests/tpm-util.c
rename to tests/qtest/tpm-util.c
tests/qtest/tpm-util.h renamed from tests/tpm-util.h +0 -0
similarity index 100%
rename from tests/tpm-util.h
rename to tests/qtest/tpm-util.h
tests/qtest/usb-hcd-ehci-test.c renamed from tests/usb-hcd-ehci-test.c +0 -0
similarity index 100%
rename from tests/usb-hcd-ehci-test.c
rename to tests/qtest/usb-hcd-ehci-test.c
tests/qtest/usb-hcd-ohci-test.c renamed from tests/usb-hcd-ohci-test.c +0 -0
similarity index 100%
rename from tests/usb-hcd-ohci-test.c
rename to tests/qtest/usb-hcd-ohci-test.c
tests/qtest/usb-hcd-uhci-test.c renamed from tests/usb-hcd-uhci-test.c +0 -0
similarity index 100%
rename from tests/usb-hcd-uhci-test.c
rename to tests/qtest/usb-hcd-uhci-test.c
tests/qtest/usb-hcd-xhci-test.c renamed from tests/usb-hcd-xhci-test.c +0 -0
similarity index 100%
rename from tests/usb-hcd-xhci-test.c
rename to tests/qtest/usb-hcd-xhci-test.c
tests/qtest/vhost-user-test.c renamed from tests/vhost-user-test.c +0 -0
similarity index 100%
rename from tests/vhost-user-test.c
rename to tests/qtest/vhost-user-test.c
tests/qtest/virtio-9p-test.c renamed from tests/virtio-9p-test.c +0 -0
similarity index 100%
rename from tests/virtio-9p-test.c
rename to tests/qtest/virtio-9p-test.c
tests/qtest/virtio-blk-test.c renamed from tests/virtio-blk-test.c +0 -0
similarity index 100%
rename from tests/virtio-blk-test.c
rename to tests/qtest/virtio-blk-test.c
tests/qtest/virtio-ccw-test.c renamed from tests/virtio-ccw-test.c +0 -0
similarity index 100%
rename from tests/virtio-ccw-test.c
rename to tests/qtest/virtio-ccw-test.c
tests/qtest/virtio-net-test.c renamed from tests/virtio-net-test.c +0 -0
similarity index 100%
rename from tests/virtio-net-test.c
rename to tests/qtest/virtio-net-test.c
tests/qtest/virtio-rng-test.c renamed from tests/virtio-rng-test.c +0 -0
similarity index 100%
rename from tests/virtio-rng-test.c
rename to tests/qtest/virtio-rng-test.c
tests/qtest/virtio-scsi-test.c renamed from tests/virtio-scsi-test.c +0 -0
similarity index 100%
rename from tests/virtio-scsi-test.c
rename to tests/qtest/virtio-scsi-test.c
tests/qtest/virtio-serial-test.c renamed from tests/virtio-serial-test.c +0 -0
similarity index 100%
rename from tests/virtio-serial-test.c
rename to tests/qtest/virtio-serial-test.c
tests/qtest/virtio-test.c renamed from tests/virtio-test.c +0 -0
similarity index 100%
rename from tests/virtio-test.c
rename to tests/qtest/virtio-test.c
tests/qtest/vmgenid-test.c renamed from tests/vmgenid-test.c +0 -0
similarity index 100%
rename from tests/vmgenid-test.c
rename to tests/qtest/vmgenid-test.c
tests/qtest/vmxnet3-test.c renamed from tests/vmxnet3-test.c +0 -0
similarity index 100%
rename from tests/vmxnet3-test.c
rename to tests/qtest/vmxnet3-test.c
tests/qtest/wdt_ib700-test.c renamed from tests/wdt_ib700-test.c +0 -0
similarity index 100%
rename from tests/wdt_ib700-test.c
rename to tests/qtest/wdt_ib700-test.c
Signature · 1 line
2.18.1
#6 lore raw

PATCH v2 6/7 tests/Makefile: Move qtest-related settings to a separate Makefile.include

In reply to Thomas Huth

tests/Makefile.include is pretty much overcrowded. Now that we have a dedicated folder for the qtests, let's move the related settings to a Makefile.include file in that directory instead.

---
 tests/Makefile.include       | 311 +----------------------------------
 tests/qtest/Makefile.include | 310 ++++++++++++++++++++++++++++++++++
 2 files changed, 311 insertions(+), 310 deletions(-)
 create mode 100644 tests/qtest/Makefile.include
tests/Makefile.include +1 -310
index 76154aece8..9d953097c4 100644
@@ -149,157 +149,6 @@ check-unit-y += tests/test-qapi-util$(EXESUF)
 
 check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) += tests/check-block.sh
 
-# All QTests for now are POSIX-only, but the dependencies are
-# really in libqtest, not in the testcases themselves.
-
-check-qtest-generic-y += qmp-test
-check-qtest-generic-y += qmp-cmd-test
-check-qtest-generic-$(CONFIG_MODULES) += modules-test
-
-check-qtest-generic-y += device-introspect-test
-check-qtest-generic-y += cdrom-test
-
-check-qtest-pci-$(CONFIG_RTL8139_PCI) += rtl8139-test
-check-qtest-pci-$(CONFIG_VGA) += display-vga-test
-check-qtest-pci-$(CONFIG_HDA) += intel-hda-test
-check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += ivshmem-test
-
-check-qtest-i386-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-i386-y += fdc-test
-check-qtest-i386-y += ide-test
-check-qtest-i386-y += ahci-test
-check-qtest-i386-y += hd-geo-test
-check-qtest-i386-y += boot-order-test
-check-qtest-i386-y += bios-tables-test
-check-qtest-i386-$(CONFIG_SGA) += boot-serial-test
-check-qtest-i386-$(CONFIG_SLIRP) += pxe-test
-check-qtest-i386-y += rtc-test
-check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) += ipmi-kcs-test
-ifdef CONFIG_LINUX
-check-qtest-i386-$(CONFIG_ISA_IPMI_BT) += ipmi-bt-test
-endif
-check-qtest-i386-y += i440fx-test
-check-qtest-i386-y += fw_cfg-test
-check-qtest-i386-y += device-plug-test
-check-qtest-i386-y += drive_del-test
-check-qtest-i386-$(CONFIG_WDT_IB700) += wdt_ib700-test
-check-qtest-i386-y += tco-test
-check-qtest-i386-y += $(check-qtest-pci-y)
-check-qtest-i386-$(CONFIG_PVPANIC) += pvpanic-test
-check-qtest-i386-$(CONFIG_I82801B11) += i82801b11-test
-check-qtest-i386-$(CONFIG_IOH3420) += ioh3420-test
-check-qtest-i386-$(CONFIG_USB_UHCI) += usb-hcd-uhci-test
-check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += usb-hcd-ehci-test
-check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += usb-hcd-xhci-test
-check-qtest-i386-y += cpu-plug-test
-check-qtest-i386-y += q35-test
-check-qtest-i386-y += vmgenid-test
-check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test
-check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test
-check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-swtpm-test
-check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-test
-check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter
-check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror
-check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector
-check-qtest-i386-y += migration-test
-check-qtest-i386-y += test-x86-cpuid-compat
-check-qtest-i386-y += numa-test
-
-check-qtest-x86_64-y += $(check-qtest-i386-y)
-
-check-qtest-alpha-y += boot-serial-test
-check-qtest-alpha-$(CONFIG_VGA) += display-vga-test
-
-check-qtest-hppa-y += boot-serial-test
-check-qtest-hppa-$(CONFIG_VGA) += display-vga-test
-
-check-qtest-m68k-y = boot-serial-test
-
-check-qtest-microblaze-y += boot-serial-test
-
-check-qtest-mips-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-mips-$(CONFIG_VGA) += display-vga-test
-
-check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-mips64-$(CONFIG_VGA) += display-vga-test
-
-check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-mips64el-$(CONFIG_VGA) += display-vga-test
-
-check-qtest-moxie-y += boot-serial-test
-
-check-qtest-ppc-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-ppc-y += boot-order-test
-check-qtest-ppc-y += prom-env-test
-check-qtest-ppc-y += drive_del-test
-check-qtest-ppc-y += boot-serial-test
-check-qtest-ppc-$(CONFIG_M48T59) += m48t59-test
-
-check-qtest-ppc64-y += $(check-qtest-ppc-y)
-check-qtest-ppc64-$(CONFIG_PSERIES) += device-plug-test
-check-qtest-ppc64-$(CONFIG_POWERNV) += pnv-xscom-test
-check-qtest-ppc64-y += migration-test
-check-qtest-ppc64-$(CONFIG_PSERIES) += rtas-test
-check-qtest-ppc64-$(CONFIG_SLIRP) += pxe-test
-check-qtest-ppc64-$(CONFIG_USB_UHCI) += usb-hcd-uhci-test
-check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += usb-hcd-xhci-test
-check-qtest-ppc64-$(CONFIG_SLIRP) += test-netfilter
-check-qtest-ppc64-$(CONFIG_POSIX) += test-filter-mirror
-check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += test-filter-redirector
-check-qtest-ppc64-$(CONFIG_VGA) += display-vga-test
-check-qtest-ppc64-y += numa-test
-check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += ivshmem-test
-check-qtest-ppc64-y += cpu-plug-test
-
-check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = endianness-test
-
-check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) = endianness-test
-
-check-qtest-sparc-y += prom-env-test
-check-qtest-sparc-y += m48t59-test
-check-qtest-sparc-y += boot-serial-test
-
-check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) = endianness-test
-check-qtest-sparc64-y += prom-env-test
-check-qtest-sparc64-y += boot-serial-test
-
-check-qtest-arm-y += arm-cpu-features
-check-qtest-arm-y += microbit-test
-check-qtest-arm-y += m25p80-test
-check-qtest-arm-y += test-arm-mptimer
-check-qtest-arm-y += boot-serial-test
-check-qtest-arm-y += hexloader-test
-check-qtest-arm-$(CONFIG_PFLASH_CFI02) += pflash-cfi02-test
-
-check-qtest-aarch64-y += arm-cpu-features
-check-qtest-aarch64-y += numa-test
-check-qtest-aarch64-y += boot-serial-test
-check-qtest-aarch64-y += migration-test
-
-# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditional
-ifneq ($(ARCH),arm)
-check-qtest-aarch64-y += bios-tables-test
-endif
-
-check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
-
-check-qtest-xtensaeb-y += $(check-qtest-xtensa-y)
-
-check-qtest-s390x-y = boot-serial-test
-check-qtest-s390x-$(CONFIG_SLIRP) += pxe-test
-check-qtest-s390x-$(CONFIG_SLIRP) += test-netfilter
-check-qtest-s390x-$(CONFIG_POSIX) += test-filter-mirror
-check-qtest-s390x-$(CONFIG_POSIX) += test-filter-redirector
-check-qtest-s390x-y += drive_del-test
-check-qtest-s390x-y += device-plug-test
-check-qtest-s390x-y += virtio-ccw-test
-check-qtest-s390x-y += cpu-plug-test
-check-qtest-s390x-y += migration-test
-
-check-qtest-generic-y += machine-none-test
-check-qtest-generic-y += qom-test
-check-qtest-generic-y += test-hmp
-
 qapi-schema += alternate-any.json
 qapi-schema += alternate-array.json
 qapi-schema += alternate-base.json
@@ -687,12 +536,6 @@ tests/test-authz-pam$(EXESUF): tests/test-authz-pam.o $(test-authz-obj-y)
 tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y)
 tests/test-io-channel-socket$(EXESUF): tests/test-io-channel-socket.o \
         tests/io-channel-helpers.o tests/socket-helpers.o $(test-io-obj-y)
-tests/qtest/tpm-crb-swtpm-test$(EXESUF): tests/qtest/tpm-crb-swtpm-test.o tests/qtest/tpm-emu.o \
-	tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y)
-tests/qtest/tpm-crb-test$(EXESUF): tests/qtest/tpm-crb-test.o tests/qtest/tpm-emu.o $(test-io-obj-y)
-tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o tests/qtest/tpm-emu.o \
-	tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y)
-tests/qtest/tpm-tis-test$(EXESUF): tests/qtest/tpm-tis-test.o tests/qtest/tpm-emu.o $(test-io-obj-y)
 tests/test-io-channel-file$(EXESUF): tests/test-io-channel-file.o \
         tests/io-channel-helpers.o $(test-io-obj-y)
 tests/test-io-channel-tls$(EXESUF): tests/test-io-channel-tls.o \
@@ -707,146 +550,6 @@ tests/test-crypto-ivgen$(EXESUF): tests/test-crypto-ivgen.o $(test-crypto-obj-y)
 tests/test-crypto-afsplit$(EXESUF): tests/test-crypto-afsplit.o $(test-crypto-obj-y)
 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-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 += 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/qtest/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
-
-# 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
-
-# Tests
-qos-test-obj-y += tests/qtest/ac97-test.o
-qos-test-obj-y += tests/qtest/ds1338-test.o
-qos-test-obj-y += tests/qtest/e1000-test.o
-qos-test-obj-y += tests/qtest/e1000e-test.o
-qos-test-obj-y += tests/qtest/eepro100-test.o
-qos-test-obj-y += tests/qtest/es1370-test.o
-qos-test-obj-y += tests/qtest/ipoctal232-test.o
-qos-test-obj-y += tests/qtest/megasas-test.o
-qos-test-obj-y += tests/qtest/ne2000-test.o
-qos-test-obj-y += tests/qtest/nvme-test.o
-qos-test-obj-y += tests/qtest/pca9552-test.o
-qos-test-obj-y += tests/qtest/pci-test.o
-qos-test-obj-y += tests/qtest/pcnet-test.o
-qos-test-obj-y += tests/qtest/sdhci-test.o
-qos-test-obj-y += tests/qtest/spapr-phb-test.o
-qos-test-obj-y += tests/qtest/tmp105-test.o
-qos-test-obj-y += tests/qtest/usb-hcd-ohci-test.o $(libqos-usb-obj-y)
-qos-test-obj-$(CONFIG_VHOST_NET_USER) += tests/qtest/vhost-user-test.o $(chardev-obj-y) $(test-io-obj-y)
-qos-test-obj-y += tests/qtest/virtio-test.o
-qos-test-obj-$(CONFIG_VIRTFS) += tests/qtest/virtio-9p-test.o
-qos-test-obj-y += tests/qtest/virtio-blk-test.o
-qos-test-obj-y += tests/qtest/virtio-net-test.o
-qos-test-obj-y += tests/qtest/virtio-rng-test.o
-qos-test-obj-y += tests/qtest/virtio-scsi-test.o
-qos-test-obj-y += tests/qtest/virtio-serial-test.o
-qos-test-obj-y += tests/qtest/vmxnet3-test.o
-
-check-unit-y += tests/test-qgraph$(EXESUF)
-tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y)
-
-check-qtest-generic-y += qos-test
-tests/qtest/qos-test$(EXESUF): $(qos-test-obj-y)
-
-tests/qtest/qmp-test$(EXESUF): tests/qtest/qmp-test.o
-tests/qtest/qmp-cmd-test$(EXESUF): tests/qtest/qmp-cmd-test.o
-tests/qtest/device-introspect-test$(EXESUF): tests/qtest/device-introspect-test.o
-tests/qtest/rtc-test$(EXESUF): tests/qtest/rtc-test.o
-tests/qtest/m48t59-test$(EXESUF): tests/qtest/m48t59-test.o
-tests/qtest/hexloader-test$(EXESUF): tests/qtest/hexloader-test.o
-tests/qtest/pflash-cfi02$(EXESUF): tests/qtest/pflash-cfi02-test.o
-tests/qtest/endianness-test$(EXESUF): tests/qtest/endianness-test.o
-tests/qtest/prom-env-test$(EXESUF): tests/qtest/prom-env-test.o $(libqos-obj-y)
-tests/qtest/rtas-test$(EXESUF): tests/qtest/rtas-test.o $(libqos-spapr-obj-y)
-tests/qtest/fdc-test$(EXESUF): tests/qtest/fdc-test.o
-tests/qtest/ide-test$(EXESUF): tests/qtest/ide-test.o $(libqos-pc-obj-y)
-tests/qtest/ahci-test$(EXESUF): tests/qtest/ahci-test.o $(libqos-pc-obj-y) qemu-img$(EXESUF)
-tests/qtest/ipmi-kcs-test$(EXESUF): tests/qtest/ipmi-kcs-test.o
-tests/qtest/ipmi-bt-test$(EXESUF): tests/qtest/ipmi-bt-test.o
-tests/qtest/hd-geo-test$(EXESUF): tests/qtest/hd-geo-test.o $(libqos-obj-y)
-tests/qtest/boot-order-test$(EXESUF): tests/qtest/boot-order-test.o $(libqos-obj-y)
-tests/qtest/boot-serial-test$(EXESUF): tests/qtest/boot-serial-test.o $(libqos-obj-y)
-tests/qtest/bios-tables-test$(EXESUF): tests/qtest/bios-tables-test.o \
-	tests/qtest/boot-sector.o tests/qtest/acpi-utils.o $(libqos-obj-y)
-tests/qtest/pxe-test$(EXESUF): tests/qtest/pxe-test.o tests/qtest/boot-sector.o $(libqos-obj-y)
-tests/qtest/microbit-test$(EXESUF): tests/qtest/microbit-test.o
-tests/qtest/m25p80-test$(EXESUF): tests/qtest/m25p80-test.o
-tests/qtest/i440fx-test$(EXESUF): tests/qtest/i440fx-test.o $(libqos-pc-obj-y)
-tests/qtest/q35-test$(EXESUF): tests/qtest/q35-test.o $(libqos-pc-obj-y)
-tests/qtest/fw_cfg-test$(EXESUF): tests/qtest/fw_cfg-test.o $(libqos-pc-obj-y)
-tests/qtest/rtl8139-test$(EXESUF): tests/qtest/rtl8139-test.o $(libqos-pc-obj-y)
-tests/qtest/pnv-xscom-test$(EXESUF): tests/qtest/pnv-xscom-test.o
-tests/qtest/wdt_ib700-test$(EXESUF): tests/qtest/wdt_ib700-test.o
-tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y)
-tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o
-tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o
-tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o
-tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o
-tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o
-tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.o
-tests/qtest/drive_del-test$(EXESUF): tests/qtest/drive_del-test.o
-tests/qtest/pvpanic-test$(EXESUF): tests/qtest/pvpanic-test.o
-tests/qtest/i82801b11-test$(EXESUF): tests/qtest/i82801b11-test.o
-tests/qtest/intel-hda-test$(EXESUF): tests/qtest/intel-hda-test.o
-tests/qtest/ioh3420-test$(EXESUF): tests/qtest/ioh3420-test.o
-tests/qtest/usb-hcd-uhci-test$(EXESUF): tests/qtest/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
-tests/qtest/usb-hcd-ehci-test$(EXESUF): tests/qtest/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
-tests/qtest/usb-hcd-xhci-test$(EXESUF): tests/qtest/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
-tests/qtest/cpu-plug-test$(EXESUF): tests/qtest/cpu-plug-test.o
-tests/qtest/migration-test$(EXESUF): tests/qtest/migration-test.o
-tests/qtest/qemu-iotests/qtest/socket_scm_helper$(EXESUF): tests/qtest/qemu-iotests/qtest/socket_scm_helper.o
-tests/qtest/test-netfilter$(EXESUF): tests/qtest/test-netfilter.o $(qtest-obj-y)
-tests/qtest/test-filter-mirror$(EXESUF): tests/qtest/test-filter-mirror.o $(qtest-obj-y)
-tests/qtest/test-filter-redirector$(EXESUF): tests/qtest/test-filter-redirector.o $(qtest-obj-y)
-tests/qtest/test-x86-cpuid-compat$(EXESUF): tests/qtest/test-x86-cpuid-compat.o $(qtest-obj-y)
-tests/qtest/ivshmem-test$(EXESUF): tests/qtest/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
-tests/qtest/vhost-user-bridge$(EXESUF): tests/qtest/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
-tests/qtest/test-arm-mptimer$(EXESUF): tests/qtest/test-arm-mptimer.o
-tests/qtest/numa-test$(EXESUF): tests/qtest/numa-test.o
-tests/qtest/vmgenid-test$(EXESUF): tests/qtest/vmgenid-test.o tests/qtest/boot-sector.o tests/qtest/acpi-utils.o
-tests/qtest/cdrom-test$(EXESUF): tests/qtest/cdrom-test.o tests/qtest/boot-sector.o $(libqos-obj-y)
-tests/qtest/arm-cpu-features$(EXESUF): tests/qtest/arm-cpu-features.o
-
 tests/migration/stress$(EXESUF): tests/migration/stress.o
 	$(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"LINK","$(TARGET_DIR)$@")
 
@@ -859,19 +562,7 @@ tests/migration/initrd-stress.img: tests/migration/stress$(EXESUF)
 	rm $(INITRD_WORK_DIR)/init
 	rmdir $(INITRD_WORK_DIR)
 
-# QTest rules
-
-TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
-ifeq ($(CONFIG_POSIX),y)
-QTEST_TARGETS = $(TARGETS)
-check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y:%=tests/qtest/%$(EXESUF)))
-check-qtest-y += $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF))
-else
-QTEST_TARGETS =
-endif
-
-qtest-obj-y = tests/qtest/libqtest.o $(test-util-obj-y)
-$(check-qtest-y): $(qtest-obj-y)
+include $(SRC_PATH)/tests/qtest/Makefile.include
 
 tests/test-qga$(EXESUF): qemu-ga$(EXESUF)
 tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y)
tests/qtest/Makefile.include new file +310 -0

310 lines not on this page · raw message

Signature · 1 line
2.18.1
#7 lore raw

PATCH v2 7/7 tests/libqos: Move the libqos files under tests/qtest/

In reply to Thomas Huth

The qos stuff belongs to qtest, so move it into that directory, too.

---
 MAINTAINERS                                   |  9 +--
 configure                                     |  4 +-
 tests/Makefile.include                        |  2 +-
 tests/qtest/Makefile.include                  | 80 +++++++++----------
 .../libqos/aarch64-xlnx-zcu102-machine.c      |  0
 tests/{ => qtest}/libqos/ahci.c               |  0
 tests/{ => qtest}/libqos/ahci.h               |  0
 .../libqos/arm-imx25-pdk-machine.c            |  0
 tests/{ => qtest}/libqos/arm-n800-machine.c   |  0
 tests/{ => qtest}/libqos/arm-raspi2-machine.c |  0
 .../libqos/arm-sabrelite-machine.c            |  0
 .../{ => qtest}/libqos/arm-smdkc210-machine.c |  0
 tests/{ => qtest}/libqos/arm-virt-machine.c   |  0
 .../libqos/arm-xilinx-zynq-a9-machine.c       |  0
 tests/{ => qtest}/libqos/e1000e.c             |  0
 tests/{ => qtest}/libqos/e1000e.h             |  0
 tests/{ => qtest}/libqos/fw_cfg.c             |  0
 tests/{ => qtest}/libqos/fw_cfg.h             |  0
 tests/{ => qtest}/libqos/i2c-imx.c            |  0
 tests/{ => qtest}/libqos/i2c-omap.c           |  0
 tests/{ => qtest}/libqos/i2c.c                |  0
 tests/{ => qtest}/libqos/i2c.h                |  0
 tests/{ => qtest}/libqos/libqos-pc.c          |  0
 tests/{ => qtest}/libqos/libqos-pc.h          |  0
 tests/{ => qtest}/libqos/libqos-spapr.c       |  0
 tests/{ => qtest}/libqos/libqos-spapr.h       |  0
 tests/{ => qtest}/libqos/libqos.c             |  0
 tests/{ => qtest}/libqos/libqos.h             |  0
 tests/{ => qtest}/libqos/malloc-pc.c          |  0
 tests/{ => qtest}/libqos/malloc-pc.h          |  0
 tests/{ => qtest}/libqos/malloc-spapr.c       |  0
 tests/{ => qtest}/libqos/malloc-spapr.h       |  0
 tests/{ => qtest}/libqos/malloc.c             |  0
 tests/{ => qtest}/libqos/malloc.h             |  0
 tests/{ => qtest}/libqos/pci-pc.c             |  0
 tests/{ => qtest}/libqos/pci-pc.h             |  0
 tests/{ => qtest}/libqos/pci-spapr.c          |  0
 tests/{ => qtest}/libqos/pci-spapr.h          |  0
 tests/{ => qtest}/libqos/pci.c                |  0
 tests/{ => qtest}/libqos/pci.h                |  0
 .../libqos/ppc64_pseries-machine.c            |  0
 tests/{ => qtest}/libqos/qgraph.c             |  0
 tests/{ => qtest}/libqos/qgraph.h             |  0
 tests/{ => qtest}/libqos/qgraph_internal.h    |  0
 tests/{ => qtest}/libqos/rtas.c               |  0
 tests/{ => qtest}/libqos/rtas.h               |  0
 tests/{ => qtest}/libqos/sdhci.c              |  0
 tests/{ => qtest}/libqos/sdhci.h              |  0
 tests/{ => qtest}/libqos/tpci200.c            |  0
 tests/{ => qtest}/libqos/usb.c                |  0
 tests/{ => qtest}/libqos/usb.h                |  0
 tests/{ => qtest}/libqos/virtio-9p.c          |  0
 tests/{ => qtest}/libqos/virtio-9p.h          |  0
 tests/{ => qtest}/libqos/virtio-balloon.c     |  0
 tests/{ => qtest}/libqos/virtio-balloon.h     |  0
 tests/{ => qtest}/libqos/virtio-blk.c         |  0
 tests/{ => qtest}/libqos/virtio-blk.h         |  0
 tests/{ => qtest}/libqos/virtio-mmio.c        |  0
 tests/{ => qtest}/libqos/virtio-mmio.h        |  0
 tests/{ => qtest}/libqos/virtio-net.c         |  0
 tests/{ => qtest}/libqos/virtio-net.h         |  0
 tests/{ => qtest}/libqos/virtio-pci-modern.c  |  0
 tests/{ => qtest}/libqos/virtio-pci-modern.h  |  0
 tests/{ => qtest}/libqos/virtio-pci.c         |  0
 tests/{ => qtest}/libqos/virtio-pci.h         |  0
 tests/{ => qtest}/libqos/virtio-rng.c         |  0
 tests/{ => qtest}/libqos/virtio-rng.h         |  0
 tests/{ => qtest}/libqos/virtio-scsi.c        |  0
 tests/{ => qtest}/libqos/virtio-scsi.h        |  0
 tests/{ => qtest}/libqos/virtio-serial.c      |  0
 tests/{ => qtest}/libqos/virtio-serial.h      |  0
 tests/{ => qtest}/libqos/virtio.c             |  0
 tests/{ => qtest}/libqos/virtio.h             |  0
 tests/{ => qtest}/libqos/x86_64_pc-machine.c  |  0
 74 files changed, 47 insertions(+), 48 deletions(-)
 rename tests/{ => qtest}/libqos/aarch64-xlnx-zcu102-machine.c (100%)
 rename tests/{ => qtest}/libqos/ahci.c (100%)
 rename tests/{ => qtest}/libqos/ahci.h (100%)
 rename tests/{ => qtest}/libqos/arm-imx25-pdk-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-n800-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-raspi2-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-sabrelite-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-smdkc210-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-virt-machine.c (100%)
 rename tests/{ => qtest}/libqos/arm-xilinx-zynq-a9-machine.c (100%)
 rename tests/{ => qtest}/libqos/e1000e.c (100%)
 rename tests/{ => qtest}/libqos/e1000e.h (100%)
 rename tests/{ => qtest}/libqos/fw_cfg.c (100%)
 rename tests/{ => qtest}/libqos/fw_cfg.h (100%)
 rename tests/{ => qtest}/libqos/i2c-imx.c (100%)
 rename tests/{ => qtest}/libqos/i2c-omap.c (100%)
 rename tests/{ => qtest}/libqos/i2c.c (100%)
 rename tests/{ => qtest}/libqos/i2c.h (100%)
 rename tests/{ => qtest}/libqos/libqos-pc.c (100%)
 rename tests/{ => qtest}/libqos/libqos-pc.h (100%)
 rename tests/{ => qtest}/libqos/libqos-spapr.c (100%)
 rename tests/{ => qtest}/libqos/libqos-spapr.h (100%)
 rename tests/{ => qtest}/libqos/libqos.c (100%)
 rename tests/{ => qtest}/libqos/libqos.h (100%)
 rename tests/{ => qtest}/libqos/malloc-pc.c (100%)
 rename tests/{ => qtest}/libqos/malloc-pc.h (100%)
 rename tests/{ => qtest}/libqos/malloc-spapr.c (100%)
 rename tests/{ => qtest}/libqos/malloc-spapr.h (100%)
 rename tests/{ => qtest}/libqos/malloc.c (100%)
 rename tests/{ => qtest}/libqos/malloc.h (100%)
 rename tests/{ => qtest}/libqos/pci-pc.c (100%)
 rename tests/{ => qtest}/libqos/pci-pc.h (100%)
 rename tests/{ => qtest}/libqos/pci-spapr.c (100%)
 rename tests/{ => qtest}/libqos/pci-spapr.h (100%)
 rename tests/{ => qtest}/libqos/pci.c (100%)
 rename tests/{ => qtest}/libqos/pci.h (100%)
 rename tests/{ => qtest}/libqos/ppc64_pseries-machine.c (100%)
 rename tests/{ => qtest}/libqos/qgraph.c (100%)
 rename tests/{ => qtest}/libqos/qgraph.h (100%)
 rename tests/{ => qtest}/libqos/qgraph_internal.h (100%)
 rename tests/{ => qtest}/libqos/rtas.c (100%)
 rename tests/{ => qtest}/libqos/rtas.h (100%)
 rename tests/{ => qtest}/libqos/sdhci.c (100%)
 rename tests/{ => qtest}/libqos/sdhci.h (100%)
 rename tests/{ => qtest}/libqos/tpci200.c (100%)
 rename tests/{ => qtest}/libqos/usb.c (100%)
 rename tests/{ => qtest}/libqos/usb.h (100%)
 rename tests/{ => qtest}/libqos/virtio-9p.c (100%)
 rename tests/{ => qtest}/libqos/virtio-9p.h (100%)
 rename tests/{ => qtest}/libqos/virtio-balloon.c (100%)
 rename tests/{ => qtest}/libqos/virtio-balloon.h (100%)
 rename tests/{ => qtest}/libqos/virtio-blk.c (100%)
 rename tests/{ => qtest}/libqos/virtio-blk.h (100%)
 rename tests/{ => qtest}/libqos/virtio-mmio.c (100%)
 rename tests/{ => qtest}/libqos/virtio-mmio.h (100%)
 rename tests/{ => qtest}/libqos/virtio-net.c (100%)
 rename tests/{ => qtest}/libqos/virtio-net.h (100%)
 rename tests/{ => qtest}/libqos/virtio-pci-modern.c (100%)
 rename tests/{ => qtest}/libqos/virtio-pci-modern.h (100%)
 rename tests/{ => qtest}/libqos/virtio-pci.c (100%)
 rename tests/{ => qtest}/libqos/virtio-pci.h (100%)
 rename tests/{ => qtest}/libqos/virtio-rng.c (100%)
 rename tests/{ => qtest}/libqos/virtio-rng.h (100%)
 rename tests/{ => qtest}/libqos/virtio-scsi.c (100%)
 rename tests/{ => qtest}/libqos/virtio-scsi.h (100%)
 rename tests/{ => qtest}/libqos/virtio-serial.c (100%)
 rename tests/{ => qtest}/libqos/virtio-serial.h (100%)
 rename tests/{ => qtest}/libqos/virtio.c (100%)
 rename tests/{ => qtest}/libqos/virtio.h (100%)
 rename tests/{ => qtest}/libqos/x86_64_pc-machine.c (100%)
MAINTAINERS +4 -5
index d571e16cc8..b9456340f3 100644
@@ -1101,9 +1101,9 @@ F: pc-bios/slof.bin
 F: docs/specs/ppc-spapr-hcalls.txt
 F: docs/specs/ppc-spapr-hotplug.txt
 F: tests/qtest/spapr*
-F: tests/libqos/*spapr*
+F: tests/qtest/libqos/*spapr*
 F: tests/qtest/rtas*
-F: tests/libqos/rtas*
+F: tests/qtest/libqos/rtas*
 
 PowerNV (Non-Virtualized)
 M: Cédric Le Goater <[email protected]>
@@ -1362,7 +1362,7 @@ F: hw/block/hd-geometry.c
 F: tests/qtest/ide-test.c
 F: tests/qtest/ahci-test.c
 F: tests/qtest/cdrom-test.c
-F: tests/libqos/ahci*
+F: tests/qtest/libqos/ahci*
 T: git https://github.com/jnsnow/qemu.git ide
 
 IPMI
@@ -1774,7 +1774,7 @@ F: hw/nvram/fw_cfg.c
 F: stubs/fw_cfg.c
 F: include/hw/nvram/fw_cfg.h
 F: include/standard-headers/linux/qemu_fw_cfg.h
-F: tests/libqos/fw_cfg.c
+F: tests/qtest/libqos/fw_cfg.c
 F: tests/qtest/fw_cfg-test.c
 T: git https://github.com/philmd/qemu.git fw_cfg-next
 
@@ -2135,7 +2135,6 @@ R: Paolo Bonzini <[email protected]>
 S: Maintained
 F: qtest.c
 F: accel/qtest.c
-F: tests/libqos/
 F: tests/qtest/
 
 Register API
configure +2 -2
index 121f1317e2..649d207784 100755
@@ -7952,8 +7952,8 @@ fi
 # so the build tree will be missing the link back to the new file, and
 # tests might fail. Prefer to keep the relevant files in their own
 # directory and symlink the directory instead.
-DIRS="tests tests/tcg tests/tcg/lm32 tests/libqos tests/qapi-schema tests/qtest"
-DIRS="$DIRS tests/qemu-iotests tests/vm tests/fp tests/qgraph"
+DIRS="tests tests/tcg tests/tcg/lm32 tests/qapi-schema tests/qtest/libqos"
+DIRS="$DIRS tests/qtest tests/qemu-iotests tests/vm tests/fp tests/qgraph"
 DIRS="$DIRS docs docs/interop fsdev scsi"
 DIRS="$DIRS pc-bios/optionrom pc-bios/s390-ccw"
 DIRS="$DIRS roms/seabios roms/vgabios"
tests/Makefile.include +1 -1
index 9d953097c4..d4e3b6c6bb 100644
@@ -900,6 +900,6 @@ all: $(QEMU_IOTESTS_HELPERS-y)
 
 -include $(wildcard tests/*.d)
 -include $(wildcard tests/qtest/*.d)
--include $(wildcard tests/libqos/*.d)
+-include $(wildcard tests/qtest/qos/*.d)
 
 endif
tests/qtest/Makefile.include +40 -40

92 lines not on this page · raw message

tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c renamed from tests/libqos/aarch64-xlnx-zcu102-machine.c +0 -0
similarity index 100%
rename from tests/libqos/aarch64-xlnx-zcu102-machine.c
rename to tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
tests/qtest/libqos/ahci.c renamed from tests/libqos/ahci.c +0 -0
similarity index 100%
rename from tests/libqos/ahci.c
rename to tests/qtest/libqos/ahci.c
tests/qtest/libqos/ahci.h renamed from tests/libqos/ahci.h +0 -0
similarity index 100%
rename from tests/libqos/ahci.h
rename to tests/qtest/libqos/ahci.h
tests/qtest/libqos/arm-imx25-pdk-machine.c renamed from tests/libqos/arm-imx25-pdk-machine.c +0 -0
similarity index 100%
rename from tests/libqos/arm-imx25-pdk-machine.c
rename to tests/qtest/libqos/arm-imx25-pdk-machine.c
tests/qtest/libqos/arm-n800-machine.c renamed from tests/libqos/arm-n800-machine.c +0 -0
similarity index 100%
rename from tests/libqos/arm-n800-machine.c
rename to tests/qtest/libqos/arm-n800-machine.c
tests/qtest/libqos/arm-raspi2-machine.c renamed from tests/libqos/arm-raspi2-machine.c +0 -0
similarity index 100%
rename from tests/libqos/arm-raspi2-machine.c
rename to tests/qtest/libqos/arm-raspi2-machine.c
tests/qtest/libqos/arm-sabrelite-machine.c renamed from tests/libqos/arm-sabrelite-machine.c +0 -0
similarity index 100%
rename from tests/libqos/arm-sabrelite-machine.c
rename to tests/qtest/libqos/arm-sabrelite-machine.c
tests/qtest/libqos/arm-smdkc210-machine.c renamed from tests/libqos/arm-smdkc210-machine.c +0 -0
similarity index 100%
rename from tests/libqos/arm-smdkc210-machine.c
rename to tests/qtest/libqos/arm-smdkc210-machine.c
tests/qtest/libqos/arm-virt-machine.c renamed from tests/libqos/arm-virt-machine.c +0 -0
similarity index 100%
rename from tests/libqos/arm-virt-machine.c
rename to tests/qtest/libqos/arm-virt-machine.c
tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c renamed from tests/libqos/arm-xilinx-zynq-a9-machine.c +0 -0
similarity index 100%
rename from tests/libqos/arm-xilinx-zynq-a9-machine.c
rename to tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
tests/qtest/libqos/e1000e.c renamed from tests/libqos/e1000e.c +0 -0
similarity index 100%
rename from tests/libqos/e1000e.c
rename to tests/qtest/libqos/e1000e.c
tests/qtest/libqos/e1000e.h renamed from tests/libqos/e1000e.h +0 -0
similarity index 100%
rename from tests/libqos/e1000e.h
rename to tests/qtest/libqos/e1000e.h
tests/qtest/libqos/fw_cfg.c renamed from tests/libqos/fw_cfg.c +0 -0
similarity index 100%
rename from tests/libqos/fw_cfg.c
rename to tests/qtest/libqos/fw_cfg.c
tests/qtest/libqos/fw_cfg.h renamed from tests/libqos/fw_cfg.h +0 -0
similarity index 100%
rename from tests/libqos/fw_cfg.h
rename to tests/qtest/libqos/fw_cfg.h
tests/qtest/libqos/i2c-imx.c renamed from tests/libqos/i2c-imx.c +0 -0
similarity index 100%
rename from tests/libqos/i2c-imx.c
rename to tests/qtest/libqos/i2c-imx.c
tests/qtest/libqos/i2c-omap.c renamed from tests/libqos/i2c-omap.c +0 -0
similarity index 100%
rename from tests/libqos/i2c-omap.c
rename to tests/qtest/libqos/i2c-omap.c
tests/qtest/libqos/i2c.c renamed from tests/libqos/i2c.c +0 -0
similarity index 100%
rename from tests/libqos/i2c.c
rename to tests/qtest/libqos/i2c.c
tests/qtest/libqos/i2c.h renamed from tests/libqos/i2c.h +0 -0
similarity index 100%
rename from tests/libqos/i2c.h
rename to tests/qtest/libqos/i2c.h
tests/qtest/libqos/libqos-pc.c renamed from tests/libqos/libqos-pc.c +0 -0
similarity index 100%
rename from tests/libqos/libqos-pc.c
rename to tests/qtest/libqos/libqos-pc.c
tests/qtest/libqos/libqos-pc.h renamed from tests/libqos/libqos-pc.h +0 -0
similarity index 100%
rename from tests/libqos/libqos-pc.h
rename to tests/qtest/libqos/libqos-pc.h
tests/qtest/libqos/libqos-spapr.c renamed from tests/libqos/libqos-spapr.c +0 -0
similarity index 100%
rename from tests/libqos/libqos-spapr.c
rename to tests/qtest/libqos/libqos-spapr.c
tests/qtest/libqos/libqos-spapr.h renamed from tests/libqos/libqos-spapr.h +0 -0
similarity index 100%
rename from tests/libqos/libqos-spapr.h
rename to tests/qtest/libqos/libqos-spapr.h
tests/qtest/libqos/libqos.c renamed from tests/libqos/libqos.c +0 -0
similarity index 100%
rename from tests/libqos/libqos.c
rename to tests/qtest/libqos/libqos.c
tests/qtest/libqos/libqos.h renamed from tests/libqos/libqos.h +0 -0
similarity index 100%
rename from tests/libqos/libqos.h
rename to tests/qtest/libqos/libqos.h
tests/qtest/libqos/malloc-pc.c renamed from tests/libqos/malloc-pc.c +0 -0
similarity index 100%
rename from tests/libqos/malloc-pc.c
rename to tests/qtest/libqos/malloc-pc.c
tests/qtest/libqos/malloc-pc.h renamed from tests/libqos/malloc-pc.h +0 -0
similarity index 100%
rename from tests/libqos/malloc-pc.h
rename to tests/qtest/libqos/malloc-pc.h
tests/qtest/libqos/malloc-spapr.c renamed from tests/libqos/malloc-spapr.c +0 -0
similarity index 100%
rename from tests/libqos/malloc-spapr.c
rename to tests/qtest/libqos/malloc-spapr.c
tests/qtest/libqos/malloc-spapr.h renamed from tests/libqos/malloc-spapr.h +0 -0
similarity index 100%
rename from tests/libqos/malloc-spapr.h
rename to tests/qtest/libqos/malloc-spapr.h
tests/qtest/libqos/malloc.c renamed from tests/libqos/malloc.c +0 -0
similarity index 100%
rename from tests/libqos/malloc.c
rename to tests/qtest/libqos/malloc.c
tests/qtest/libqos/malloc.h renamed from tests/libqos/malloc.h +0 -0
similarity index 100%
rename from tests/libqos/malloc.h
rename to tests/qtest/libqos/malloc.h
tests/qtest/libqos/pci-pc.c renamed from tests/libqos/pci-pc.c +0 -0
similarity index 100%
rename from tests/libqos/pci-pc.c
rename to tests/qtest/libqos/pci-pc.c
tests/qtest/libqos/pci-pc.h renamed from tests/libqos/pci-pc.h +0 -0
similarity index 100%
rename from tests/libqos/pci-pc.h
rename to tests/qtest/libqos/pci-pc.h
tests/qtest/libqos/pci-spapr.c renamed from tests/libqos/pci-spapr.c +0 -0
similarity index 100%
rename from tests/libqos/pci-spapr.c
rename to tests/qtest/libqos/pci-spapr.c
tests/qtest/libqos/pci-spapr.h renamed from tests/libqos/pci-spapr.h +0 -0
similarity index 100%
rename from tests/libqos/pci-spapr.h
rename to tests/qtest/libqos/pci-spapr.h
tests/qtest/libqos/pci.c renamed from tests/libqos/pci.c +0 -0
similarity index 100%
rename from tests/libqos/pci.c
rename to tests/qtest/libqos/pci.c
tests/qtest/libqos/pci.h renamed from tests/libqos/pci.h +0 -0
similarity index 100%
rename from tests/libqos/pci.h
rename to tests/qtest/libqos/pci.h
tests/qtest/libqos/ppc64_pseries-machine.c renamed from tests/libqos/ppc64_pseries-machine.c +0 -0
similarity index 100%
rename from tests/libqos/ppc64_pseries-machine.c
rename to tests/qtest/libqos/ppc64_pseries-machine.c
tests/qtest/libqos/qgraph.c renamed from tests/libqos/qgraph.c +0 -0
similarity index 100%
rename from tests/libqos/qgraph.c
rename to tests/qtest/libqos/qgraph.c
tests/qtest/libqos/qgraph.h renamed from tests/libqos/qgraph.h +0 -0
similarity index 100%
rename from tests/libqos/qgraph.h
rename to tests/qtest/libqos/qgraph.h
tests/qtest/libqos/qgraph_internal.h renamed from tests/libqos/qgraph_internal.h +0 -0
similarity index 100%
rename from tests/libqos/qgraph_internal.h
rename to tests/qtest/libqos/qgraph_internal.h
tests/qtest/libqos/rtas.c renamed from tests/libqos/rtas.c +0 -0
similarity index 100%
rename from tests/libqos/rtas.c
rename to tests/qtest/libqos/rtas.c
tests/qtest/libqos/rtas.h renamed from tests/libqos/rtas.h +0 -0
similarity index 100%
rename from tests/libqos/rtas.h
rename to tests/qtest/libqos/rtas.h
tests/qtest/libqos/sdhci.c renamed from tests/libqos/sdhci.c +0 -0
similarity index 100%
rename from tests/libqos/sdhci.c
rename to tests/qtest/libqos/sdhci.c
tests/qtest/libqos/sdhci.h renamed from tests/libqos/sdhci.h +0 -0
similarity index 100%
rename from tests/libqos/sdhci.h
rename to tests/qtest/libqos/sdhci.h
tests/qtest/libqos/tpci200.c renamed from tests/libqos/tpci200.c +0 -0
similarity index 100%
rename from tests/libqos/tpci200.c
rename to tests/qtest/libqos/tpci200.c
tests/qtest/libqos/usb.c renamed from tests/libqos/usb.c +0 -0
similarity index 100%
rename from tests/libqos/usb.c
rename to tests/qtest/libqos/usb.c
tests/qtest/libqos/usb.h renamed from tests/libqos/usb.h +0 -0
similarity index 100%
rename from tests/libqos/usb.h
rename to tests/qtest/libqos/usb.h
tests/qtest/libqos/virtio-9p.c renamed from tests/libqos/virtio-9p.c +0 -0
similarity index 100%
rename from tests/libqos/virtio-9p.c
rename to tests/qtest/libqos/virtio-9p.c
tests/qtest/libqos/virtio-9p.h renamed from tests/libqos/virtio-9p.h +0 -0
similarity index 100%
rename from tests/libqos/virtio-9p.h
rename to tests/qtest/libqos/virtio-9p.h
tests/qtest/libqos/virtio-balloon.c renamed from tests/libqos/virtio-balloon.c +0 -0
similarity index 100%
rename from tests/libqos/virtio-balloon.c
rename to tests/qtest/libqos/virtio-balloon.c
tests/qtest/libqos/virtio-balloon.h renamed from tests/libqos/virtio-balloon.h +0 -0
similarity index 100%
rename from tests/libqos/virtio-balloon.h
rename to tests/qtest/libqos/virtio-balloon.h
tests/qtest/libqos/virtio-blk.c renamed from tests/libqos/virtio-blk.c +0 -0
similarity index 100%
rename from tests/libqos/virtio-blk.c
rename to tests/qtest/libqos/virtio-blk.c
tests/qtest/libqos/virtio-blk.h renamed from tests/libqos/virtio-blk.h +0 -0
similarity index 100%
rename from tests/libqos/virtio-blk.h
rename to tests/qtest/libqos/virtio-blk.h
tests/qtest/libqos/virtio-mmio.c renamed from tests/libqos/virtio-mmio.c +0 -0
similarity index 100%
rename from tests/libqos/virtio-mmio.c
rename to tests/qtest/libqos/virtio-mmio.c
tests/qtest/libqos/virtio-mmio.h renamed from tests/libqos/virtio-mmio.h +0 -0
similarity index 100%
rename from tests/libqos/virtio-mmio.h
rename to tests/qtest/libqos/virtio-mmio.h
tests/qtest/libqos/virtio-net.c renamed from tests/libqos/virtio-net.c +0 -0
similarity index 100%
rename from tests/libqos/virtio-net.c
rename to tests/qtest/libqos/virtio-net.c
tests/qtest/libqos/virtio-net.h renamed from tests/libqos/virtio-net.h +0 -0
similarity index 100%
rename from tests/libqos/virtio-net.h
rename to tests/qtest/libqos/virtio-net.h
tests/qtest/libqos/virtio-pci-modern.c renamed from tests/libqos/virtio-pci-modern.c +0 -0
similarity index 100%
rename from tests/libqos/virtio-pci-modern.c
rename to tests/qtest/libqos/virtio-pci-modern.c
tests/qtest/libqos/virtio-pci-modern.h renamed from tests/libqos/virtio-pci-modern.h +0 -0
similarity index 100%
rename from tests/libqos/virtio-pci-modern.h
rename to tests/qtest/libqos/virtio-pci-modern.h
tests/qtest/libqos/virtio-pci.c renamed from tests/libqos/virtio-pci.c +0 -0
similarity index 100%
rename from tests/libqos/virtio-pci.c
rename to tests/qtest/libqos/virtio-pci.c
tests/qtest/libqos/virtio-pci.h renamed from tests/libqos/virtio-pci.h +0 -0
similarity index 100%
rename from tests/libqos/virtio-pci.h
rename to tests/qtest/libqos/virtio-pci.h
tests/qtest/libqos/virtio-rng.c renamed from tests/libqos/virtio-rng.c +0 -0
similarity index 100%
rename from tests/libqos/virtio-rng.c
rename to tests/qtest/libqos/virtio-rng.c
tests/qtest/libqos/virtio-rng.h renamed from tests/libqos/virtio-rng.h +0 -0
similarity index 100%
rename from tests/libqos/virtio-rng.h
rename to tests/qtest/libqos/virtio-rng.h
tests/qtest/libqos/virtio-scsi.c renamed from tests/libqos/virtio-scsi.c +0 -0
similarity index 100%
rename from tests/libqos/virtio-scsi.c
rename to tests/qtest/libqos/virtio-scsi.c
tests/qtest/libqos/virtio-scsi.h renamed from tests/libqos/virtio-scsi.h +0 -0
similarity index 100%
rename from tests/libqos/virtio-scsi.h
rename to tests/qtest/libqos/virtio-scsi.h
tests/qtest/libqos/virtio-serial.c renamed from tests/libqos/virtio-serial.c +0 -0
similarity index 100%
rename from tests/libqos/virtio-serial.c
rename to tests/qtest/libqos/virtio-serial.c
tests/qtest/libqos/virtio-serial.h renamed from tests/libqos/virtio-serial.h +0 -0
similarity index 100%
rename from tests/libqos/virtio-serial.h
rename to tests/qtest/libqos/virtio-serial.h
tests/qtest/libqos/virtio.c renamed from tests/libqos/virtio.c +0 -0
similarity index 100%
rename from tests/libqos/virtio.c
rename to tests/qtest/libqos/virtio.c
tests/qtest/libqos/virtio.h renamed from tests/libqos/virtio.h +0 -0
similarity index 100%
rename from tests/libqos/virtio.h
rename to tests/qtest/libqos/virtio.h
tests/qtest/libqos/x86_64_pc-machine.c renamed from tests/libqos/x86_64_pc-machine.c +0 -0
similarity index 100%
rename from tests/libqos/x86_64_pc-machine.c
rename to tests/qtest/libqos/x86_64_pc-machine.c
Signature · 1 line
2.18.1
Reviewed-by on the v2 series
#8 lore raw
In reply to Thomas Huth
Quoted 10 lines · Thomas Huth

Our "tests" directory is very overcrowded - we store the qtests, unit test and other files there. That makes it difficult to determine which file belongs to each test subsystem, and the wildcards in the MAINTAINERS file are inaccurate, too.

Let's clean up this mess. The first patches disentangle some dependencies, and the last three patches then move the qtests and libqos (which is a subsystem of the qtests) to a new folder called "tests/qtest/".

Quoted 6 lines

v2:
- Rebase to current master branch
- Move all tests/tpm* files to tests/qtest (since they are part of the corresponding qtests)
- Double-checked all entries in MAINTAINERS, so they should hopefully be correct now