izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

meson: convert tests/qtest to meson

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
2020-08-21 06:30:20 -04:00
parent 2634733c6b
commit a2ce7dbd91
147 changed files with 541 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson.build
+3
View File
@@ -535,6 +535,9 @@ subdir('nbd')
subdir('scsi') subdir('scsi')
subdir('block') subdir('block')
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
block_mods = [] block_mods = []
softmmu_mods = [] softmmu_mods = []
foreach d, list : modules foreach d, list : modules
tests/Makefile.include
+6 -41
View File
@@ -109,6 +109,7 @@ check-unit-y += tests/test-qht$(EXESUF)
check-unit-y += tests/test-qht-par$(EXESUF) check-unit-y += tests/test-qht-par$(EXESUF)
check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-bitops$(EXESUF)
check-unit-y += tests/test-bitcnt$(EXESUF) check-unit-y += tests/test-bitcnt$(EXESUF)
check-unit-y += tests/test-qgraph$(EXESUF)
check-unit-y += tests/check-qom-interface$(EXESUF) check-unit-y += tests/check-qom-interface$(EXESUF)
check-unit-y += tests/check-qom-proplist$(EXESUF) check-unit-y += tests/check-qom-proplist$(EXESUF)
check-unit-y += tests/test-qemu-opts$(EXESUF) check-unit-y += tests/test-qemu-opts$(EXESUF)
@@ -306,19 +307,6 @@ tests/test-qapi-gen-timestamp: \
@rm -f tests/test-qapi-doc.texi @rm -f tests/test-qapi-doc.texi
@>$@ @>$@
tests/qtest/dbus-vmstate1.h tests/qtest/dbus-vmstate1.c: tests/qtest/dbus-vmstate1-gen-timestamp ;
tests/qtest/dbus-vmstate1-gen-timestamp: $(SRC_PATH)/tests/qtest/dbus-vmstate1.xml
$(call quiet-command,$(GDBUS_CODEGEN) $< \
--interface-prefix org.qemu --generate-c-code tests/qtest/dbus-vmstate1, \
"GEN","$(@:%-timestamp=%)")
@>$@
tests/qtest/dbus-vmstate-test.o-cflags := -DSRCDIR="$(SRC_PATH)"
tests/qtest/dbus-vmstate1.o-cflags := $(GIO_CFLAGS)
tests/qtest/dbus-vmstate1.o-libs := $(GIO_LIBS)
tests/qtest/dbus-vmstate-test.o: tests/qtest/dbus-vmstate1.h
tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visitor.o $(test-qapi-obj-y) tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visitor.o $(test-qapi-obj-y)
tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.o $(test-qapi-obj-y) tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.o $(test-qapi-obj-y)
tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) tests/test-qapi-emit-events.o tests/test-qapi-events.o tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) tests/test-qapi-emit-events.o tests/test-qapi-events.o
@@ -333,6 +321,7 @@ tests/test-shift128$(EXESUF): tests/test-shift128.o $(test-util-obj-y)
tests/test-mul64$(EXESUF): tests/test-mul64.o $(test-util-obj-y) tests/test-mul64$(EXESUF): tests/test-mul64.o $(test-util-obj-y)
tests/test-bitops$(EXESUF): tests/test-bitops.o $(test-util-obj-y) tests/test-bitops$(EXESUF): tests/test-bitops.o $(test-util-obj-y)
tests/test-bitcnt$(EXESUF): tests/test-bitcnt.o $(test-util-obj-y) tests/test-bitcnt$(EXESUF): tests/test-bitcnt.o $(test-util-obj-y)
tests/test-qgraph$(EXESUF): tests/test-qgraph.o tests/qtest/libqos/qgraph.o $(test-util-obj-y)
tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o $(test-crypto-obj-y) tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o $(test-crypto-obj-y)
tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test-crypto-obj-y) tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test-crypto-obj-y)
tests/test-crypto-hmac$(EXESUF): tests/test-crypto-hmac.o $(test-crypto-obj-y) tests/test-crypto-hmac$(EXESUF): tests/test-crypto-hmac.o $(test-crypto-obj-y)
@@ -396,10 +385,8 @@ tests/migration/initrd-stress.img: tests/migration/stress$(EXESUF)
rm $(INITRD_WORK_DIR)/init rm $(INITRD_WORK_DIR)/init
rmdir $(INITRD_WORK_DIR) rmdir $(INITRD_WORK_DIR)
include $(SRC_PATH)/tests/qtest/Makefile.include
tests/test-qga$(EXESUF): qga/qemu-ga$(EXESUF) tests/test-qga$(EXESUF): qga/qemu-ga$(EXESUF)
tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y) tests/test-qga$(EXESUF): tests/test-qga.o tests/qtest/libqtest.o $(test-util-obj-y)
tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o
@@ -440,14 +427,6 @@ define do_test_tap
"TAP","$@") "TAP","$@")
endef 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:%=tests/qtest/%$(EXESUF)) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)), \
QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
QTEST_QEMU_IMG=qemu-img$(EXESUF))
build-qtest: $(patsubst %, %-softmmu/all, $(QTEST_TARGETS)) $(check-qtest-y)
build-unit: $(check-unit-y) build-unit: $(check-unit-y)
check-unit: $(check-unit-y) check-unit: $(check-unit-y)
@@ -458,18 +437,9 @@ check-speed: $(check-speed-y)
# gtester tests with TAP output # 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:%=tests/qtest/%$(EXESUF)) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)), \
QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
QTEST_QEMU_IMG=qemu-img$(EXESUF))
check-report-unit.tap: $(check-unit-y) check-report-unit.tap: $(check-unit-y)
$(call do_test_tap,$^) $(call do_test_tap,$^)
# Reports and overall runs
check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
# Plugins # Plugins
ifeq ($(CONFIG_PLUGIN),y) ifeq ($(CONFIG_PLUGIN),y)
.PHONY: plugins .PHONY: plugins
@@ -580,21 +550,18 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images
# Consolidated targets # Consolidated targets
.PHONY: check-block check-qtest check-unit check check-clean get-vm-images .PHONY: check-block check-unit check check-clean get-vm-images
check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
ifeq ($(CONFIG_TOOLS),y) ifeq ($(CONFIG_TOOLS),y)
check-block: $(patsubst %,check-%, $(check-block-y)) check-block: $(patsubst %,check-%, $(check-block-y))
endif endif
check-build: build-unit build-qtest check-build: build-unit
check-clean: check-clean:
rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y)
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y:%=tests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)))
rm -f tests/test-qapi-gen-timestamp rm -f tests/test-qapi-gen-timestamp
rm -f tests/qtest/dbus-vmstate1-gen-timestamp
rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
check: check-block check-unit check-qtest check: check-block check-unit
clean: check-clean clean: check-clean
@@ -603,7 +570,5 @@ clean: check-clean
all: $(QEMU_IOTESTS_HELPERS-y) all: $(QEMU_IOTESTS_HELPERS-y)
-include $(wildcard tests/*.d) -include $(wildcard tests/*.d)
-include $(wildcard tests/qtest/*.d)
-include $(wildcard tests/qtest/libqos/*.d)
endif endif
tests/meson.build
+1
View File
@@ -8,3 +8,4 @@ if 'CONFIG_TCG' in config_host
endif endif
subdir('qapi-schema') subdir('qapi-schema')
subdir('qtest')
tests/qtest/Makefile.include
-332
View File
@@ -1,332 +0,0 @@
# All QTests for now are POSIX-only, but the dependencies are
# really in libqtest, not in the testcases themselves.
check-qtest-generic-y += cdrom-test
check-qtest-generic-y += device-introspect-test
check-qtest-generic-y += machine-none-test
check-qtest-generic-y += qmp-test
check-qtest-generic-y += qmp-cmd-test
check-qtest-generic-y += qom-test
check-qtest-generic-$(CONFIG_MODULES) += modules-test
check-qtest-generic-y += test-hmp
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
DBUS_DAEMON := $(shell which dbus-daemon 2>/dev/null)
ifneq ($(GDBUS_CODEGEN),)
ifneq ($(DBUS_DAEMON),)
# Temporarily disabled due to Patchew failures:
#check-qtest-pci-$(CONFIG_GIO) += dbus-vmstate-test
endif
endif
check-qtest-i386-$(CONFIG_ISA_TESTDEV) = endianness-test
check-qtest-i386-y += fdc-test
check-qtest-i386-y += ide-test
check-qtest-i386-$(CONFIG_TOOLS) += 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_ISA) += tpm-tis-swtpm-test
check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += 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-avr-y += boot-serial-test
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-$(CONFIG_TPM_TIS_SYSBUS) += tpm-tis-device-test
check-qtest-aarch64-$(CONFIG_TPM_TIS_SYSBUS) += tpm-tis-device-swtpm-test
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
# libqos / qgraph :
libqgraph-obj-y = tests/qtest/libqos/qgraph.o
libqos-core-obj-y = $(libqgraph-obj-y) tests/qtest/libqos/pci.o tests/qtest/libqos/fw_cfg.o
libqos-core-obj-y += tests/qtest/libqos/malloc.o
libqos-core-obj-y += tests/qtest/libqos/libqos.o
libqos-spapr-obj-y = $(libqos-core-obj-y) tests/qtest/libqos/malloc-spapr.o
libqos-spapr-obj-y += tests/qtest/libqos/libqos-spapr.o
libqos-spapr-obj-y += tests/qtest/libqos/rtas.o
libqos-spapr-obj-y += tests/qtest/libqos/pci-spapr.o
libqos-pc-obj-y = $(libqos-core-obj-y) tests/qtest/libqos/pci-pc.o
libqos-pc-obj-y += tests/qtest/libqos/malloc-pc.o tests/qtest/libqos/libqos-pc.o
libqos-pc-obj-y += tests/qtest/libqos/ahci.o
libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/qtest/libqos/usb.o
# qos devices:
libqos-obj-y = $(libqgraph-obj-y)
libqos-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
libqos-obj-y += tests/qtest/libqos/qos_external.o
libqos-obj-y += tests/qtest/libqos/e1000e.o
libqos-obj-y += tests/qtest/libqos/i2c.o
libqos-obj-y += tests/qtest/libqos/i2c-imx.o
libqos-obj-y += tests/qtest/libqos/i2c-omap.o
libqos-obj-y += tests/qtest/libqos/sdhci.o
libqos-obj-y += tests/qtest/libqos/tpci200.o
libqos-obj-y += tests/qtest/libqos/virtio.o
libqos-obj-$(CONFIG_VIRTFS) += tests/qtest/libqos/virtio-9p.o
libqos-obj-y += tests/qtest/libqos/virtio-balloon.o
libqos-obj-y += tests/qtest/libqos/virtio-blk.o
libqos-obj-y += tests/qtest/libqos/virtio-mmio.o
libqos-obj-y += tests/qtest/libqos/virtio-net.o
libqos-obj-y += tests/qtest/libqos/virtio-pci.o
libqos-obj-y += tests/qtest/libqos/virtio-pci-modern.o
libqos-obj-y += tests/qtest/libqos/virtio-rng.o
libqos-obj-y += tests/qtest/libqos/virtio-scsi.o
libqos-obj-y += tests/qtest/libqos/virtio-serial.o
# qos machines:
libqos-obj-y += tests/qtest/libqos/aarch64-xlnx-zcu102-machine.o
libqos-obj-y += tests/qtest/libqos/arm-imx25-pdk-machine.o
libqos-obj-y += tests/qtest/libqos/arm-n800-machine.o
libqos-obj-y += tests/qtest/libqos/arm-raspi2-machine.o
libqos-obj-y += tests/qtest/libqos/arm-sabrelite-machine.o
libqos-obj-y += tests/qtest/libqos/arm-smdkc210-machine.o
libqos-obj-y += tests/qtest/libqos/arm-virt-machine.o
libqos-obj-y += tests/qtest/libqos/arm-xilinx-zynq-a9-machine.o
libqos-obj-y += tests/qtest/libqos/ppc64_pseries-machine.o
libqos-obj-y += tests/qtest/libqos/x86_64_pc-machine.o
# qos tests:
qos-test-obj-y += tests/qtest/qos-test.o
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/tulip-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) $(libqos-obj-y)
# QTest dependencies:
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/tpm-emu.o $(test-io-obj-y) \
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/modules-test$(EXESUF): tests/qtest/modules-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/migration-helpers.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/dbus-vmstate-test$(EXESUF): tests/qtest/dbus-vmstate-test.o tests/qtest/migration-helpers.o tests/qtest/dbus-vmstate1.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
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/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-device-swtpm-test$(EXESUF): tests/qtest/tpm-tis-device-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-tis-util.o tests/qtest/tpm-emu.o $(test-io-obj-y)
tests/qtest/tpm-tis-device-test$(EXESUF): tests/qtest/tpm-tis-device-test.o tests/qtest/tpm-tis-util.o tests/qtest/tpm-emu.o $(test-io-obj-y)
# QTest rules
TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
QTEST_TARGETS =
# The qtests are not runnable (yet) under TSan due to a known issue.
# https://github.com/google/sanitizers/issues/1116
ifndef CONFIG_TSAN
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))
endif
endif
qtest-obj-y = tests/qtest/libqtest.o $(test-util-obj-y)
$(check-qtest-y): $(qtest-obj-y)
tests/qtest/ac97-test.c
+1 -1
View File
@@ -8,7 +8,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "libqtest.h" #include "libqos/libqtest.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "libqos/qgraph.h" #include "libqos/qgraph.h"
#include "libqos/pci.h" #include "libqos/pci.h"
tests/qtest/acpi-utils.h
+1 -1
View File
@@ -13,7 +13,7 @@
#ifndef TEST_ACPI_UTILS_H #ifndef TEST_ACPI_UTILS_H
#define TEST_ACPI_UTILS_H #define TEST_ACPI_UTILS_H
#include "libqtest.h" #include "libqos/libqtest.h"
/* DSDT and SSDTs format */ /* DSDT and SSDTs format */
typedef struct { typedef struct {
tests/qtest/ahci-test.c
+1 -1
View File
@@ -25,7 +25,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <getopt.h> #include <getopt.h>
#include "libqtest.h" #include "libqos/libqtest.h"
#include "libqos/libqos-pc.h" #include "libqos/libqos-pc.h"
#include "libqos/ahci.h" #include "libqos/ahci.h"
#include "libqos/pci-pc.h" #include "libqos/pci-pc.h"
tests/qtest/arm-cpu-features.c
+1 -1
View File
@@ -10,7 +10,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "libqtest.h" #include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/qmp/qjson.h" #include "qapi/qmp/qjson.h"
tests/qtest/boot-order-test.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "libqos/fw_cfg.h" #include "libqos/fw_cfg.h"
#include "libqtest.h" #include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "standard-headers/linux/qemu_fw_cfg.h" #include "standard-headers/linux/qemu_fw_cfg.h"
tests/qtest/boot-sector.c
+1 -1
View File
@@ -13,7 +13,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "boot-sector.h" #include "boot-sector.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "libqtest.h" #include "libqos/libqtest.h"
#define LOW(x) ((x) & 0xff) #define LOW(x) ((x) & 0xff)
#define HIGH(x) ((x) >> 8) #define HIGH(x) ((x) >> 8)
tests/qtest/boot-sector.h
+1 -1
View File
@@ -14,7 +14,7 @@
#ifndef TEST_BOOT_SECTOR_H #ifndef TEST_BOOT_SECTOR_H
#define TEST_BOOT_SECTOR_H #define TEST_BOOT_SECTOR_H
#include "libqtest.h" #include "libqos/libqtest.h"
/* Create boot disk file. fname must be a suitable string for mkstemp() */ /* Create boot disk file. fname must be a suitable string for mkstemp() */
int boot_sector_init(char *fname); int boot_sector_init(char *fname);
tests/qtest/boot-serial-test.c
+1 -1
View File
@@ -14,7 +14,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "libqtest.h" #include "libqos/libqtest.h"
#include "libqos/libqos-spapr.h" #include "libqos/libqos-spapr.h"
static const uint8_t bios_avr[] = { static const uint8_t bios_avr[] = {
tests/qtest/cdrom-test.c
+1 -1
View File
@@ -11,7 +11,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "libqtest.h" #include "libqos/libqtest.h"
#include "boot-sector.h" #include "boot-sector.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
tests/qtest/dbus-vmstate-test.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <gio/gio.h> #include <gio/gio.h>
#include "libqtest.h" #include "libqos/libqtest.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "dbus-vmstate1.h" #include "dbus-vmstate1.h"
#include "migration-helpers.h" #include "migration-helpers.h"
tests/qtest/device-introspect-test.c
+1 -1
View File
@@ -22,7 +22,7 @@
#include "qapi/qmp/qstring.h" #include "qapi/qmp/qstring.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h" #include "qapi/qmp/qlist.h"
#include "libqtest.h" #include "libqos/libqtest.h"
const char common_args[] = "-nodefaults -machine none"; const char common_args[] = "-nodefaults -machine none";
tests/qtest/device-plug-test.c
+1 -1
View File
@@ -11,7 +11,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "libqtest.h" #include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/qmp/qstring.h" #include "qapi/qmp/qstring.h"
tests/qtest/drive_del-test.c
+1 -1
View File
@@ -11,7 +11,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "libqtest.h" #include "libqos/libqtest.h"
#include "libqos/virtio.h" #include "libqos/virtio.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
tests/qtest/ds1338-test.c
+1 -1
View File
@@ -18,7 +18,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "libqtest.h" #include "libqos/libqtest.h"
#include "libqos/i2c.h" #include "libqos/i2c.h"
#define DS1338_ADDR 0x68 #define DS1338_ADDR 0x68
tests/qtest/e1000-test.c
+1 -1
View File
@@ -8,7 +8,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "libqtest.h" #include "libqos/libqtest.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "libqos/qgraph.h" #include "libqos/qgraph.h"
#include "libqos/pci.h" #include "libqos/pci.h"
tests/qtest/eepro100-test.c
+1 -1
View File
@@ -8,7 +8,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "libqtest.h" #include "libqos/libqtest.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "libqos/qgraph.h" #include "libqos/qgraph.h"
#include "libqos/pci.h" #include "libqos/pci.h"

Some files were not shown because too many files have changed in this diff Show More