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%)
--
2.18.1
