0436c55edf
* detect invalid CFI configuration (Daniele) * 32-bit PVH fix (David) * forward SCSI passthrough host-status to the SCSI HBA (Hannes) * detect ill-formed id in QMP object-add (Kevin) * miscellaneous bugfixes and cleanups (Keqian, Kostiantyn, myself, Peng Liang) * add nodelay option for chardev (myself) * deprecate -M kernel-irqchip=off on x86 (myself) * keep .d files (myself) * Fix -trace file (myself) -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmBDXMAUHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroPYPwf/YeM8TYqCFCt3Th4Ap2IuMqI/7HRq iNFlKWfM2S7Gk87RaNINL96MHadOteeYSQLuh4Y6FHL1OGpWX2ZByXR//z2DARLC AuV1IncevVyQiSDQzwZj6BU7G4b8xSU3Ey5yseYv+hjUhVbiscDvpioV2USkUvD5 IJFXwL5+eRAOGma0SAcumgwu5xc5/GGh5D63vZ0R7q5eDCu69Q6/ZYvK93b6+TP7 GWboGJFcbTvYku56S4ip8VdEzxiNhfQgGNa3nNDx4ejiTt4mYAft7wy+j/iQjPW9 P0y4AYuvInCrUy1RBR1BqAE+ZXNxqby3AQ0ZTujG+YMiWLIvz5FZtGEvyg== =aCET -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging * fix tracing vs -daemonize (Daniel) * detect invalid CFI configuration (Daniele) * 32-bit PVH fix (David) * forward SCSI passthrough host-status to the SCSI HBA (Hannes) * detect ill-formed id in QMP object-add (Kevin) * miscellaneous bugfixes and cleanups (Keqian, Kostiantyn, myself, Peng Liang) * add nodelay option for chardev (myself) * deprecate -M kernel-irqchip=off on x86 (myself) * keep .d files (myself) * Fix -trace file (myself) # gpg: Signature made Sat 06 Mar 2021 10:43:12 GMT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini-gitlab/tags/for-upstream: (23 commits) meson: Stop if cfi is enabled with system slirp trace: skip qemu_set_log_filename if no "-D" option was passed trace: fix "-trace file=..." meson: adjust timeouts for some slower tests build-sys: invoke ninja with -d keepdepfile qemu-option: do not suggest using the delay option scsi: move host_status handling into SCSI drivers scsi: inline sg_io_sense_from_errno() into the callers. scsi-generic: do not snoop the output of failed commands scsi: Add mapping for generic SCSI_HOST status to sense codes scsi: Rename linux-specific SG_ERR codes to generic SCSI_HOST error codes qemu-config: add error propagation to qemu_config_parse x86/pvh: extract only 4 bytes of start address for 32 bit kernels elf_ops: correct loading of 32 bit PVH kernel lsilogic: Use PCIDevice::exit instead of DeviceState::unrealize accel: kvm: Add aligment assert for kvm_log_clear_one_slot accel: kvm: Fix memory waste under mismatch page size vl.c: do not execute trace_init_backends() before daemonizing qom: Check for wellformed id in user_creatable_add_type() chardev: add nodelay option ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
295 lines
12 KiB
Meson
295 lines
12 KiB
Meson
# All QTests for now are POSIX-only, but the dependencies are
|
|
# really in libqtest, not in the testcases themselves.
|
|
if not config_host.has_key('CONFIG_POSIX')
|
|
subdir_done()
|
|
endif
|
|
|
|
slow_qtests = {
|
|
'ahci-test' : 60,
|
|
'bios-tables-test' : 120,
|
|
'boot-serial-test' : 60,
|
|
'migration-test' : 150,
|
|
'npcm7xx_pwm-test': 150,
|
|
'prom-env-test' : 60,
|
|
'pxe-test' : 60,
|
|
'qos-test' : 60,
|
|
'qom-test' : 300,
|
|
'test-hmp' : 120,
|
|
}
|
|
|
|
qtests_generic = [
|
|
'cdrom-test',
|
|
'device-introspect-test',
|
|
'machine-none-test',
|
|
'qmp-test',
|
|
'qmp-cmd-test',
|
|
'qom-test',
|
|
'test-hmp',
|
|
'qos-test',
|
|
]
|
|
if config_host.has_key('CONFIG_MODULES')
|
|
qtests_generic += [ 'modules-test' ]
|
|
endif
|
|
|
|
qtests_pci = \
|
|
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_IVSHMEM_DEVICE') ? ['ivshmem-test'] : [])
|
|
|
|
qtests_i386 = \
|
|
(slirp.found() ? ['pxe-test', 'test-netfilter'] : []) + \
|
|
(config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
|
|
(have_tools ? ['ahci-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['test-filter-redirector'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_ISA_IPMI_KCS') ? ['ipmi-kcs-test'] : []) + \
|
|
(config_host.has_key('CONFIG_LINUX') and \
|
|
config_all_devices.has_key('CONFIG_ISA_IPMI_BT') ? ['ipmi-bt-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_WDT_IB700') ? ['wdt_ib700-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_PVPANIC_ISA') ? ['pvpanic-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_PVPANIC_PCI') ? ['pvpanic-pci-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_HDA') ? ['intel-hda-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_USB_UHCI') and \
|
|
config_all_devices.has_key('CONFIG_USB_EHCI') ? ['usb-hcd-ehci-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_TPM_CRB') ? ['tpm-crb-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_TPM_CRB') ? ['tpm-crb-swtpm-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-swtpm-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test'] : []) + \
|
|
qtests_pci + \
|
|
['fdc-test',
|
|
'ide-test',
|
|
'hd-geo-test',
|
|
'boot-order-test',
|
|
'bios-tables-test',
|
|
'rtc-test',
|
|
'i440fx-test',
|
|
'fuzz-test',
|
|
'fw_cfg-test',
|
|
'device-plug-test',
|
|
'drive_del-test',
|
|
'tco-test',
|
|
'cpu-plug-test',
|
|
'q35-test',
|
|
'vmgenid-test',
|
|
'migration-test',
|
|
'test-x86-cpuid-compat',
|
|
'numa-test']
|
|
|
|
dbus_daemon = find_program('dbus-daemon', required: false)
|
|
if dbus_daemon.found() and config_host.has_key('GDBUS_CODEGEN')
|
|
# Temporarily disabled due to Patchew failures:
|
|
#qtests_i386 += ['dbus-vmstate-test']
|
|
dbus_vmstate1 = custom_target('dbus-vmstate description',
|
|
output: ['dbus-vmstate1.h', 'dbus-vmstate1.c'],
|
|
input: files('dbus-vmstate1.xml'),
|
|
command: [config_host['GDBUS_CODEGEN'],
|
|
'@INPUT@',
|
|
'--interface-prefix', 'org.qemu',
|
|
'--generate-c-code', '@BASENAME@']).to_list()
|
|
else
|
|
dbus_vmstate1 = []
|
|
endif
|
|
|
|
qtests_x86_64 = qtests_i386
|
|
|
|
qtests_alpha = [ 'boot-serial-test' ] + \
|
|
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
|
|
|
|
qtests_avr = [ 'boot-serial-test' ]
|
|
|
|
qtests_hppa = [ 'boot-serial-test' ] + \
|
|
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
|
|
|
|
qtests_m68k = [ 'boot-serial-test' ]
|
|
qtests_microblaze = [ 'boot-serial-test' ]
|
|
qtests_microblazeel = qtests_microblaze
|
|
|
|
qtests_mips = \
|
|
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
|
|
|
|
qtests_mips64 = \
|
|
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
|
|
|
|
qtests_mips64el = \
|
|
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
|
|
|
|
qtests_moxie = [ 'boot-serial-test' ]
|
|
|
|
qtests_ppc = \
|
|
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \
|
|
['boot-order-test', 'prom-env-test', 'boot-serial-test'] \
|
|
|
|
qtests_ppc64 = \
|
|
(config_all_devices.has_key('CONFIG_PSERIES') ? ['device-plug-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-xscom-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_PSERIES') ? ['rtas-test'] : []) + \
|
|
(slirp.found() ? ['pxe-test', 'test-netfilter'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \
|
|
(config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
|
|
qtests_pci + ['migration-test', 'numa-test', 'cpu-plug-test', 'drive_del-test']
|
|
|
|
qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
|
|
qtests_sh4eb = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
|
|
|
|
qtests_sparc = ['prom-env-test', 'm48t59-test', 'boot-serial-test']
|
|
|
|
qtests_sparc64 = \
|
|
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
|
|
['prom-env-test', 'boot-serial-test']
|
|
|
|
qtests_npcm7xx = \
|
|
['npcm7xx_adc-test',
|
|
'npcm7xx_gpio-test',
|
|
'npcm7xx_pwm-test',
|
|
'npcm7xx_rng-test',
|
|
'npcm7xx_smbus-test',
|
|
'npcm7xx_timer-test',
|
|
'npcm7xx_watchdog_timer-test'] + \
|
|
(slirp.found() ? ['npcm7xx_emc-test'] : [])
|
|
qtests_arm = \
|
|
(config_all_devices.has_key('CONFIG_CMSDK_APB_DUALTIMER') ? ['cmsdk-apb-dualtimer-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_CMSDK_APB_TIMER') ? ['cmsdk-apb-timer-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_CMSDK_APB_WATCHDOG') ? ['cmsdk-apb-watchdog-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_PFLASH_CFI02') ? ['pflash-cfi02-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \
|
|
['arm-cpu-features',
|
|
'microbit-test',
|
|
'm25p80-test',
|
|
'test-arm-mptimer',
|
|
'boot-serial-test',
|
|
'hexloader-test']
|
|
|
|
# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional
|
|
qtests_aarch64 = \
|
|
(cpu != 'arm' ? ['bios-tables-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-swtpm-test'] : []) + \
|
|
['arm-cpu-features',
|
|
'numa-test',
|
|
'boot-serial-test',
|
|
'xlnx-can-test',
|
|
'migration-test']
|
|
|
|
qtests_s390x = \
|
|
(slirp.found() ? ['pxe-test', 'test-netfilter'] : []) + \
|
|
(config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
|
|
(config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
|
|
['boot-serial-test',
|
|
'drive_del-test',
|
|
'device-plug-test',
|
|
'virtio-ccw-test',
|
|
'cpu-plug-test',
|
|
'migration-test']
|
|
|
|
qos_test_ss = ss.source_set()
|
|
qos_test_ss.add(
|
|
'ac97-test.c',
|
|
'ds1338-test.c',
|
|
'e1000-test.c',
|
|
'e1000e-test.c',
|
|
'eepro100-test.c',
|
|
'es1370-test.c',
|
|
'ipoctal232-test.c',
|
|
'megasas-test.c',
|
|
'ne2000-test.c',
|
|
'tulip-test.c',
|
|
'nvme-test.c',
|
|
'pca9552-test.c',
|
|
'pci-test.c',
|
|
'pcnet-test.c',
|
|
'sdhci-test.c',
|
|
'spapr-phb-test.c',
|
|
'tmp105-test.c',
|
|
'emc141x-test.c',
|
|
'usb-hcd-ohci-test.c',
|
|
'virtio-test.c',
|
|
'virtio-blk-test.c',
|
|
'virtio-net-test.c',
|
|
'virtio-rng-test.c',
|
|
'virtio-scsi-test.c',
|
|
'virtio-serial-test.c',
|
|
'vmxnet3-test.c',
|
|
)
|
|
if have_virtfs
|
|
qos_test_ss.add(files('virtio-9p-test.c'))
|
|
endif
|
|
qos_test_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user-test.c'))
|
|
|
|
tpmemu_files = ['tpm-emu.c', 'tpm-util.c', 'tpm-tests.c']
|
|
|
|
qtests = {
|
|
'bios-tables-test': [io, 'boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'],
|
|
'cdrom-test': files('boot-sector.c'),
|
|
'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1,
|
|
'ivshmem-test': [rt, '../../contrib/ivshmem-server/ivshmem-server.c'],
|
|
'migration-test': files('migration-helpers.c'),
|
|
'pxe-test': files('boot-sector.c'),
|
|
'qos-test': [chardev, io, qos_test_ss.apply(config_host, strict: false).sources()],
|
|
'tpm-crb-swtpm-test': [io, tpmemu_files],
|
|
'tpm-crb-test': [io, tpmemu_files],
|
|
'tpm-tis-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'],
|
|
'tpm-tis-test': [io, tpmemu_files, 'tpm-tis-util.c'],
|
|
'tpm-tis-device-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'],
|
|
'tpm-tis-device-test': [io, tpmemu_files, 'tpm-tis-util.c'],
|
|
'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'),
|
|
}
|
|
|
|
qtest_executables = {}
|
|
foreach dir : target_dirs
|
|
if not dir.endswith('-softmmu')
|
|
continue
|
|
endif
|
|
|
|
target_base = dir.split('-')[0]
|
|
qtest_emulator = emulators['qemu-system-' + target_base]
|
|
target_qtests = get_variable('qtests_' + target_base, []) + qtests_generic
|
|
|
|
test_deps = []
|
|
qtest_env = environment()
|
|
if have_tools
|
|
qtest_env.set('QTEST_QEMU_IMG', './qemu-img')
|
|
test_deps += [qemu_img]
|
|
endif
|
|
qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vmstate-daemon.sh')
|
|
qtest_env.set('QTEST_QEMU_BINARY', './qemu-system-' + target_base)
|
|
|
|
foreach test : target_qtests
|
|
# Executables are shared across targets, declare them only the first time we
|
|
# encounter them
|
|
if not qtest_executables.has_key(test)
|
|
src = [test + '.c']
|
|
deps = [qemuutil, qos]
|
|
if test in qtests
|
|
# use a sourceset to quickly separate sources and deps
|
|
test_ss = ss.source_set()
|
|
test_ss.add(qtests[test])
|
|
src += test_ss.all_sources()
|
|
deps += test_ss.all_dependencies()
|
|
endif
|
|
qtest_executables += {
|
|
test: executable(test, src, dependencies: deps)
|
|
}
|
|
endif
|
|
# FIXME: missing dependency on the emulator binary and qemu-img
|
|
test('qtest-@0@/@1@'.format(target_base, test),
|
|
qtest_executables[test],
|
|
depends: [test_deps, qtest_emulator],
|
|
env: qtest_env,
|
|
args: ['--tap', '-k'],
|
|
protocol: 'tap',
|
|
timeout: slow_qtests.get(test, 30),
|
|
priority: slow_qtests.get(test, 30),
|
|
suite: ['qtest', 'qtest-' + target_base])
|
|
endforeach
|
|
endforeach
|