* [PULL 00/31] First pull request with functional tests patches for QEMU 10.2
@ 2025-08-27 7:54 Thomas Huth
2025-08-27 7:54 ` [PULL 01/31] hw: add compat machines for 10.2 Thomas Huth
` (31 more replies)
0 siblings, 32 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson
Hi!
The following changes since commit 88f72048d2f5835a1b9eaba690c7861393aef283:
Update version for the v10.1.0-rc4 release (2025-08-19 14:05:56 -0400)
are available in the Git repository at:
https://gitlab.com/thuth/qemu.git tags/pull-request-2025-08-27
for you to fetch changes up to 0ac3c314130eff8e3ea9860fe3202908a7746225:
tests/functional: Mark main in QemuBaseTest class as a static method (2025-08-27 09:46:55 +0200)
----------------------------------------------------------------
* Add v10.2 compat machines
* Move functional tests to target specific subfolders
* Fix some issues in functional tests
----------------------------------------------------------------
Cornelia Huck (1):
hw: add compat machines for 10.2
Gustavo Romero (2):
tests/functional: Fix reverse_debugging asset precaching
tests/functional: Mark main in QemuBaseTest class as a static method
Peter Maydell (1):
tests/functional/test_aarch64_virt_gpu: Skip test if EGL won't initialize
Stefan Weil (1):
CI: Use mingw-w64-x86_64-curl-winssl instead of mingw-w64-x86_64-curl for Windows build
Thomas Huth (26):
tests/functional: Use more fine-grained locking when looking for free ports
tests/functional: Rework the migration test to have target-specific files
tests/functional: Rework the multiprocess test to have target-specific files
tests/functional/meson.build: Split timeout settings by target
tests/functional/meson.build: Allow tests to reside in subfolders
tests/functional: Move aarch64 tests into architecture specific folder
tests/functional: Move alpha tests into architecture specific folder
tests/functional: Move arm tests into architecture specific folder
tests/functional: Move avr tests into architecture specific folder
tests/functional: Move hppa tests into architecture specific folder
tests/functional: Move i386 tests into architecture specific folder
tests/functional: Move loongarch64 tests into architecture specific folder
tests/functional: Move m68k tests into architecture specific folder
tests/functional: Move microblaze tests into architecture specific folder
tests/functional: Move mips tests into target-specific folders
tests/functional: Move or1k tests into target-specific folders
tests/functional: Move ppc/ppc64 tests into target-specific folders
tests/functional: Move riscv32/riscv64 tests into target-specific folders
tests/functional: Move rx test into target-specific folders
tests/functional: Move s390x tests into target-specific folders
tests/functional: Move sh4/sh4eb tests into target-specific folders
tests/functional: Move sparc/sparc64 tests into target-specific folders
tests/functional: Move x86_64 tests into target-specific folder
tests/functional: Move xtensa tests into target-specific folder
tests/functional: Move the generic tests to a subfolder
MAINTAINERS: Adjust wildcards for the migration, multiprocess and replay tests
MAINTAINERS | 203 +++++------
include/hw/boards.h | 3 +
include/hw/i386/pc.h | 3 +
hw/arm/virt.c | 9 +-
hw/core/machine.c | 3 +
hw/i386/pc.c | 3 +
hw/i386/pc_piix.c | 13 +-
hw/i386/pc_q35.c | 13 +-
hw/m68k/virt.c | 9 +-
hw/ppc/spapr.c | 15 +-
hw/s390x/s390-virtio-ccw.c | 14 +-
.gitlab-ci.d/windows.yml | 2 +-
tests/functional/aarch64/meson.build | 48 +++
.../test_aspeed_ast2700.py} | 0
.../test_aspeed_ast2700fc.py} | 0
.../test_device_passthrough.py} | 0
.../test_hotplug_pci.py} | 0
.../test_imx8mp_evk.py} | 0
.../{test_aarch64_kvm.py => aarch64/test_kvm.py} | 0
tests/functional/aarch64/test_migration.py | 26 ++
tests/functional/aarch64/test_multiprocess.py | 31 ++
.../test_raspi3.py} | 0
.../test_raspi4.py} | 0
.../test_replay.py} | 0
.../test_reverse_debug.py} | 4 +-
.../test_rme_sbsaref.py} | 2 +-
.../test_rme_virt.py} | 0
.../test_sbsaref.py} | 0
.../test_sbsaref_alpine.py} | 2 +-
.../test_sbsaref_freebsd.py} | 2 +-
.../{test_aarch64_smmu.py => aarch64/test_smmu.py} | 0
.../test_tcg_plugins.py} | 0
.../test_tuxrun.py} | 0
.../{test_aarch64_virt.py => aarch64/test_virt.py} | 0
.../test_virt_gpu.py} | 2 +
.../{test_aarch64_xen.py => aarch64/test_xen.py} | 0
.../test_xlnx_versal.py} | 0
tests/functional/alpha/meson.build | 10 +
.../test_clipper.py} | 0
tests/functional/alpha/test_migration.py | 26 ++
.../{test_alpha_replay.py => alpha/test_replay.py} | 0
tests/functional/arm/meson.build | 62 ++++
.../test_aspeed_ast1030.py} | 0
.../test_aspeed_ast2500.py} | 0
.../test_aspeed_ast2600.py} | 0
.../test_aspeed_bletchley.py} | 0
.../test_aspeed_catalina.py} | 0
.../test_aspeed_gb200nvl_bmc.py} | 0
.../test_aspeed_palmetto.py} | 0
.../test_aspeed_rainier.py} | 0
.../test_aspeed_romulus.py} | 0
.../test_aspeed_witherspoon.py} | 0
.../{test_arm_bflt.py => arm/test_bflt.py} | 0
.../{test_arm_bpim2u.py => arm/test_bpim2u.py} | 0
.../test_canona1100.py} | 0
.../{test_arm_collie.py => arm/test_collie.py} | 0
.../test_cubieboard.py} | 0
.../test_emcraft_sf2.py} | 0
.../test_integratorcp.py} | 0
.../test_max78000fthr.py} | 0
.../{test_arm_microbit.py => arm/test_microbit.py} | 0
tests/functional/arm/test_migration.py | 26 ++
.../{test_arm_orangepi.py => arm/test_orangepi.py} | 0
.../test_quanta_gsj.py} | 0
.../{test_arm_raspi2.py => arm/test_raspi2.py} | 0
.../{test_arm_realview.py => arm/test_realview.py} | 0
.../{test_arm_replay.py => arm/test_replay.py} | 0
.../{test_arm_smdkc210.py => arm/test_smdkc210.py} | 0
.../test_stellaris.py} | 0
.../{test_arm_sx1.py => arm/test_sx1.py} | 0
.../{test_arm_tuxrun.py => arm/test_tuxrun.py} | 0
.../{test_arm_vexpress.py => arm/test_vexpress.py} | 0
.../{test_arm_virt.py => arm/test_virt.py} | 0
tests/functional/avr/meson.build | 6 +
.../{test_avr_mega2560.py => avr/test_mega2560.py} | 0
.../{test_avr_uno.py => avr/test_uno.py} | 0
tests/functional/generic/meson.build | 14 +
.../{ => generic}/test_empty_cpu_model.py | 0
.../functional/{ => generic}/test_info_usernet.py | 0
tests/functional/{ => generic}/test_version.py | 0
tests/functional/{ => generic}/test_vnc.py | 0
tests/functional/hppa/meson.build | 5 +
.../{test_hppa_seabios.py => hppa/test_seabios.py} | 0
tests/functional/i386/meson.build | 10 +
tests/functional/i386/test_migration.py | 26 ++
.../{test_i386_replay.py => i386/test_replay.py} | 0
.../{test_i386_tuxrun.py => i386/test_tuxrun.py} | 0
tests/functional/loongarch64/meson.build | 5 +
.../test_virt.py} | 0
tests/functional/m68k/meson.build | 9 +
.../test_mcf5208evb.py} | 0
.../test_nextcube.py} | 0
.../{test_m68k_q800.py => m68k/test_q800.py} | 0
.../{test_m68k_replay.py => m68k/test_replay.py} | 0
.../{test_m68k_tuxrun.py => m68k/test_tuxrun.py} | 0
tests/functional/meson.build | 382 +++------------------
tests/functional/microblaze/meson.build | 6 +
.../test_replay.py} | 0
.../test_s3adsp1800.py} | 0
tests/functional/microblazeel/meson.build | 5 +
.../test_s3adsp1800.py} | 2 +-
.../functional/{test_migration.py => migration.py} | 35 +-
tests/functional/mips/meson.build | 11 +
.../{test_mips_malta.py => mips/test_malta.py} | 0
.../{test_mips_replay.py => mips/test_replay.py} | 0
.../{test_mips_tuxrun.py => mips/test_tuxrun.py} | 0
tests/functional/mips64/meson.build | 10 +
.../{test_mips64_malta.py => mips64/test_malta.py} | 2 +-
.../test_tuxrun.py} | 0
tests/functional/mips64el/meson.build | 14 +
.../test_fuloong2e.py} | 0
.../test_loongson3v.py} | 0
.../test_malta.py} | 4 +-
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
tests/functional/mipsel/meson.build | 12 +
.../{test_mipsel_malta.py => mipsel/test_malta.py} | 2 +-
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
.../{test_multiprocess.py => multiprocess.py} | 40 +--
tests/functional/or1k/meson.build | 6 +
.../{test_or1k_replay.py => or1k/test_replay.py} | 0
.../{test_or1k_sim.py => or1k/test_sim.py} | 0
tests/functional/ppc/meson.build | 22 ++
.../{test_ppc_40p.py => ppc/test_40p.py} | 0
.../{test_ppc_74xx.py => ppc/test_74xx.py} | 0
.../{test_ppc_amiga.py => ppc/test_amiga.py} | 0
.../{test_ppc_bamboo.py => ppc/test_bamboo.py} | 0
.../{test_ppc_mac.py => ppc/test_mac.py} | 0
tests/functional/ppc/test_migration.py | 26 ++
.../test_mpc8544ds.py} | 0
.../{test_ppc_replay.py => ppc/test_replay.py} | 0
.../{test_ppc_sam460ex.py => ppc/test_sam460ex.py} | 0
.../{test_ppc_tuxrun.py => ppc/test_tuxrun.py} | 0
.../test_virtex_ml507.py} | 0
tests/functional/ppc64/meson.build | 25 ++
.../{test_ppc64_e500.py => ppc64/test_e500.py} | 0
.../{test_ppc64_hv.py => ppc64/test_hv.py} | 0
.../{test_ppc64_mac99.py => ppc64/test_mac99.py} | 0
tests/functional/ppc64/test_migration.py | 26 ++
.../test_powernv.py} | 0
.../test_pseries.py} | 0
.../{test_ppc64_replay.py => ppc64/test_replay.py} | 0
.../test_reverse_debug.py} | 0
.../{test_ppc64_tuxrun.py => ppc64/test_tuxrun.py} | 0
tests/functional/qemu_test/ports.py | 5 +-
tests/functional/qemu_test/testcase.py | 1 +
tests/functional/riscv32/meson.build | 10 +
tests/functional/riscv32/test_migration.py | 26 ++
tests/functional/riscv32/test_opensbi.py | 10 +
.../test_tuxrun.py} | 0
tests/functional/riscv64/meson.build | 15 +
tests/functional/riscv64/test_migration.py | 26 ++
.../test_opensbi.py} | 0
.../test_sifive_u.py} | 0
.../test_tuxrun.py} | 0
tests/functional/rx/meson.build | 5 +
.../{test_rx_gdbsim.py => rx/test_gdbsim.py} | 0
tests/functional/s390x/meson.build | 13 +
.../test_ccw_virtio.py} | 0
.../test_pxelinux.py} | 0
.../{test_s390x_replay.py => s390x/test_replay.py} | 0
.../test_topology.py} | 0
.../{test_s390x_tuxrun.py => s390x/test_tuxrun.py} | 0
tests/functional/sh4/meson.build | 10 +
.../{test_sh4_r2d.py => sh4/test_r2d.py} | 0
.../{test_sh4_tuxrun.py => sh4/test_tuxrun.py} | 0
tests/functional/sh4eb/meson.build | 5 +
.../{test_sh4eb_r2d.py => sh4eb/test_r2d.py} | 0
tests/functional/sparc/meson.build | 10 +
tests/functional/sparc/test_migration.py | 26 ++
.../{test_sparc_replay.py => sparc/test_replay.py} | 0
.../{test_sparc_sun4m.py => sparc/test_sun4m.py} | 0
tests/functional/sparc64/meson.build | 10 +
tests/functional/sparc64/test_migration.py | 26 ++
.../test_sun4u.py} | 0
.../test_tuxrun.py} | 0
tests/functional/x86_64/meson.build | 36 ++
tests/functional/{ => x86_64}/test_acpi_bits.py | 0
.../test_cpu_model_versions.py} | 0
tests/functional/{ => x86_64}/test_cpu_queries.py | 0
.../test_hotplug_blk.py} | 0
.../test_hotplug_cpu.py} | 0
tests/functional/{ => x86_64}/test_intel_iommu.py | 0
.../test_kvm_xen.py} | 0
tests/functional/{ => x86_64}/test_linux_initrd.py | 0
.../functional/{ => x86_64}/test_mem_addr_space.py | 0
tests/functional/{ => x86_64}/test_memlock.py | 0
tests/functional/x86_64/test_migration.py | 26 ++
tests/functional/x86_64/test_multiprocess.py | 31 ++
.../functional/{ => x86_64}/test_netdev_ethtool.py | 0
.../{ => x86_64}/test_pc_cpu_hotplug_props.py | 0
.../test_replay.py} | 0
.../test_reverse_debug.py} | 0
.../test_tuxrun.py} | 0
.../functional/{ => x86_64}/test_virtio_balloon.py | 0
tests/functional/{ => x86_64}/test_virtio_gpu.py | 0
.../functional/{ => x86_64}/test_virtio_version.py | 0
tests/functional/xtensa/meson.build | 6 +
.../{test_xtensa_lx60.py => xtensa/test_lx60.py} | 0
.../test_replay.py} | 0
201 files changed, 1008 insertions(+), 525 deletions(-)
create mode 100644 tests/functional/aarch64/meson.build
rename tests/functional/{test_aarch64_aspeed_ast2700.py => aarch64/test_aspeed_ast2700.py} (100%)
rename tests/functional/{test_aarch64_aspeed_ast2700fc.py => aarch64/test_aspeed_ast2700fc.py} (100%)
rename tests/functional/{test_aarch64_device_passthrough.py => aarch64/test_device_passthrough.py} (100%)
rename tests/functional/{test_aarch64_hotplug_pci.py => aarch64/test_hotplug_pci.py} (100%)
rename tests/functional/{test_aarch64_imx8mp_evk.py => aarch64/test_imx8mp_evk.py} (100%)
rename tests/functional/{test_aarch64_kvm.py => aarch64/test_kvm.py} (100%)
create mode 100755 tests/functional/aarch64/test_migration.py
create mode 100755 tests/functional/aarch64/test_multiprocess.py
rename tests/functional/{test_aarch64_raspi3.py => aarch64/test_raspi3.py} (100%)
rename tests/functional/{test_aarch64_raspi4.py => aarch64/test_raspi4.py} (100%)
rename tests/functional/{test_aarch64_replay.py => aarch64/test_replay.py} (100%)
rename tests/functional/{test_aarch64_reverse_debug.py => aarch64/test_reverse_debug.py} (93%)
rename tests/functional/{test_aarch64_rme_sbsaref.py => aarch64/test_rme_sbsaref.py} (98%)
rename tests/functional/{test_aarch64_rme_virt.py => aarch64/test_rme_virt.py} (100%)
rename tests/functional/{test_aarch64_sbsaref.py => aarch64/test_sbsaref.py} (100%)
rename tests/functional/{test_aarch64_sbsaref_alpine.py => aarch64/test_sbsaref_alpine.py} (97%)
rename tests/functional/{test_aarch64_sbsaref_freebsd.py => aarch64/test_sbsaref_freebsd.py} (97%)
rename tests/functional/{test_aarch64_smmu.py => aarch64/test_smmu.py} (100%)
rename tests/functional/{test_aarch64_tcg_plugins.py => aarch64/test_tcg_plugins.py} (100%)
rename tests/functional/{test_aarch64_tuxrun.py => aarch64/test_tuxrun.py} (100%)
rename tests/functional/{test_aarch64_virt.py => aarch64/test_virt.py} (100%)
rename tests/functional/{test_aarch64_virt_gpu.py => aarch64/test_virt_gpu.py} (97%)
rename tests/functional/{test_aarch64_xen.py => aarch64/test_xen.py} (100%)
rename tests/functional/{test_aarch64_xlnx_versal.py => aarch64/test_xlnx_versal.py} (100%)
create mode 100644 tests/functional/alpha/meson.build
rename tests/functional/{test_alpha_clipper.py => alpha/test_clipper.py} (100%)
create mode 100755 tests/functional/alpha/test_migration.py
rename tests/functional/{test_alpha_replay.py => alpha/test_replay.py} (100%)
create mode 100644 tests/functional/arm/meson.build
rename tests/functional/{test_arm_aspeed_ast1030.py => arm/test_aspeed_ast1030.py} (100%)
rename tests/functional/{test_arm_aspeed_ast2500.py => arm/test_aspeed_ast2500.py} (100%)
rename tests/functional/{test_arm_aspeed_ast2600.py => arm/test_aspeed_ast2600.py} (100%)
rename tests/functional/{test_arm_aspeed_bletchley.py => arm/test_aspeed_bletchley.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_aspeed_catalina.py => arm/test_aspeed_catalina.py} (100%)
rename tests/functional/{test_arm_aspeed_gb200nvl_bmc.py => arm/test_aspeed_gb200nvl_bmc.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_aspeed_palmetto.py => arm/test_aspeed_palmetto.py} (100%)
rename tests/functional/{test_arm_aspeed_rainier.py => arm/test_aspeed_rainier.py} (100%)
rename tests/functional/{test_arm_aspeed_romulus.py => arm/test_aspeed_romulus.py} (100%)
rename tests/functional/{test_arm_aspeed_witherspoon.py => arm/test_aspeed_witherspoon.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_bflt.py => arm/test_bflt.py} (100%)
rename tests/functional/{test_arm_bpim2u.py => arm/test_bpim2u.py} (100%)
rename tests/functional/{test_arm_canona1100.py => arm/test_canona1100.py} (100%)
rename tests/functional/{test_arm_collie.py => arm/test_collie.py} (100%)
rename tests/functional/{test_arm_cubieboard.py => arm/test_cubieboard.py} (100%)
rename tests/functional/{test_arm_emcraft_sf2.py => arm/test_emcraft_sf2.py} (100%)
rename tests/functional/{test_arm_integratorcp.py => arm/test_integratorcp.py} (100%)
rename tests/functional/{test_arm_max78000fthr.py => arm/test_max78000fthr.py} (100%)
rename tests/functional/{test_arm_microbit.py => arm/test_microbit.py} (100%)
create mode 100755 tests/functional/arm/test_migration.py
rename tests/functional/{test_arm_orangepi.py => arm/test_orangepi.py} (100%)
rename tests/functional/{test_arm_quanta_gsj.py => arm/test_quanta_gsj.py} (100%)
rename tests/functional/{test_arm_raspi2.py => arm/test_raspi2.py} (100%)
rename tests/functional/{test_arm_realview.py => arm/test_realview.py} (100%)
rename tests/functional/{test_arm_replay.py => arm/test_replay.py} (100%)
rename tests/functional/{test_arm_smdkc210.py => arm/test_smdkc210.py} (100%)
rename tests/functional/{test_arm_stellaris.py => arm/test_stellaris.py} (100%)
rename tests/functional/{test_arm_sx1.py => arm/test_sx1.py} (100%)
rename tests/functional/{test_arm_tuxrun.py => arm/test_tuxrun.py} (100%)
rename tests/functional/{test_arm_vexpress.py => arm/test_vexpress.py} (100%)
rename tests/functional/{test_arm_virt.py => arm/test_virt.py} (100%)
create mode 100644 tests/functional/avr/meson.build
rename tests/functional/{test_avr_mega2560.py => avr/test_mega2560.py} (100%)
rename tests/functional/{test_avr_uno.py => avr/test_uno.py} (100%)
create mode 100644 tests/functional/generic/meson.build
rename tests/functional/{ => generic}/test_empty_cpu_model.py (100%)
rename tests/functional/{ => generic}/test_info_usernet.py (100%)
rename tests/functional/{ => generic}/test_version.py (100%)
rename tests/functional/{ => generic}/test_vnc.py (100%)
create mode 100644 tests/functional/hppa/meson.build
rename tests/functional/{test_hppa_seabios.py => hppa/test_seabios.py} (100%)
create mode 100644 tests/functional/i386/meson.build
create mode 100755 tests/functional/i386/test_migration.py
rename tests/functional/{test_i386_replay.py => i386/test_replay.py} (100%)
rename tests/functional/{test_i386_tuxrun.py => i386/test_tuxrun.py} (100%)
create mode 100644 tests/functional/loongarch64/meson.build
rename tests/functional/{test_loongarch64_virt.py => loongarch64/test_virt.py} (100%)
create mode 100644 tests/functional/m68k/meson.build
rename tests/functional/{test_m68k_mcf5208evb.py => m68k/test_mcf5208evb.py} (100%)
rename tests/functional/{test_m68k_nextcube.py => m68k/test_nextcube.py} (100%)
rename tests/functional/{test_m68k_q800.py => m68k/test_q800.py} (100%)
rename tests/functional/{test_m68k_replay.py => m68k/test_replay.py} (100%)
rename tests/functional/{test_m68k_tuxrun.py => m68k/test_tuxrun.py} (100%)
create mode 100644 tests/functional/microblaze/meson.build
rename tests/functional/{test_microblaze_replay.py => microblaze/test_replay.py} (100%)
rename tests/functional/{test_microblaze_s3adsp1800.py => microblaze/test_s3adsp1800.py} (100%)
create mode 100644 tests/functional/microblazeel/meson.build
rename tests/functional/{test_microblazeel_s3adsp1800.py => microblazeel/test_s3adsp1800.py} (92%)
rename tests/functional/{test_migration.py => migration.py} (74%)
mode change 100755 => 100644
create mode 100644 tests/functional/mips/meson.build
rename tests/functional/{test_mips_malta.py => mips/test_malta.py} (100%)
rename tests/functional/{test_mips_replay.py => mips/test_replay.py} (100%)
rename tests/functional/{test_mips_tuxrun.py => mips/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mips64/meson.build
rename tests/functional/{test_mips64_malta.py => mips64/test_malta.py} (96%)
rename tests/functional/{test_mips64_tuxrun.py => mips64/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mips64el/meson.build
rename tests/functional/{test_mips64el_fuloong2e.py => mips64el/test_fuloong2e.py} (100%)
rename tests/functional/{test_mips64el_loongson3v.py => mips64el/test_loongson3v.py} (100%)
rename tests/functional/{test_mips64el_malta.py => mips64el/test_malta.py} (98%)
rename tests/functional/{test_mips64el_replay.py => mips64el/test_replay.py} (100%)
rename tests/functional/{test_mips64el_tuxrun.py => mips64el/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mipsel/meson.build
rename tests/functional/{test_mipsel_malta.py => mipsel/test_malta.py} (98%)
rename tests/functional/{test_mipsel_replay.py => mipsel/test_replay.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_mipsel_tuxrun.py => mipsel/test_tuxrun.py} (100%)
rename tests/functional/{test_multiprocess.py => multiprocess.py} (58%)
mode change 100755 => 100644
create mode 100644 tests/functional/or1k/meson.build
rename tests/functional/{test_or1k_replay.py => or1k/test_replay.py} (100%)
rename tests/functional/{test_or1k_sim.py => or1k/test_sim.py} (100%)
create mode 100644 tests/functional/ppc/meson.build
rename tests/functional/{test_ppc_40p.py => ppc/test_40p.py} (100%)
rename tests/functional/{test_ppc_74xx.py => ppc/test_74xx.py} (100%)
rename tests/functional/{test_ppc_amiga.py => ppc/test_amiga.py} (100%)
rename tests/functional/{test_ppc_bamboo.py => ppc/test_bamboo.py} (100%)
rename tests/functional/{test_ppc_mac.py => ppc/test_mac.py} (100%)
create mode 100755 tests/functional/ppc/test_migration.py
rename tests/functional/{test_ppc_mpc8544ds.py => ppc/test_mpc8544ds.py} (100%)
rename tests/functional/{test_ppc_replay.py => ppc/test_replay.py} (100%)
rename tests/functional/{test_ppc_sam460ex.py => ppc/test_sam460ex.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_ppc_tuxrun.py => ppc/test_tuxrun.py} (100%)
rename tests/functional/{test_ppc_virtex_ml507.py => ppc/test_virtex_ml507.py} (100%)
create mode 100644 tests/functional/ppc64/meson.build
rename tests/functional/{test_ppc64_e500.py => ppc64/test_e500.py} (100%)
rename tests/functional/{test_ppc64_hv.py => ppc64/test_hv.py} (100%)
rename tests/functional/{test_ppc64_mac99.py => ppc64/test_mac99.py} (100%)
create mode 100755 tests/functional/ppc64/test_migration.py
rename tests/functional/{test_ppc64_powernv.py => ppc64/test_powernv.py} (100%)
rename tests/functional/{test_ppc64_pseries.py => ppc64/test_pseries.py} (100%)
rename tests/functional/{test_ppc64_replay.py => ppc64/test_replay.py} (100%)
rename tests/functional/{test_ppc64_reverse_debug.py => ppc64/test_reverse_debug.py} (100%)
rename tests/functional/{test_ppc64_tuxrun.py => ppc64/test_tuxrun.py} (100%)
create mode 100644 tests/functional/riscv32/meson.build
create mode 100755 tests/functional/riscv32/test_migration.py
create mode 100755 tests/functional/riscv32/test_opensbi.py
rename tests/functional/{test_riscv32_tuxrun.py => riscv32/test_tuxrun.py} (100%)
create mode 100644 tests/functional/riscv64/meson.build
create mode 100755 tests/functional/riscv64/test_migration.py
rename tests/functional/{test_riscv_opensbi.py => riscv64/test_opensbi.py} (100%)
rename tests/functional/{test_riscv64_sifive_u.py => riscv64/test_sifive_u.py} (100%)
rename tests/functional/{test_riscv64_tuxrun.py => riscv64/test_tuxrun.py} (100%)
create mode 100644 tests/functional/rx/meson.build
rename tests/functional/{test_rx_gdbsim.py => rx/test_gdbsim.py} (100%)
create mode 100644 tests/functional/s390x/meson.build
rename tests/functional/{test_s390x_ccw_virtio.py => s390x/test_ccw_virtio.py} (100%)
rename tests/functional/{test_s390x_pxelinux.py => s390x/test_pxelinux.py} (100%)
rename tests/functional/{test_s390x_replay.py => s390x/test_replay.py} (100%)
rename tests/functional/{test_s390x_topology.py => s390x/test_topology.py} (100%)
rename tests/functional/{test_s390x_tuxrun.py => s390x/test_tuxrun.py} (100%)
create mode 100644 tests/functional/sh4/meson.build
rename tests/functional/{test_sh4_r2d.py => sh4/test_r2d.py} (100%)
rename tests/functional/{test_sh4_tuxrun.py => sh4/test_tuxrun.py} (100%)
create mode 100644 tests/functional/sh4eb/meson.build
rename tests/functional/{test_sh4eb_r2d.py => sh4eb/test_r2d.py} (100%)
create mode 100644 tests/functional/sparc/meson.build
create mode 100755 tests/functional/sparc/test_migration.py
rename tests/functional/{test_sparc_replay.py => sparc/test_replay.py} (100%)
rename tests/functional/{test_sparc_sun4m.py => sparc/test_sun4m.py} (100%)
create mode 100644 tests/functional/sparc64/meson.build
create mode 100755 tests/functional/sparc64/test_migration.py
rename tests/functional/{test_sparc64_sun4u.py => sparc64/test_sun4u.py} (100%)
rename tests/functional/{test_sparc64_tuxrun.py => sparc64/test_tuxrun.py} (100%)
create mode 100644 tests/functional/x86_64/meson.build
rename tests/functional/{ => x86_64}/test_acpi_bits.py (100%)
rename tests/functional/{test_x86_cpu_model_versions.py => x86_64/test_cpu_model_versions.py} (100%)
rename tests/functional/{ => x86_64}/test_cpu_queries.py (100%)
rename tests/functional/{test_x86_64_hotplug_blk.py => x86_64/test_hotplug_blk.py} (100%)
rename tests/functional/{test_x86_64_hotplug_cpu.py => x86_64/test_hotplug_cpu.py} (100%)
rename tests/functional/{ => x86_64}/test_intel_iommu.py (100%)
rename tests/functional/{test_x86_64_kvm_xen.py => x86_64/test_kvm_xen.py} (100%)
rename tests/functional/{ => x86_64}/test_linux_initrd.py (100%)
rename tests/functional/{ => x86_64}/test_mem_addr_space.py (100%)
rename tests/functional/{ => x86_64}/test_memlock.py (100%)
create mode 100755 tests/functional/x86_64/test_migration.py
create mode 100755 tests/functional/x86_64/test_multiprocess.py
rename tests/functional/{ => x86_64}/test_netdev_ethtool.py (100%)
rename tests/functional/{ => x86_64}/test_pc_cpu_hotplug_props.py (100%)
rename tests/functional/{test_x86_64_replay.py => x86_64/test_replay.py} (100%)
rename tests/functional/{test_x86_64_reverse_debug.py => x86_64/test_reverse_debug.py} (100%)
rename tests/functional/{test_x86_64_tuxrun.py => x86_64/test_tuxrun.py} (100%)
rename tests/functional/{ => x86_64}/test_virtio_balloon.py (100%)
rename tests/functional/{ => x86_64}/test_virtio_gpu.py (100%)
rename tests/functional/{ => x86_64}/test_virtio_version.py (100%)
create mode 100644 tests/functional/xtensa/meson.build
rename tests/functional/{test_xtensa_lx60.py => xtensa/test_lx60.py} (100%)
rename tests/functional/{test_xtensa_replay.py => xtensa/test_replay.py} (100%)
^ permalink raw reply [flat|nested] 33+ messages in thread
* [PULL 01/31] hw: add compat machines for 10.2
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 02/31] CI: Use mingw-w64-x86_64-curl-winssl instead of mingw-w64-x86_64-curl for Windows build Thomas Huth
` (30 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson, Cornelia Huck,
Michael S. Tsirkin
From: Cornelia Huck <cohuck@redhat.com>
Add 10.2 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-ID: <20250805095616.1168905-1-cohuck@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/hw/boards.h | 3 +++
include/hw/i386/pc.h | 3 +++
hw/arm/virt.c | 9 ++++++++-
hw/core/machine.c | 3 +++
hw/i386/pc.c | 3 +++
hw/i386/pc_piix.c | 13 +++++++++++--
hw/i386/pc_q35.c | 13 +++++++++++--
hw/m68k/virt.c | 9 ++++++++-
hw/ppc/spapr.c | 15 +++++++++++++--
hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
10 files changed, 76 insertions(+), 9 deletions(-)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index f94713e6e29..665b6201214 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -779,6 +779,9 @@ struct MachineState {
} \
type_init(machine_initfn##_register_types)
+extern GlobalProperty hw_compat_10_1[];
+extern const size_t hw_compat_10_1_len;
+
extern GlobalProperty hw_compat_10_0[];
extern const size_t hw_compat_10_0_len;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 79b72c54dd3..e83157ab358 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -214,6 +214,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size);
/* sgx.c */
void pc_machine_init_sgx_epc(PCMachineState *pcms);
+extern GlobalProperty pc_compat_10_1[];
+extern const size_t pc_compat_10_1_len;
+
extern GlobalProperty pc_compat_10_0[];
extern const size_t pc_compat_10_0_len;
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ef6be3660f5..9326cfc895f 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3455,10 +3455,17 @@ static void machvirt_machine_init(void)
}
type_init(machvirt_machine_init);
+static void virt_machine_10_2_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(10, 2)
+
static void virt_machine_10_1_options(MachineClass *mc)
{
+ virt_machine_10_2_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len);
}
-DEFINE_VIRT_MACHINE_AS_LATEST(10, 1)
+DEFINE_VIRT_MACHINE(10, 1)
static void virt_machine_10_0_options(MachineClass *mc)
{
diff --git a/hw/core/machine.c b/hw/core/machine.c
index bd47527479a..38c949c4f2c 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -37,6 +37,9 @@
#include "hw/virtio/virtio-iommu.h"
#include "audio/audio.h"
+GlobalProperty hw_compat_10_1[] = {};
+const size_t hw_compat_10_1_len = G_N_ELEMENTS(hw_compat_10_1);
+
GlobalProperty hw_compat_10_0[] = {
{ "scsi-hd", "dpofua", "off" },
{ "vfio-pci", "x-migration-load-config-after-iter", "off" },
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 2f58e73d334..bc048a6d137 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -81,6 +81,9 @@
{ "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
{ "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },
+GlobalProperty pc_compat_10_1[] = {};
+const size_t pc_compat_10_1_len = G_N_ELEMENTS(pc_compat_10_1);
+
GlobalProperty pc_compat_10_0[] = {
{ TYPE_X86_CPU, "x-consistent-cache", "false" },
{ TYPE_X86_CPU, "x-vendor-cpuid-only-v2", "false" },
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index c03324281bd..d165ac72ed7 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -504,12 +504,21 @@ static void pc_i440fx_machine_options(MachineClass *m)
pc_piix_compat_defaults, pc_piix_compat_defaults_len);
}
-static void pc_i440fx_machine_10_1_options(MachineClass *m)
+static void pc_i440fx_machine_10_2_options(MachineClass *m)
{
pc_i440fx_machine_options(m);
}
-DEFINE_I440FX_MACHINE_AS_LATEST(10, 1);
+DEFINE_I440FX_MACHINE_AS_LATEST(10, 2);
+
+static void pc_i440fx_machine_10_1_options(MachineClass *m)
+{
+ pc_i440fx_machine_10_2_options(m);
+ compat_props_add(m->compat_props, hw_compat_10_1, hw_compat_10_1_len);
+ compat_props_add(m->compat_props, pc_compat_10_1, pc_compat_10_1_len);
+}
+
+DEFINE_I440FX_MACHINE(10, 1);
static void pc_i440fx_machine_10_0_options(MachineClass *m)
{
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index b309b2b378d..e89951285e5 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -374,12 +374,21 @@ static void pc_q35_machine_options(MachineClass *m)
pc_q35_compat_defaults, pc_q35_compat_defaults_len);
}
-static void pc_q35_machine_10_1_options(MachineClass *m)
+static void pc_q35_machine_10_2_options(MachineClass *m)
{
pc_q35_machine_options(m);
}
-DEFINE_Q35_MACHINE_AS_LATEST(10, 1);
+DEFINE_Q35_MACHINE_AS_LATEST(10, 2);
+
+static void pc_q35_machine_10_1_options(MachineClass *m)
+{
+ pc_q35_machine_10_2_options(m);
+ compat_props_add(m->compat_props, hw_compat_10_1, hw_compat_10_1_len);
+ compat_props_add(m->compat_props, pc_compat_10_1, pc_compat_10_1_len);
+}
+
+DEFINE_Q35_MACHINE(10, 1);
static void pc_q35_machine_10_0_options(MachineClass *m)
{
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 875fd00ef8d..98cfe43c73a 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -367,10 +367,17 @@ type_init(virt_machine_register_types)
#define DEFINE_VIRT_MACHINE(major, minor) \
DEFINE_VIRT_MACHINE_IMPL(false, major, minor)
+static void virt_machine_10_2_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(10, 2)
+
static void virt_machine_10_1_options(MachineClass *mc)
{
+ virt_machine_10_2_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len);
}
-DEFINE_VIRT_MACHINE_AS_LATEST(10, 1)
+DEFINE_VIRT_MACHINE(10, 1)
static void virt_machine_10_0_options(MachineClass *mc)
{
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 1855a3cd8d0..eb22333404d 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4761,15 +4761,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
#define DEFINE_SPAPR_MACHINE(major, minor) \
DEFINE_SPAPR_MACHINE_IMPL(false, major, minor)
+/*
+ * pseries-10.2
+ */
+static void spapr_machine_10_2_class_options(MachineClass *mc)
+{
+ /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE_AS_LATEST(10, 2);
+
/*
* pseries-10.1
*/
static void spapr_machine_10_1_class_options(MachineClass *mc)
{
- /* Defaults for the latest behaviour inherited from the base class */
+ spapr_machine_10_2_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len);
}
-DEFINE_SPAPR_MACHINE_AS_LATEST(10, 1);
+DEFINE_SPAPR_MACHINE(10, 1);
/*
* pseries-10.0
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index a79bd13275b..d0c6e80cb05 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -911,14 +911,26 @@ static const TypeInfo ccw_machine_info = {
DEFINE_CCW_MACHINE_IMPL(false, major, minor)
+static void ccw_machine_10_2_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_10_2_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE_AS_LATEST(10, 2);
+
static void ccw_machine_10_1_instance_options(MachineState *machine)
{
+ ccw_machine_10_2_instance_options(machine);
}
static void ccw_machine_10_1_class_options(MachineClass *mc)
{
+ ccw_machine_10_2_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len);
}
-DEFINE_CCW_MACHINE_AS_LATEST(10, 1);
+DEFINE_CCW_MACHINE(10, 1);
static void ccw_machine_10_0_instance_options(MachineState *machine)
{
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 02/31] CI: Use mingw-w64-x86_64-curl-winssl instead of mingw-w64-x86_64-curl for Windows build
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
2025-08-27 7:54 ` [PULL 01/31] hw: add compat machines for 10.2 Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 03/31] tests/functional/test_aarch64_virt_gpu: Skip test if EGL won't initialize Thomas Huth
` (29 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson, Stefan Weil,
Pierrick Bouvier
From: Stefan Weil <sw@weilnetz.de>
mingw-w64-x86_64-curl-winssl is required for https connections.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-ID: <20250806200909.507803-1-sw@weilnetz.de>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/windows.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index 45ed0c96fea..beac39e5bde 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -77,7 +77,7 @@ msys2-64bit:
git grep make sed
mingw-w64-x86_64-binutils
mingw-w64-x86_64-ccache
- mingw-w64-x86_64-curl
+ mingw-w64-x86_64-curl-winssl
mingw-w64-x86_64-gcc
mingw-w64-x86_64-glib2
mingw-w64-x86_64-libnfs
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 03/31] tests/functional/test_aarch64_virt_gpu: Skip test if EGL won't initialize
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
2025-08-27 7:54 ` [PULL 01/31] hw: add compat machines for 10.2 Thomas Huth
2025-08-27 7:54 ` [PULL 02/31] CI: Use mingw-w64-x86_64-curl-winssl instead of mingw-w64-x86_64-curl for Windows build Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 04/31] tests/functional: Fix reverse_debugging asset precaching Thomas Huth
` (28 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Manos Pitsidianakis, Alex Bennée, Dmitry Osipenko
From: Peter Maydell <peter.maydell@linaro.org>
If you are using the Nvidia drivers and have installed new versions
of those packages but have not yet rebooted the host kernel,
attempting to use the egl-headless display will cause QEMU to fail to
start with
$ qemu-system-aarch64 -M virt -display egl-headless
qemu-system-aarch64: egl: eglInitialize failed: EGL_NOT_INITIALIZED
qemu-system-aarch64: egl: render node init failed
together with this complaint in the host kernel dmesg:
[7874777.555649] NVRM: API mismatch: the client has the version 535.247.01, but
NVRM: this kernel module has the version 535.230.02. Please
NVRM: make sure that this kernel module and all NVIDIA driver
NVRM: components have the same version.
This isn't a problem with QEMU itself, so reporting this as a test
failure is misleading. Instead skip the tests, as we already do for
various other kinds of "host system can't actually run the EGL
display" situation.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20250826123455.2856988-1-peter.maydell@linaro.org>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Acked-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/functional/test_aarch64_virt_gpu.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py
index 38447278579..4e50887c3e9 100755
--- a/tests/functional/test_aarch64_virt_gpu.py
+++ b/tests/functional/test_aarch64_virt_gpu.py
@@ -76,6 +76,8 @@ def _launch_virt_gpu(self, gpu_device):
self.skipTest("egl-headless support is not available")
elif "'type' does not accept value 'dbus'" in excp.output:
self.skipTest("dbus display support is not available")
+ elif "eglInitialize failed: EGL_NOT_INITIALIZED" in excp.output:
+ self.skipTest("EGL failed to initialize on this host")
else:
self.log.info("unhandled launch failure: %s", excp.output)
raise excp
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 04/31] tests/functional: Fix reverse_debugging asset precaching
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (2 preceding siblings ...)
2025-08-27 7:54 ` [PULL 03/31] tests/functional/test_aarch64_virt_gpu: Skip test if EGL won't initialize Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 05/31] tests/functional: Use more fine-grained locking when looking for free ports Thomas Huth
` (27 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson, Gustavo Romero,
Manos Pitsidianakis
From: Gustavo Romero <gustavo.romero@linaro.org>
This commit fixes the asset precaching in the reverse_debugging test on
aarch64.
QemuBaseTest.main() precaches assets (kernel, rootfs, DT blobs, etc.)
that are defined in variables with the ASSET_ prefix. This works because
it ultimately calls Asset.precache_test(), which relies on introspection
to locate these variables.
If an asset variable is not named with the ASSET_ prefix, precache_test
cannot find the asset and precaching silently fails. Hence, fix the
asset precaching by fixing the asset variable name.
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Message-ID: <20250827001008.22112-1-gustavo.romero@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/functional/test_aarch64_reverse_debug.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/functional/test_aarch64_reverse_debug.py b/tests/functional/test_aarch64_reverse_debug.py
index 58d45328350..8bc91ccfde7 100755
--- a/tests/functional/test_aarch64_reverse_debug.py
+++ b/tests/functional/test_aarch64_reverse_debug.py
@@ -21,7 +21,7 @@ class ReverseDebugging_AArch64(ReverseDebugging):
REG_PC = 32
- KERNEL_ASSET = Asset(
+ ASSET_KERNEL = Asset(
('https://archives.fedoraproject.org/pub/archive/fedora/linux/'
'releases/29/Everything/aarch64/os/images/pxeboot/vmlinuz'),
'7e1430b81c26bdd0da025eeb8fbd77b5dc961da4364af26e771bd39f379cbbf7')
@@ -30,7 +30,7 @@ class ReverseDebugging_AArch64(ReverseDebugging):
def test_aarch64_virt(self):
self.set_machine('virt')
self.cpu = 'cortex-a53'
- kernel_path = self.KERNEL_ASSET.fetch()
+ kernel_path = self.ASSET_KERNEL.fetch()
self.reverse_debugging(args=('-kernel', kernel_path))
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 05/31] tests/functional: Use more fine-grained locking when looking for free ports
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (3 preceding siblings ...)
2025-08-27 7:54 ` [PULL 04/31] tests/functional: Fix reverse_debugging asset precaching Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 06/31] tests/functional: Rework the migration test to have target-specific files Thomas Huth
` (26 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Daniel P. Berrangé
From: Thomas Huth <thuth@redhat.com>
Currently, we have one lock that is held while a test is looking for
free ports. However, we are also using different ranges for looking
for free ports nowadays (PORTS_START is based on the PID of the process),
so instead of using only one lock, we should rather use a lock per
range instead. This should help to allow running more tests in parallel.
While we're at it, also create the lock files without executable bit
(mode is 0o777 by default).
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250821094735.804210-1-thuth@redhat.com>
---
tests/functional/qemu_test/ports.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/functional/qemu_test/ports.py b/tests/functional/qemu_test/ports.py
index 631b77abf6b..81174a61532 100644
--- a/tests/functional/qemu_test/ports.py
+++ b/tests/functional/qemu_test/ports.py
@@ -23,8 +23,9 @@ class Ports():
PORTS_END = PORTS_START + PORTS_RANGE_SIZE
def __enter__(self):
- lock_file = os.path.join(BUILD_DIR, "tests", "functional", "port_lock")
- self.lock_fh = os.open(lock_file, os.O_CREAT)
+ lock_file = os.path.join(BUILD_DIR, "tests", "functional",
+ f".port_lock.{self.PORTS_START}")
+ self.lock_fh = os.open(lock_file, os.O_CREAT, mode=0o666)
fcntl.flock(self.lock_fh, fcntl.LOCK_EX)
return self
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 06/31] tests/functional: Rework the migration test to have target-specific files
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (4 preceding siblings ...)
2025-08-27 7:54 ` [PULL 05/31] tests/functional: Use more fine-grained locking when looking for free ports Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 07/31] tests/functional: Rework the multiprocess " Thomas Huth
` (25 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier
From: Thomas Huth <thuth@redhat.com>
We are going to move the tests for each target into separate subdirectories.
The migration test does not fit quite into this scheme, since it works
for multiple targets, but not all. Rework the test to have a common
test class, and target specific files with a target specific class, so
that this will fit better into the new scheme.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-2-thuth@redhat.com>
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 22 ++++++------
.../{test_migration.py => migration.py} | 35 +++++--------------
tests/functional/test_aarch64_migration.py | 26 ++++++++++++++
tests/functional/test_alpha_migration.py | 26 ++++++++++++++
tests/functional/test_arm_migration.py | 26 ++++++++++++++
tests/functional/test_i386_migration.py | 26 ++++++++++++++
tests/functional/test_ppc64_migration.py | 26 ++++++++++++++
tests/functional/test_ppc_migration.py | 26 ++++++++++++++
tests/functional/test_riscv32_migration.py | 26 ++++++++++++++
tests/functional/test_riscv64_migration.py | 26 ++++++++++++++
tests/functional/test_sparc64_migration.py | 26 ++++++++++++++
tests/functional/test_sparc_migration.py | 26 ++++++++++++++
tests/functional/test_x86_64_migration.py | 26 ++++++++++++++
14 files changed, 306 insertions(+), 39 deletions(-)
rename tests/functional/{test_migration.py => migration.py} (74%)
mode change 100755 => 100644
create mode 100755 tests/functional/test_aarch64_migration.py
create mode 100755 tests/functional/test_alpha_migration.py
create mode 100755 tests/functional/test_arm_migration.py
create mode 100755 tests/functional/test_i386_migration.py
create mode 100755 tests/functional/test_ppc64_migration.py
create mode 100755 tests/functional/test_ppc_migration.py
create mode 100755 tests/functional/test_riscv32_migration.py
create mode 100755 tests/functional/test_riscv64_migration.py
create mode 100755 tests/functional/test_sparc64_migration.py
create mode 100755 tests/functional/test_sparc_migration.py
create mode 100755 tests/functional/test_x86_64_migration.py
diff --git a/MAINTAINERS b/MAINTAINERS
index a07086ed762..56c1fe67690 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3597,7 +3597,7 @@ F: include/migration/
F: include/qemu/userfaultfd.h
F: migration/
F: scripts/vmstate-static-checker.py
-F: tests/functional/test_migration.py
+F: tests/functional/*migration.py
F: tests/vmstate-static-checker-data/
F: tests/qtest/migration/
F: tests/qtest/migration-*
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 311c6f18065..c32436d99ad 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -80,7 +80,7 @@ tests_generic_bsduser = [
]
tests_aarch64_system_quick = [
- 'migration',
+ 'aarch64_migration',
]
tests_aarch64_system_thorough = [
@@ -110,7 +110,7 @@ tests_aarch64_system_thorough = [
]
tests_alpha_system_quick = [
- 'migration',
+ 'alpha_migration',
]
tests_alpha_system_thorough = [
@@ -119,7 +119,7 @@ tests_alpha_system_thorough = [
]
tests_arm_system_quick = [
- 'migration',
+ 'arm_migration',
]
tests_arm_system_thorough = [
@@ -168,7 +168,7 @@ tests_hppa_system_quick = [
]
tests_i386_system_quick = [
- 'migration',
+ 'i386_migration',
]
tests_i386_system_thorough = [
@@ -228,7 +228,7 @@ tests_or1k_system_thorough = [
]
tests_ppc_system_quick = [
- 'migration',
+ 'ppc_migration',
'ppc_74xx',
]
@@ -245,7 +245,7 @@ tests_ppc_system_thorough = [
]
tests_ppc64_system_quick = [
- 'migration',
+ 'ppc64_migration',
]
tests_ppc64_system_thorough = [
@@ -260,7 +260,7 @@ tests_ppc64_system_thorough = [
]
tests_riscv32_system_quick = [
- 'migration',
+ 'riscv32_migration',
'riscv_opensbi',
]
@@ -269,7 +269,7 @@ tests_riscv32_system_thorough = [
]
tests_riscv64_system_quick = [
- 'migration',
+ 'riscv64_migration',
'riscv_opensbi',
]
@@ -300,7 +300,7 @@ tests_sh4eb_system_thorough = [
]
tests_sparc_system_quick = [
- 'migration',
+ 'sparc_migration',
]
tests_sparc_system_thorough = [
@@ -309,7 +309,7 @@ tests_sparc_system_thorough = [
]
tests_sparc64_system_quick = [
- 'migration',
+ 'sparc64_migration',
]
tests_sparc64_system_thorough = [
@@ -320,7 +320,7 @@ tests_sparc64_system_thorough = [
tests_x86_64_system_quick = [
'cpu_queries',
'mem_addr_space',
- 'migration',
+ 'x86_64_migration',
'pc_cpu_hotplug_props',
'virtio_version',
'x86_cpu_model_versions',
diff --git a/tests/functional/test_migration.py b/tests/functional/migration.py
old mode 100755
new mode 100644
similarity index 74%
rename from tests/functional/test_migration.py
rename to tests/functional/migration.py
index c4393c35434..07395544832
--- a/tests/functional/test_migration.py
+++ b/tests/functional/migration.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-2.0-or-later
#
-# Migration test
+# Migration test base class
#
# Copyright (c) 2019 Red Hat, Inc.
#
@@ -14,7 +14,7 @@
import tempfile
import time
-from qemu_test import QemuSystemTest, skipIfMissingCommands
+from qemu_test import QemuSystemTest, which
from qemu_test.ports import Ports
@@ -41,24 +41,7 @@ def assert_migration(self, src_vm, dst_vm):
self.assertEqual(dst_vm.cmd('query-status')['status'], 'running')
self.assertEqual(src_vm.cmd('query-status')['status'],'postmigrate')
- def select_machine(self):
- target_machine = {
- 'aarch64': 'quanta-gsj',
- 'alpha': 'clipper',
- 'arm': 'npcm750-evb',
- 'i386': 'isapc',
- 'ppc': 'sam460ex',
- 'ppc64': 'mac99',
- 'riscv32': 'spike',
- 'riscv64': 'virt',
- 'sparc': 'SS-4',
- 'sparc64': 'sun4u',
- 'x86_64': 'microvm',
- }
- self.set_machine(target_machine[self.arch])
-
def do_migrate(self, dest_uri, src_uri=None):
- self.select_machine()
dest_vm = self.get_vm('-incoming', dest_uri, name="dest-qemu")
dest_vm.add_args('-nodefaults')
dest_vm.launch()
@@ -76,23 +59,21 @@ def _get_free_port(self, ports):
self.skipTest('Failed to find a free port')
return port
- def test_migration_with_tcp_localhost(self):
+ def migration_with_tcp_localhost(self):
with Ports() as ports:
dest_uri = 'tcp:localhost:%u' % self._get_free_port(ports)
self.do_migrate(dest_uri)
- def test_migration_with_unix(self):
+ def migration_with_unix(self):
with tempfile.TemporaryDirectory(prefix='socket_') as socket_path:
dest_uri = 'unix:%s/qemu-test.sock' % socket_path
self.do_migrate(dest_uri)
- @skipIfMissingCommands('ncat')
- def test_migration_with_exec(self):
+ def migration_with_exec(self):
+ if not which('ncat'):
+ self.skipTest('ncat is not available')
with Ports() as ports:
free_port = self._get_free_port(ports)
dest_uri = 'exec:ncat -l localhost %u' % free_port
src_uri = 'exec:ncat localhost %u' % free_port
self.do_migrate(dest_uri, src_uri)
-
-if __name__ == '__main__':
- QemuSystemTest.main()
diff --git a/tests/functional/test_aarch64_migration.py b/tests/functional/test_aarch64_migration.py
new file mode 100755
index 00000000000..70267e756d9
--- /dev/null
+++ b/tests/functional/test_aarch64_migration.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# aarch64 migration test
+
+from migration import MigrationTest
+
+
+class Aarch64MigrationTest(MigrationTest):
+
+ def test_migration_with_tcp_localhost(self):
+ self.set_machine('quanta-gsj')
+ self.migration_with_tcp_localhost()
+
+ def test_migration_with_unix(self):
+ self.set_machine('quanta-gsj')
+ self.migration_with_unix()
+
+ def test_migration_with_exec(self):
+ self.set_machine('quanta-gsj')
+ self.migration_with_exec()
+
+
+if __name__ == '__main__':
+ MigrationTest.main()
diff --git a/tests/functional/test_alpha_migration.py b/tests/functional/test_alpha_migration.py
new file mode 100755
index 00000000000..f11b523ec9e
--- /dev/null
+++ b/tests/functional/test_alpha_migration.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Alpha migration test
+
+from migration import MigrationTest
+
+
+class AlphaMigrationTest(MigrationTest):
+
+ def test_migration_with_tcp_localhost(self):
+ self.set_machine('clipper')
+ self.migration_with_tcp_localhost()
+
+ def test_migration_with_unix(self):
+ self.set_machine('clipper')
+ self.migration_with_unix()
+
+ def test_migration_with_exec(self):
+ self.set_machine('clipper')
+ self.migration_with_exec()
+
+
+if __name__ == '__main__':
+ MigrationTest.main()
diff --git a/tests/functional/test_arm_migration.py b/tests/functional/test_arm_migration.py
new file mode 100755
index 00000000000..0aa89f4f61a
--- /dev/null
+++ b/tests/functional/test_arm_migration.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# arm migration test
+
+from migration import MigrationTest
+
+
+class ArmMigrationTest(MigrationTest):
+
+ def test_migration_with_tcp_localhost(self):
+ self.set_machine('npcm750-evb')
+ self.migration_with_tcp_localhost()
+
+ def test_migration_with_unix(self):
+ self.set_machine('npcm750-evb')
+ self.migration_with_unix()
+
+ def test_migration_with_exec(self):
+ self.set_machine('npcm750-evb')
+ self.migration_with_exec()
+
+
+if __name__ == '__main__':
+ MigrationTest.main()
diff --git a/tests/functional/test_i386_migration.py b/tests/functional/test_i386_migration.py
new file mode 100755
index 00000000000..a57f3164044
--- /dev/null
+++ b/tests/functional/test_i386_migration.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# i386 migration test
+
+from migration import MigrationTest
+
+
+class I386MigrationTest(MigrationTest):
+
+ def test_migration_with_tcp_localhost(self):
+ self.set_machine('isapc')
+ self.migration_with_tcp_localhost()
+
+ def test_migration_with_unix(self):
+ self.set_machine('isapc')
+ self.migration_with_unix()
+
+ def test_migration_with_exec(self):
+ self.set_machine('isapc')
+ self.migration_with_exec()
+
+
+if __name__ == '__main__':
+ MigrationTest.main()
diff --git a/tests/functional/test_ppc64_migration.py b/tests/functional/test_ppc64_migration.py
new file mode 100755
index 00000000000..5dfdaaf709a
--- /dev/null
+++ b/tests/functional/test_ppc64_migration.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# ppc migration test
+
+from migration import MigrationTest
+
+
+class PpcMigrationTest(MigrationTest):
+
+ def test_migration_with_tcp_localhost(self):
+ self.set_machine('mac99')
+ self.migration_with_tcp_localhost()
+
+ def test_migration_with_unix(self):
+ self.set_machine('mac99')
+ self.migration_with_unix()
+
+ def test_migration_with_exec(self):
+ self.set_machine('mac99')
+ self.migration_with_exec()
+
+
+if __name__ == '__main__':
+ MigrationTest.main()
diff --git a/tests/functional/test_ppc_migration.py b/tests/functional/test_ppc_migration.py
new file mode 100755
index 00000000000..a8692826d35
--- /dev/null
+++ b/tests/functional/test_ppc_migration.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# ppc migration test
+
+from migration import MigrationTest
+
+
+class PpcMigrationTest(MigrationTest):
+
+ def test_migration_with_tcp_localhost(self):
+ self.set_machine('sam460ex')
+ self.migration_with_tcp_localhost()
+
+ def test_migration_with_unix(self):
+ self.set_machine('sam460ex')
+ self.migration_with_unix()
+
+ def test_migration_with_exec(self):
+ self.set_machine('sam460ex')
+ self.migration_with_exec()
+
+
+if __name__ == '__main__':
+ MigrationTest.main()
diff --git a/tests/functional/test_riscv32_migration.py b/tests/functional/test_riscv32_migration.py
new file mode 100755
index 00000000000..30acbbe69f9
--- /dev/null
+++ b/tests/functional/test_riscv32_migration.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# riscv32 migration test
+
+from migration import MigrationTest
+
+
+class Rv32MigrationTest(MigrationTest):
+
+ def test_migration_with_tcp_localhost(self):
+ self.set_machine('spike')
+ self.migration_with_tcp_localhost()
+
+ def test_migration_with_unix(self):
+ self.set_machine('virt')
+ self.migration_with_unix()
+
+ def test_migration_with_exec(self):
+ self.set_machine('spike')
+ self.migration_with_exec()
+
+
+if __name__ == '__main__':
+ MigrationTest.main()
diff --git a/tests/functional/test_riscv64_migration.py b/tests/functional/test_riscv64_migration.py
new file mode 100755
index 00000000000..2d613a29ec4
--- /dev/null
+++ b/tests/functional/test_riscv64_migration.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# riscv64 migration test
+
+from migration import MigrationTest
+
+
+class Rv64MigrationTest(MigrationTest):
+
+ def test_migration_with_tcp_localhost(self):
+ self.set_machine('virt')
+ self.migration_with_tcp_localhost()
+
+ def test_migration_with_unix(self):
+ self.set_machine('spike')
+ self.migration_with_unix()
+
+ def test_migration_with_exec(self):
+ self.set_machine('virt')
+ self.migration_with_exec()
+
+
+if __name__ == '__main__':
+ MigrationTest.main()
diff --git a/tests/functional/test_sparc64_migration.py b/tests/functional/test_sparc64_migration.py
new file mode 100755
index 00000000000..a8a6c73c354
--- /dev/null
+++ b/tests/functional/test_sparc64_migration.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Sparc64 migration test
+
+from migration import MigrationTest
+
+
+class Sparc64MigrationTest(MigrationTest):
+
+ def test_migration_with_tcp_localhost(self):
+ self.set_machine('sun4u')
+ self.migration_with_tcp_localhost()
+
+ def test_migration_with_unix(self):
+ self.set_machine('sun4u')
+ self.migration_with_unix()
+
+ def test_migration_with_exec(self):
+ self.set_machine('sun4u')
+ self.migration_with_exec()
+
+
+if __name__ == '__main__':
+ MigrationTest.main()
diff --git a/tests/functional/test_sparc_migration.py b/tests/functional/test_sparc_migration.py
new file mode 100755
index 00000000000..dd6d5783b11
--- /dev/null
+++ b/tests/functional/test_sparc_migration.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Sparc migration test
+
+from migration import MigrationTest
+
+
+class SparcMigrationTest(MigrationTest):
+
+ def test_migration_with_tcp_localhost(self):
+ self.set_machine('SS-4')
+ self.migration_with_tcp_localhost()
+
+ def test_migration_with_unix(self):
+ self.set_machine('SS-5')
+ self.migration_with_unix()
+
+ def test_migration_with_exec(self):
+ self.set_machine('SS-4')
+ self.migration_with_exec()
+
+
+if __name__ == '__main__':
+ MigrationTest.main()
diff --git a/tests/functional/test_x86_64_migration.py b/tests/functional/test_x86_64_migration.py
new file mode 100755
index 00000000000..f3a517ae1f6
--- /dev/null
+++ b/tests/functional/test_x86_64_migration.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# x86_64 migration test
+
+from migration import MigrationTest
+
+
+class X8664MigrationTest(MigrationTest):
+
+ def test_migration_with_tcp_localhost(self):
+ self.set_machine('microvm')
+ self.migration_with_tcp_localhost()
+
+ def test_migration_with_unix(self):
+ self.set_machine('microvm')
+ self.migration_with_unix()
+
+ def test_migration_with_exec(self):
+ self.set_machine('microvm')
+ self.migration_with_exec()
+
+
+if __name__ == '__main__':
+ MigrationTest.main()
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 07/31] tests/functional: Rework the multiprocess test to have target-specific files
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (5 preceding siblings ...)
2025-08-27 7:54 ` [PULL 06/31] tests/functional: Rework the migration test to have target-specific files Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 08/31] tests/functional/meson.build: Split timeout settings by target Thomas Huth
` (24 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier
From: Thomas Huth <thuth@redhat.com>
We are going to move the tests for each target into separate subdirectories.
The multiprocess test currently contains code for both, x86 and aarch64,
so it does not quite fit into this scheme. Rework the test to have a common
test class, and target specific files with a target specific class, so
that this will fit better into the new scheme.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-3-thuth@redhat.com>
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 4 +-
.../{test_multiprocess.py => multiprocess.py} | 40 +------------------
tests/functional/test_aarch64_multiprocess.py | 31 ++++++++++++++
tests/functional/test_x86_64_multiprocess.py | 31 ++++++++++++++
5 files changed, 67 insertions(+), 41 deletions(-)
rename tests/functional/{test_multiprocess.py => multiprocess.py} (58%)
mode change 100755 => 100644
create mode 100755 tests/functional/test_aarch64_multiprocess.py
create mode 100755 tests/functional/test_x86_64_multiprocess.py
diff --git a/MAINTAINERS b/MAINTAINERS
index 56c1fe67690..adbed9df2fc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4286,7 +4286,7 @@ F: hw/remote/vfio-user-obj.c
F: include/hw/remote/vfio-user-obj.h
F: hw/remote/iommu.c
F: include/hw/remote/iommu.h
-F: tests/functional/test_multiprocess.py
+F: tests/functional/*multiprocess.py
VFIO-USER:
M: John Levon <john.levon@nutanix.com>
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index c32436d99ad..38ae0d6cd3b 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -90,6 +90,7 @@ tests_aarch64_system_thorough = [
'aarch64_hotplug_pci',
'aarch64_imx8mp_evk',
'aarch64_kvm',
+ 'aarch64_multiprocess',
'aarch64_raspi3',
'aarch64_raspi4',
'aarch64_replay',
@@ -106,7 +107,6 @@ tests_aarch64_system_thorough = [
'aarch64_virt_gpu',
'aarch64_xen',
'aarch64_xlnx_versal',
- 'multiprocess',
]
tests_alpha_system_quick = [
@@ -332,7 +332,7 @@ tests_x86_64_system_thorough = [
'acpi_bits',
'intel_iommu',
'linux_initrd',
- 'multiprocess',
+ 'x86_64_multiprocess',
'netdev_ethtool',
'virtio_balloon',
'virtio_gpu',
diff --git a/tests/functional/test_multiprocess.py b/tests/functional/multiprocess.py
old mode 100755
new mode 100644
similarity index 58%
rename from tests/functional/test_multiprocess.py
rename to tests/functional/multiprocess.py
index 92d5207b0eb..6a06c1eda19
--- a/tests/functional/test_multiprocess.py
+++ b/tests/functional/multiprocess.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-2.0-or-later
#
# Test for multiprocess qemu
#
@@ -9,33 +9,13 @@
import os
import socket
-from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern
+from qemu_test import QemuSystemTest, wait_for_console_pattern
from qemu_test import exec_command, exec_command_and_wait_for_pattern
class Multiprocess(QemuSystemTest):
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
- ASSET_KERNEL_X86 = Asset(
- ('https://archives.fedoraproject.org/pub/archive/fedora/linux'
- '/releases/31/Everything/x86_64/os/images/pxeboot/vmlinuz'),
- 'd4738d03dbbe083ca610d0821d0a8f1488bebbdccef54ce33e3adb35fda00129')
-
- ASSET_INITRD_X86 = Asset(
- ('https://archives.fedoraproject.org/pub/archive/fedora/linux'
- '/releases/31/Everything/x86_64/os/images/pxeboot/initrd.img'),
- '3b6cb5c91a14c42e2f61520f1689264d865e772a1f0069e660a800d31dd61fb9')
-
- ASSET_KERNEL_AARCH64 = Asset(
- ('https://archives.fedoraproject.org/pub/archive/fedora/linux'
- '/releases/31/Everything/aarch64/os/images/pxeboot/vmlinuz'),
- '3ae07fcafbfc8e4abeb693035a74fe10698faae15e9ccd48882a9167800c1527')
-
- ASSET_INITRD_AARCH64 = Asset(
- ('https://archives.fedoraproject.org/pub/archive/fedora/linux'
- '/releases/31/Everything/aarch64/os/images/pxeboot/initrd.img'),
- '9fd230cab10b1dafea41cf00150e6669d37051fad133bd618d2130284e16d526')
-
def do_test(self, kernel_asset, initrd_asset,
kernel_command_line, machine_type):
"""Main test method"""
@@ -85,19 +65,3 @@ def do_test(self, kernel_asset, initrd_asset,
proxy_sock.close()
remote_sock.close()
-
- def test_multiprocess(self):
- kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE
- if self.arch == 'x86_64':
- kernel_command_line += 'console=ttyS0 rdinit=/bin/bash'
- self.do_test(self.ASSET_KERNEL_X86, self.ASSET_INITRD_X86,
- kernel_command_line, 'pc')
- elif self.arch == 'aarch64':
- kernel_command_line += 'rdinit=/bin/bash console=ttyAMA0'
- self.do_test(self.ASSET_KERNEL_AARCH64, self.ASSET_INITRD_AARCH64,
- kernel_command_line, 'virt,gic-version=3')
- else:
- assert False
-
-if __name__ == '__main__':
- QemuSystemTest.main()
diff --git a/tests/functional/test_aarch64_multiprocess.py b/tests/functional/test_aarch64_multiprocess.py
new file mode 100755
index 00000000000..1c6e45ecb67
--- /dev/null
+++ b/tests/functional/test_aarch64_multiprocess.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Test for multiprocess qemu on aarch64
+
+from multiprocess import Multiprocess
+from qemu_test import Asset
+
+
+class Aarch64Multiprocess(Multiprocess):
+
+ ASSET_KERNEL_AARCH64 = Asset(
+ ('https://archives.fedoraproject.org/pub/archive/fedora/linux'
+ '/releases/31/Everything/aarch64/os/images/pxeboot/vmlinuz'),
+ '3ae07fcafbfc8e4abeb693035a74fe10698faae15e9ccd48882a9167800c1527')
+
+ ASSET_INITRD_AARCH64 = Asset(
+ ('https://archives.fedoraproject.org/pub/archive/fedora/linux'
+ '/releases/31/Everything/aarch64/os/images/pxeboot/initrd.img'),
+ '9fd230cab10b1dafea41cf00150e6669d37051fad133bd618d2130284e16d526')
+
+ def test_multiprocess(self):
+ kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+ 'rdinit=/bin/bash console=ttyAMA0')
+ self.do_test(self.ASSET_KERNEL_AARCH64, self.ASSET_INITRD_AARCH64,
+ kernel_command_line, 'virt,gic-version=3')
+
+
+if __name__ == '__main__':
+ Multiprocess.main()
diff --git a/tests/functional/test_x86_64_multiprocess.py b/tests/functional/test_x86_64_multiprocess.py
new file mode 100755
index 00000000000..756629dd446
--- /dev/null
+++ b/tests/functional/test_x86_64_multiprocess.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Test for multiprocess qemu on x86
+
+from multiprocess import Multiprocess
+from qemu_test import Asset
+
+
+class X86Multiprocess(Multiprocess):
+
+ ASSET_KERNEL_X86 = Asset(
+ ('https://archives.fedoraproject.org/pub/archive/fedora/linux'
+ '/releases/31/Everything/x86_64/os/images/pxeboot/vmlinuz'),
+ 'd4738d03dbbe083ca610d0821d0a8f1488bebbdccef54ce33e3adb35fda00129')
+
+ ASSET_INITRD_X86 = Asset(
+ ('https://archives.fedoraproject.org/pub/archive/fedora/linux'
+ '/releases/31/Everything/x86_64/os/images/pxeboot/initrd.img'),
+ '3b6cb5c91a14c42e2f61520f1689264d865e772a1f0069e660a800d31dd61fb9')
+
+ def test_multiprocess(self):
+ kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+ 'console=ttyS0 rdinit=/bin/bash')
+ self.do_test(self.ASSET_KERNEL_X86, self.ASSET_INITRD_X86,
+ kernel_command_line, 'pc')
+
+
+if __name__ == '__main__':
+ Multiprocess.main()
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 08/31] tests/functional/meson.build: Split timeout settings by target
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (6 preceding siblings ...)
2025-08-27 7:54 ` [PULL 07/31] tests/functional: Rework the multiprocess " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 09/31] tests/functional/meson.build: Allow tests to reside in subfolders Thomas Huth
` (23 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier
From: Thomas Huth <thuth@redhat.com>
We are going to move these settings into target-specific subfolders.
As a first step, split the big test_timeouts array up into individual
ones.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-4-thuth@redhat.com>
---
tests/functional/meson.build | 50 +++++++++++++++++++++++++++++++-----
1 file changed, 44 insertions(+), 6 deletions(-)
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 38ae0d6cd3b..356aad12dee 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -10,7 +10,7 @@ if get_option('tcg_interpreter')
endif
# Timeouts for individual tests that can be slow e.g. with debugging enabled
-test_timeouts = {
+test_aarch64_timeouts = {
'aarch64_aspeed_ast2700' : 600,
'aarch64_aspeed_ast2700fc' : 600,
'aarch64_device_passthrough' : 720,
@@ -25,7 +25,9 @@ test_timeouts = {
'aarch64_tuxrun' : 240,
'aarch64_virt' : 360,
'aarch64_virt_gpu' : 480,
- 'acpi_bits' : 420,
+}
+
+test_arm_timeouts = {
'arm_aspeed_palmetto' : 120,
'arm_aspeed_romulus' : 120,
'arm_aspeed_witherspoon' : 120,
@@ -44,24 +46,55 @@ test_timeouts = {
'arm_replay' : 240,
'arm_tuxrun' : 240,
'arm_sx1' : 360,
- 'intel_iommu': 300,
+}
+
+test_mips_timeouts = {
'mips_malta' : 480,
+}
+
+test_mipsel_timeouts = {
'mipsel_malta' : 420,
'mipsel_replay' : 480,
+}
+
+test_mips64_timeouts = {
'mips64_malta' : 240,
+}
+
+test_mips64el_timeouts = {
'mips64el_malta' : 420,
'mips64el_replay' : 180,
- 'netdev_ethtool' : 180,
+}
+
+test_ppc_timeouts = {
'ppc_40p' : 240,
+}
+
+test_ppc64_timeouts = {
'ppc64_hv' : 1000,
'ppc64_powernv' : 480,
'ppc64_pseries' : 480,
'ppc64_replay' : 210,
'ppc64_tuxrun' : 420,
'ppc64_mac99' : 120,
+}
+
+test_riscv64_timeouts = {
'riscv64_tuxrun' : 120,
+}
+
+test_s390x_timeouts = {
's390x_ccw_virtio' : 420,
+}
+
+test_sh4_timeouts = {
'sh4_tuxrun' : 240,
+}
+
+test_x86_64_timeouts = {
+ 'acpi_bits' : 420,
+ 'intel_iommu': 300,
+ 'netdev_ethtool' : 180,
'virtio_balloon': 120,
'x86_64_kvm_xen' : 180,
'x86_64_replay' : 480,
@@ -404,6 +437,11 @@ foreach speed : ['quick', 'thorough']
build_by_default: false,
env: test_precache_env)
precache_all += precache
+ if is_variable('test_' + target_base + '_timeouts')
+ time_out = get_variable('test_' + target_base + '_timeouts').get(test, 90)
+ else
+ time_out = 90
+ endif
# Ideally we would add 'precache' to 'depends' here, such that
# 'build_by_default: false' lets the pre-caching automatically
@@ -419,8 +457,8 @@ foreach speed : ['quick', 'thorough']
env: test_env,
args: [testpath],
protocol: 'tap',
- timeout: test_timeouts.get(test, 90),
- priority: test_timeouts.get(test, 90),
+ timeout: time_out,
+ priority: time_out,
suite: suites)
endforeach
endforeach
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 09/31] tests/functional/meson.build: Allow tests to reside in subfolders
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (7 preceding siblings ...)
2025-08-27 7:54 ` [PULL 08/31] tests/functional/meson.build: Split timeout settings by target Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 10/31] tests/functional: Move aarch64 tests into architecture specific folder Thomas Huth
` (22 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier
From: Thomas Huth <thuth@redhat.com>
We are going to move target-specific tests to subfolders that are
named after the target (and generic tests will be put into a "generic"
folder), so prepare the meson.build file to allow such locations, too.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-5-thuth@redhat.com>
---
tests/functional/meson.build | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 356aad12dee..8c24ac1cc2d 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -423,7 +423,13 @@ foreach speed : ['quick', 'thorough']
foreach test : target_tests
testname = '@0@-@1@'.format(target_base, test)
- testfile = 'test_' + test + '.py'
+ if fs.exists('test_' + test + '.py')
+ testfile = 'test_' + test + '.py'
+ elif fs.exists('generic' / 'test_' + test + '.py')
+ testfile = 'generic' / 'test_' + test + '.py'
+ else
+ testfile = target_base / 'test_' + test + '.py'
+ endif
testpath = meson.current_source_dir() / testfile
teststamp = testname + '.tstamp'
test_precache_env = environment()
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 10/31] tests/functional: Move aarch64 tests into architecture specific folder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (8 preceding siblings ...)
2025-08-27 7:54 ` [PULL 09/31] tests/functional/meson.build: Allow tests to reside in subfolders Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 11/31] tests/functional: Move alpha " Thomas Huth
` (21 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded already, some
restructuring would be helpful here. Thus move the aarch64 tests into
a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-6-thuth@redhat.com>
---
MAINTAINERS | 24 +++++-----
tests/functional/aarch64/meson.build | 48 +++++++++++++++++++
.../test_aspeed_ast2700.py} | 0
.../test_aspeed_ast2700fc.py} | 0
.../test_device_passthrough.py} | 0
.../test_hotplug_pci.py} | 0
.../test_imx8mp_evk.py} | 0
.../test_kvm.py} | 0
.../test_migration.py} | 0
.../test_multiprocess.py} | 0
.../test_raspi3.py} | 0
.../test_raspi4.py} | 0
.../test_replay.py} | 0
.../test_reverse_debug.py} | 0
.../test_rme_sbsaref.py} | 2 +-
.../test_rme_virt.py} | 0
.../test_sbsaref.py} | 0
.../test_sbsaref_alpine.py} | 2 +-
.../test_sbsaref_freebsd.py} | 2 +-
.../test_smmu.py} | 0
.../test_tcg_plugins.py} | 0
.../test_tuxrun.py} | 0
.../test_virt.py} | 0
.../test_virt_gpu.py} | 0
.../test_xen.py} | 0
.../test_xlnx_versal.py} | 0
tests/functional/meson.build | 48 +------------------
27 files changed, 64 insertions(+), 62 deletions(-)
create mode 100644 tests/functional/aarch64/meson.build
rename tests/functional/{test_aarch64_aspeed_ast2700.py => aarch64/test_aspeed_ast2700.py} (100%)
rename tests/functional/{test_aarch64_aspeed_ast2700fc.py => aarch64/test_aspeed_ast2700fc.py} (100%)
rename tests/functional/{test_aarch64_device_passthrough.py => aarch64/test_device_passthrough.py} (100%)
rename tests/functional/{test_aarch64_hotplug_pci.py => aarch64/test_hotplug_pci.py} (100%)
rename tests/functional/{test_aarch64_imx8mp_evk.py => aarch64/test_imx8mp_evk.py} (100%)
rename tests/functional/{test_aarch64_kvm.py => aarch64/test_kvm.py} (100%)
rename tests/functional/{test_aarch64_migration.py => aarch64/test_migration.py} (100%)
rename tests/functional/{test_aarch64_multiprocess.py => aarch64/test_multiprocess.py} (100%)
rename tests/functional/{test_aarch64_raspi3.py => aarch64/test_raspi3.py} (100%)
rename tests/functional/{test_aarch64_raspi4.py => aarch64/test_raspi4.py} (100%)
rename tests/functional/{test_aarch64_replay.py => aarch64/test_replay.py} (100%)
rename tests/functional/{test_aarch64_reverse_debug.py => aarch64/test_reverse_debug.py} (100%)
rename tests/functional/{test_aarch64_rme_sbsaref.py => aarch64/test_rme_sbsaref.py} (98%)
rename tests/functional/{test_aarch64_rme_virt.py => aarch64/test_rme_virt.py} (100%)
rename tests/functional/{test_aarch64_sbsaref.py => aarch64/test_sbsaref.py} (100%)
rename tests/functional/{test_aarch64_sbsaref_alpine.py => aarch64/test_sbsaref_alpine.py} (97%)
rename tests/functional/{test_aarch64_sbsaref_freebsd.py => aarch64/test_sbsaref_freebsd.py} (97%)
rename tests/functional/{test_aarch64_smmu.py => aarch64/test_smmu.py} (100%)
rename tests/functional/{test_aarch64_tcg_plugins.py => aarch64/test_tcg_plugins.py} (100%)
rename tests/functional/{test_aarch64_tuxrun.py => aarch64/test_tuxrun.py} (100%)
rename tests/functional/{test_aarch64_virt.py => aarch64/test_virt.py} (100%)
rename tests/functional/{test_aarch64_virt_gpu.py => aarch64/test_virt_gpu.py} (100%)
rename tests/functional/{test_aarch64_xen.py => aarch64/test_xen.py} (100%)
rename tests/functional/{test_aarch64_xlnx_versal.py => aarch64/test_xlnx_versal.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index adbed9df2fc..a2a5ccea7b6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -212,7 +212,7 @@ L: qemu-arm@nongnu.org
S: Maintained
F: hw/arm/smmu*
F: include/hw/arm/smmu*
-F: tests/functional/test_aarch64_smmu.py
+F: tests/functional/aarch64/test_smmu.py
AVR TCG CPUs
M: Michael Rolnik <mrolnik@gmail.com>
@@ -874,7 +874,7 @@ F: include/hw/arm/fsl-imx8mp.h
F: include/hw/misc/imx8mp_*.h
F: include/hw/pci-host/fsl_imx8m_phy.h
F: docs/system/arm/imx8mp-evk.rst
-F: tests/functional/test_aarch64_imx8mp_evk.py
+F: tests/functional/aarch64/test_imx8mp_evk.py
F: tests/qtest/rs5c372-test.c
MPS2 / MPS3
@@ -952,8 +952,7 @@ F: include/hw/arm/rasp*
F: include/hw/*/bcm283*
F: docs/system/arm/raspi.rst
F: tests/functional/test_arm_raspi2.py
-F: tests/functional/test_aarch64_raspi3.py
-F: tests/functional/test_aarch64_raspi4.py
+F: tests/functional/aarch64/test_raspi*.py
Real View
M: Peter Maydell <peter.maydell@linaro.org>
@@ -993,7 +992,7 @@ F: hw/misc/sbsa_ec.c
F: hw/watchdog/sbsa_gwdt.c
F: include/hw/watchdog/sbsa_gwdt.h
F: docs/system/arm/sbsa.rst
-F: tests/functional/test_aarch64_*sbsaref*.py
+F: tests/functional/aarch64/test_*sbsaref*.py
Sharp SL-5500 (Collie) PDA
M: Peter Maydell <peter.maydell@linaro.org>
@@ -1063,8 +1062,8 @@ S: Maintained
F: hw/arm/virt*
F: include/hw/arm/virt.h
F: docs/system/arm/virt.rst
-F: tests/functional/test_aarch64_*virt*.py
-F: tests/functional/test_aarch64_tuxrun.py
+F: tests/functional/aarch64/test_*virt*.py
+F: tests/functional/aarch64/test_tuxrun.py
F: tests/functional/test_arm_tuxrun.py
F: tests/functional/test_arm_virt.py
@@ -1096,7 +1095,7 @@ F: hw/display/dpcd.c
F: include/hw/display/dpcd.h
F: docs/system/arm/xlnx-versal-virt.rst
F: docs/system/arm/xlnx-zcu102.rst
-F: tests/functional/test_aarch64_xlnx_versal.py
+F: tests/functional/aarch64/test_xlnx_versal.py
Xilinx Versal OSPI
M: Francisco Iglesias <francisco.iglesias@amd.com>
@@ -2109,7 +2108,7 @@ ARM PCI Hotplug
M: Gustavo Romero <gustavo.romero@linaro.org>
L: qemu-arm@nongnu.org
S: Supported
-F: tests/functional/test_aarch64_hotplug_pci.py
+F: tests/functional/aarch64/test_hotplug_pci.py
ACPI/SMBIOS
M: Michael S. Tsirkin <mst@redhat.com>
@@ -2263,6 +2262,7 @@ F: util/vfio-helpers.c
F: include/hw/vfio/
F: docs/devel/migration/vfio.rst
F: qapi/vfio.json
+F: tests/functional/aarch64/test_device_passthrough.py
vfio-igd
M: Alex Williamson <alex.williamson@redhat.com>
@@ -2638,7 +2638,7 @@ M: Alex Bennée <alex.bennee@linaro.org>
S: Maintained
F: hw/core/guest-loader.c
F: docs/system/guest-loader.rst
-F: tests/functional/test_aarch64_xen.py
+F: tests/functional/aarch64/test_xen.py
Intel Hexadecimal Object File Loader
M: Su Hang <suhang16@mails.ucas.ac.cn>
@@ -2707,7 +2707,7 @@ F: hw/display/virtio-gpu*
F: hw/display/virtio-vga.*
F: include/hw/virtio/virtio-gpu.h
F: docs/system/devices/virtio-gpu.rst
-F: tests/functional/test_aarch64_virt_gpu.py
+F: tests/functional/aarch64/test_virt_gpu.py
vhost-user-blk
M: Raphael Norwitz <raphael@enfabrica.net>
@@ -3933,7 +3933,7 @@ S: Maintained
F: docs/devel/tcg-plugins.rst
F: plugins/
F: tests/tcg/plugins/
-F: tests/functional/test_aarch64_tcg_plugins.py
+F: tests/functional/aarch64/test_tcg_plugins.py
F: contrib/plugins/
F: scripts/qemu-plugin-symbols.py
diff --git a/tests/functional/aarch64/meson.build b/tests/functional/aarch64/meson.build
new file mode 100644
index 00000000000..04846c6eb18
--- /dev/null
+++ b/tests/functional/aarch64/meson.build
@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_aarch64_timeouts = {
+ 'aspeed_ast2700' : 600,
+ 'aspeed_ast2700fc' : 600,
+ 'device_passthrough' : 720,
+ 'imx8mp_evk' : 240,
+ 'raspi4' : 480,
+ 'reverse_debug' : 180,
+ 'rme_virt' : 1200,
+ 'rme_sbsaref' : 1200,
+ 'sbsaref_alpine' : 1200,
+ 'sbsaref_freebsd' : 720,
+ 'smmu' : 720,
+ 'tuxrun' : 240,
+ 'virt' : 360,
+ 'virt_gpu' : 480,
+}
+
+tests_aarch64_system_quick = [
+ 'migration',
+]
+
+tests_aarch64_system_thorough = [
+ 'aspeed_ast2700',
+ 'aspeed_ast2700fc',
+ 'device_passthrough',
+ 'hotplug_pci',
+ 'imx8mp_evk',
+ 'kvm',
+ 'multiprocess',
+ 'raspi3',
+ 'raspi4',
+ 'replay',
+ 'reverse_debug',
+ 'rme_virt',
+ 'rme_sbsaref',
+ 'sbsaref',
+ 'sbsaref_alpine',
+ 'sbsaref_freebsd',
+ 'smmu',
+ 'tcg_plugins',
+ 'tuxrun',
+ 'virt',
+ 'virt_gpu',
+ 'xen',
+ 'xlnx_versal',
+]
diff --git a/tests/functional/test_aarch64_aspeed_ast2700.py b/tests/functional/aarch64/test_aspeed_ast2700.py
similarity index 100%
rename from tests/functional/test_aarch64_aspeed_ast2700.py
rename to tests/functional/aarch64/test_aspeed_ast2700.py
diff --git a/tests/functional/test_aarch64_aspeed_ast2700fc.py b/tests/functional/aarch64/test_aspeed_ast2700fc.py
similarity index 100%
rename from tests/functional/test_aarch64_aspeed_ast2700fc.py
rename to tests/functional/aarch64/test_aspeed_ast2700fc.py
diff --git a/tests/functional/test_aarch64_device_passthrough.py b/tests/functional/aarch64/test_device_passthrough.py
similarity index 100%
rename from tests/functional/test_aarch64_device_passthrough.py
rename to tests/functional/aarch64/test_device_passthrough.py
diff --git a/tests/functional/test_aarch64_hotplug_pci.py b/tests/functional/aarch64/test_hotplug_pci.py
similarity index 100%
rename from tests/functional/test_aarch64_hotplug_pci.py
rename to tests/functional/aarch64/test_hotplug_pci.py
diff --git a/tests/functional/test_aarch64_imx8mp_evk.py b/tests/functional/aarch64/test_imx8mp_evk.py
similarity index 100%
rename from tests/functional/test_aarch64_imx8mp_evk.py
rename to tests/functional/aarch64/test_imx8mp_evk.py
diff --git a/tests/functional/test_aarch64_kvm.py b/tests/functional/aarch64/test_kvm.py
similarity index 100%
rename from tests/functional/test_aarch64_kvm.py
rename to tests/functional/aarch64/test_kvm.py
diff --git a/tests/functional/test_aarch64_migration.py b/tests/functional/aarch64/test_migration.py
similarity index 100%
rename from tests/functional/test_aarch64_migration.py
rename to tests/functional/aarch64/test_migration.py
diff --git a/tests/functional/test_aarch64_multiprocess.py b/tests/functional/aarch64/test_multiprocess.py
similarity index 100%
rename from tests/functional/test_aarch64_multiprocess.py
rename to tests/functional/aarch64/test_multiprocess.py
diff --git a/tests/functional/test_aarch64_raspi3.py b/tests/functional/aarch64/test_raspi3.py
similarity index 100%
rename from tests/functional/test_aarch64_raspi3.py
rename to tests/functional/aarch64/test_raspi3.py
diff --git a/tests/functional/test_aarch64_raspi4.py b/tests/functional/aarch64/test_raspi4.py
similarity index 100%
rename from tests/functional/test_aarch64_raspi4.py
rename to tests/functional/aarch64/test_raspi4.py
diff --git a/tests/functional/test_aarch64_replay.py b/tests/functional/aarch64/test_replay.py
similarity index 100%
rename from tests/functional/test_aarch64_replay.py
rename to tests/functional/aarch64/test_replay.py
diff --git a/tests/functional/test_aarch64_reverse_debug.py b/tests/functional/aarch64/test_reverse_debug.py
similarity index 100%
rename from tests/functional/test_aarch64_reverse_debug.py
rename to tests/functional/aarch64/test_reverse_debug.py
diff --git a/tests/functional/test_aarch64_rme_sbsaref.py b/tests/functional/aarch64/test_rme_sbsaref.py
similarity index 98%
rename from tests/functional/test_aarch64_rme_sbsaref.py
rename to tests/functional/aarch64/test_rme_sbsaref.py
index 746770e776d..100f1c7738b 100755
--- a/tests/functional/test_aarch64_rme_sbsaref.py
+++ b/tests/functional/aarch64/test_rme_sbsaref.py
@@ -13,7 +13,7 @@
from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern
from qemu_test import exec_command_and_wait_for_pattern
-from test_aarch64_rme_virt import test_realms_guest
+from test_rme_virt import test_realms_guest
class Aarch64RMESbsaRefMachine(QemuSystemTest):
diff --git a/tests/functional/test_aarch64_rme_virt.py b/tests/functional/aarch64/test_rme_virt.py
similarity index 100%
rename from tests/functional/test_aarch64_rme_virt.py
rename to tests/functional/aarch64/test_rme_virt.py
diff --git a/tests/functional/test_aarch64_sbsaref.py b/tests/functional/aarch64/test_sbsaref.py
similarity index 100%
rename from tests/functional/test_aarch64_sbsaref.py
rename to tests/functional/aarch64/test_sbsaref.py
diff --git a/tests/functional/test_aarch64_sbsaref_alpine.py b/tests/functional/aarch64/test_sbsaref_alpine.py
similarity index 97%
rename from tests/functional/test_aarch64_sbsaref_alpine.py
rename to tests/functional/aarch64/test_sbsaref_alpine.py
index 87769993831..abb8f5114bd 100755
--- a/tests/functional/test_aarch64_sbsaref_alpine.py
+++ b/tests/functional/aarch64/test_sbsaref_alpine.py
@@ -12,7 +12,7 @@
from qemu_test import QemuSystemTest, Asset, skipSlowTest
from qemu_test import wait_for_console_pattern
-from test_aarch64_sbsaref import fetch_firmware
+from test_sbsaref import fetch_firmware
class Aarch64SbsarefAlpine(QemuSystemTest):
diff --git a/tests/functional/test_aarch64_sbsaref_freebsd.py b/tests/functional/aarch64/test_sbsaref_freebsd.py
similarity index 97%
rename from tests/functional/test_aarch64_sbsaref_freebsd.py
rename to tests/functional/aarch64/test_sbsaref_freebsd.py
index 7ef016fba62..3b942f7795c 100755
--- a/tests/functional/test_aarch64_sbsaref_freebsd.py
+++ b/tests/functional/aarch64/test_sbsaref_freebsd.py
@@ -12,7 +12,7 @@
from qemu_test import QemuSystemTest, Asset, skipSlowTest
from qemu_test import wait_for_console_pattern
-from test_aarch64_sbsaref import fetch_firmware
+from test_sbsaref import fetch_firmware
class Aarch64SbsarefFreeBSD(QemuSystemTest):
diff --git a/tests/functional/test_aarch64_smmu.py b/tests/functional/aarch64/test_smmu.py
similarity index 100%
rename from tests/functional/test_aarch64_smmu.py
rename to tests/functional/aarch64/test_smmu.py
diff --git a/tests/functional/test_aarch64_tcg_plugins.py b/tests/functional/aarch64/test_tcg_plugins.py
similarity index 100%
rename from tests/functional/test_aarch64_tcg_plugins.py
rename to tests/functional/aarch64/test_tcg_plugins.py
diff --git a/tests/functional/test_aarch64_tuxrun.py b/tests/functional/aarch64/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_aarch64_tuxrun.py
rename to tests/functional/aarch64/test_tuxrun.py
diff --git a/tests/functional/test_aarch64_virt.py b/tests/functional/aarch64/test_virt.py
similarity index 100%
rename from tests/functional/test_aarch64_virt.py
rename to tests/functional/aarch64/test_virt.py
diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/aarch64/test_virt_gpu.py
similarity index 100%
rename from tests/functional/test_aarch64_virt_gpu.py
rename to tests/functional/aarch64/test_virt_gpu.py
diff --git a/tests/functional/test_aarch64_xen.py b/tests/functional/aarch64/test_xen.py
similarity index 100%
rename from tests/functional/test_aarch64_xen.py
rename to tests/functional/aarch64/test_xen.py
diff --git a/tests/functional/test_aarch64_xlnx_versal.py b/tests/functional/aarch64/test_xlnx_versal.py
similarity index 100%
rename from tests/functional/test_aarch64_xlnx_versal.py
rename to tests/functional/aarch64/test_xlnx_versal.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 8c24ac1cc2d..9cb6325360f 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -9,23 +9,7 @@ if get_option('tcg_interpreter')
subdir_done()
endif
-# Timeouts for individual tests that can be slow e.g. with debugging enabled
-test_aarch64_timeouts = {
- 'aarch64_aspeed_ast2700' : 600,
- 'aarch64_aspeed_ast2700fc' : 600,
- 'aarch64_device_passthrough' : 720,
- 'aarch64_imx8mp_evk' : 240,
- 'aarch64_raspi4' : 480,
- 'aarch64_reverse_debug' : 180,
- 'aarch64_rme_virt' : 1200,
- 'aarch64_rme_sbsaref' : 1200,
- 'aarch64_sbsaref_alpine' : 1200,
- 'aarch64_sbsaref_freebsd' : 720,
- 'aarch64_smmu' : 720,
- 'aarch64_tuxrun' : 240,
- 'aarch64_virt' : 360,
- 'aarch64_virt_gpu' : 480,
-}
+subdir('aarch64')
test_arm_timeouts = {
'arm_aspeed_palmetto' : 120,
@@ -112,36 +96,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_aarch64_system_quick = [
- 'aarch64_migration',
-]
-
-tests_aarch64_system_thorough = [
- 'aarch64_aspeed_ast2700',
- 'aarch64_aspeed_ast2700fc',
- 'aarch64_device_passthrough',
- 'aarch64_hotplug_pci',
- 'aarch64_imx8mp_evk',
- 'aarch64_kvm',
- 'aarch64_multiprocess',
- 'aarch64_raspi3',
- 'aarch64_raspi4',
- 'aarch64_replay',
- 'aarch64_reverse_debug',
- 'aarch64_rme_virt',
- 'aarch64_rme_sbsaref',
- 'aarch64_sbsaref',
- 'aarch64_sbsaref_alpine',
- 'aarch64_sbsaref_freebsd',
- 'aarch64_smmu',
- 'aarch64_tcg_plugins',
- 'aarch64_tuxrun',
- 'aarch64_virt',
- 'aarch64_virt_gpu',
- 'aarch64_xen',
- 'aarch64_xlnx_versal',
-]
-
tests_alpha_system_quick = [
'alpha_migration',
]
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 11/31] tests/functional: Move alpha tests into architecture specific folder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (9 preceding siblings ...)
2025-08-27 7:54 ` [PULL 10/31] tests/functional: Move aarch64 tests into architecture specific folder Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 12/31] tests/functional: Move arm " Thomas Huth
` (20 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded already, some
restructuring would be helpful here. Thus move the alpha tests into
a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-7-thuth@redhat.com>
---
MAINTAINERS | 3 ++-
tests/functional/alpha/meson.build | 10 ++++++++++
.../{test_alpha_clipper.py => alpha/test_clipper.py} | 0
.../test_migration.py} | 0
.../{test_alpha_replay.py => alpha/test_replay.py} | 0
tests/functional/meson.build | 10 +---------
6 files changed, 13 insertions(+), 10 deletions(-)
create mode 100644 tests/functional/alpha/meson.build
rename tests/functional/{test_alpha_clipper.py => alpha/test_clipper.py} (100%)
rename tests/functional/{test_alpha_migration.py => alpha/test_migration.py} (100%)
rename tests/functional/{test_alpha_replay.py => alpha/test_replay.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index a2a5ccea7b6..8115aae6183 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -189,6 +189,7 @@ M: Richard Henderson <richard.henderson@linaro.org>
S: Maintained
F: target/alpha/
F: tests/tcg/alpha/
+F: tests/functional/alpha/
F: disas/alpha.c
ARM TCG CPUs
@@ -656,7 +657,7 @@ S: Maintained
F: hw/alpha/
F: hw/isa/smc37c669-superio.c
F: tests/tcg/alpha/system/
-F: tests/functional/test_alpha_clipper.py
+F: tests/functional/alpha/test_clipper.py
ARM Machines
------------
diff --git a/tests/functional/alpha/meson.build b/tests/functional/alpha/meson.build
new file mode 100644
index 00000000000..26a5b3f2e4b
--- /dev/null
+++ b/tests/functional/alpha/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_alpha_system_quick = [
+ 'migration',
+]
+
+tests_alpha_system_thorough = [
+ 'clipper',
+ 'replay',
+]
diff --git a/tests/functional/test_alpha_clipper.py b/tests/functional/alpha/test_clipper.py
similarity index 100%
rename from tests/functional/test_alpha_clipper.py
rename to tests/functional/alpha/test_clipper.py
diff --git a/tests/functional/test_alpha_migration.py b/tests/functional/alpha/test_migration.py
similarity index 100%
rename from tests/functional/test_alpha_migration.py
rename to tests/functional/alpha/test_migration.py
diff --git a/tests/functional/test_alpha_replay.py b/tests/functional/alpha/test_replay.py
similarity index 100%
rename from tests/functional/test_alpha_replay.py
rename to tests/functional/alpha/test_replay.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 9cb6325360f..a7f8c88a078 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -10,6 +10,7 @@ if get_option('tcg_interpreter')
endif
subdir('aarch64')
+subdir('alpha')
test_arm_timeouts = {
'arm_aspeed_palmetto' : 120,
@@ -96,15 +97,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_alpha_system_quick = [
- 'alpha_migration',
-]
-
-tests_alpha_system_thorough = [
- 'alpha_clipper',
- 'alpha_replay',
-]
-
tests_arm_system_quick = [
'arm_migration',
]
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 12/31] tests/functional: Move arm tests into architecture specific folder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (10 preceding siblings ...)
2025-08-27 7:54 ` [PULL 11/31] tests/functional: Move alpha " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 13/31] tests/functional: Move avr " Thomas Huth
` (19 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
arm tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-8-thuth@redhat.com>
---
MAINTAINERS | 38 ++++++------
tests/functional/arm/meson.build | 62 +++++++++++++++++++
.../test_aspeed_ast1030.py} | 0
.../test_aspeed_ast2500.py} | 0
.../test_aspeed_ast2600.py} | 0
.../test_aspeed_bletchley.py} | 0
.../test_aspeed_catalina.py} | 0
.../test_aspeed_gb200nvl_bmc.py} | 0
.../test_aspeed_palmetto.py} | 0
.../test_aspeed_rainier.py} | 0
.../test_aspeed_romulus.py} | 0
.../test_aspeed_witherspoon.py} | 0
.../{test_arm_bflt.py => arm/test_bflt.py} | 0
.../test_bpim2u.py} | 0
.../test_canona1100.py} | 0
.../test_collie.py} | 0
.../test_cubieboard.py} | 0
.../test_emcraft_sf2.py} | 0
.../test_integratorcp.py} | 0
.../test_max78000fthr.py} | 0
.../test_microbit.py} | 0
.../test_migration.py} | 0
.../test_orangepi.py} | 0
.../test_quanta_gsj.py} | 0
.../test_raspi2.py} | 0
.../test_realview.py} | 0
.../test_replay.py} | 0
.../test_smdkc210.py} | 0
.../test_stellaris.py} | 0
.../{test_arm_sx1.py => arm/test_sx1.py} | 0
.../test_tuxrun.py} | 0
.../test_vexpress.py} | 0
.../{test_arm_virt.py => arm/test_virt.py} | 0
tests/functional/meson.build | 62 +------------------
34 files changed, 83 insertions(+), 79 deletions(-)
create mode 100644 tests/functional/arm/meson.build
rename tests/functional/{test_arm_aspeed_ast1030.py => arm/test_aspeed_ast1030.py} (100%)
rename tests/functional/{test_arm_aspeed_ast2500.py => arm/test_aspeed_ast2500.py} (100%)
rename tests/functional/{test_arm_aspeed_ast2600.py => arm/test_aspeed_ast2600.py} (100%)
rename tests/functional/{test_arm_aspeed_bletchley.py => arm/test_aspeed_bletchley.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_aspeed_catalina.py => arm/test_aspeed_catalina.py} (100%)
rename tests/functional/{test_arm_aspeed_gb200nvl_bmc.py => arm/test_aspeed_gb200nvl_bmc.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_aspeed_palmetto.py => arm/test_aspeed_palmetto.py} (100%)
rename tests/functional/{test_arm_aspeed_rainier.py => arm/test_aspeed_rainier.py} (100%)
rename tests/functional/{test_arm_aspeed_romulus.py => arm/test_aspeed_romulus.py} (100%)
rename tests/functional/{test_arm_aspeed_witherspoon.py => arm/test_aspeed_witherspoon.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_bflt.py => arm/test_bflt.py} (100%)
rename tests/functional/{test_arm_bpim2u.py => arm/test_bpim2u.py} (100%)
rename tests/functional/{test_arm_canona1100.py => arm/test_canona1100.py} (100%)
rename tests/functional/{test_arm_collie.py => arm/test_collie.py} (100%)
rename tests/functional/{test_arm_cubieboard.py => arm/test_cubieboard.py} (100%)
rename tests/functional/{test_arm_emcraft_sf2.py => arm/test_emcraft_sf2.py} (100%)
rename tests/functional/{test_arm_integratorcp.py => arm/test_integratorcp.py} (100%)
rename tests/functional/{test_arm_max78000fthr.py => arm/test_max78000fthr.py} (100%)
rename tests/functional/{test_arm_microbit.py => arm/test_microbit.py} (100%)
rename tests/functional/{test_arm_migration.py => arm/test_migration.py} (100%)
rename tests/functional/{test_arm_orangepi.py => arm/test_orangepi.py} (100%)
rename tests/functional/{test_arm_quanta_gsj.py => arm/test_quanta_gsj.py} (100%)
rename tests/functional/{test_arm_raspi2.py => arm/test_raspi2.py} (100%)
rename tests/functional/{test_arm_realview.py => arm/test_realview.py} (100%)
rename tests/functional/{test_arm_replay.py => arm/test_replay.py} (100%)
rename tests/functional/{test_arm_smdkc210.py => arm/test_smdkc210.py} (100%)
rename tests/functional/{test_arm_stellaris.py => arm/test_stellaris.py} (100%)
rename tests/functional/{test_arm_sx1.py => arm/test_sx1.py} (100%)
rename tests/functional/{test_arm_tuxrun.py => arm/test_tuxrun.py} (100%)
rename tests/functional/{test_arm_vexpress.py => arm/test_vexpress.py} (100%)
rename tests/functional/{test_arm_virt.py => arm/test_virt.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 8115aae6183..1eb964feca4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -444,6 +444,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
L: qemu-arm@nongnu.org
S: Maintained
F: target/arm/kvm.c
+F: tests/functional/aarch64/test_kvm.py
MIPS KVM CPUs
M: Huacai Chen <chenhuacai@kernel.org>
@@ -673,7 +674,7 @@ F: include/hw/*/allwinner*
F: hw/arm/cubieboard.c
F: docs/system/arm/cubieboard.rst
F: hw/misc/axp209.c
-F: tests/functional/test_arm_cubieboard.py
+F: tests/functional/arm/test_cubieboard.py
Allwinner-h3
M: Niek Linnenbank <nieklinnenbank@gmail.com>
@@ -683,7 +684,7 @@ F: hw/*/allwinner-h3*
F: include/hw/*/allwinner-h3*
F: hw/arm/orangepi.c
F: docs/system/arm/orangepi.rst
-F: tests/functional/test_arm_orangepi.py
+F: tests/functional/arm/test_orangepi.py
ARM PrimeCell and CMSDK devices
M: Peter Maydell <peter.maydell@linaro.org>
@@ -753,7 +754,7 @@ F: docs/system/arm/bananapi_m2u.rst
F: hw/*/allwinner-r40*.c
F: hw/arm/bananapi_m2u.c
F: include/hw/*/allwinner-r40*.h
-F: tests/functional/test_arm_bpim2u.py
+F: tests/functional/arm/test_bpim2u.py
B-L475E-IOT01A IoT Node
M: Samuel Tardieu <sam@rfc1149.net>
@@ -771,7 +772,7 @@ S: Odd Fixes
F: hw/*/exynos*
F: include/hw/*/exynos*
F: docs/system/arm/exynos.rst
-F: tests/functional/test_arm_smdkc210.py
+F: tests/functional/arm/test_smdkc210.py
Calxeda Highbank
M: Rob Herring <robh@kernel.org>
@@ -790,7 +791,7 @@ S: Odd Fixes
F: include/hw/arm/digic.h
F: hw/*/digic*
F: include/hw/*/digic*
-F: tests/functional/test_arm_canona1100.py
+F: tests/functional/arm/test_canona1100.py
F: docs/system/arm/digic.rst
Goldfish RTC
@@ -833,7 +834,7 @@ S: Odd Fixes
F: hw/arm/integratorcp.c
F: hw/misc/arm_integrator_debug.c
F: include/hw/misc/arm_integrator_debug.h
-F: tests/functional/test_arm_integratorcp.py
+F: tests/functional/arm/test_integratorcp.py
F: docs/system/arm/integratorcp.rst
MCIMX6UL EVK / i.MX6ul
@@ -939,7 +940,7 @@ F: pc-bios/npcm7xx_bootrom.bin
F: pc-bios/npcm8xx_bootrom.bin
F: roms/vbootrom
F: docs/system/arm/nuvoton.rst
-F: tests/functional/test_arm_quanta_gsj.py
+F: tests/functional/arm/test_quanta_gsj.py
Raspberry Pi
M: Peter Maydell <peter.maydell@linaro.org>
@@ -952,7 +953,7 @@ F: hw/*/bcm283*
F: include/hw/arm/rasp*
F: include/hw/*/bcm283*
F: docs/system/arm/raspi.rst
-F: tests/functional/test_arm_raspi2.py
+F: tests/functional/arm/test_raspi2.py
F: tests/functional/aarch64/test_raspi*.py
Real View
@@ -964,7 +965,7 @@ F: hw/cpu/realview_mpcore.c
F: hw/intc/realview_gic.c
F: include/hw/intc/realview_gic.h
F: docs/system/arm/realview.rst
-F: tests/functional/test_arm_realview.py
+F: tests/functional/arm/test_realview.py
SABRELITE / i.MX6
M: Peter Maydell <peter.maydell@linaro.org>
@@ -1004,7 +1005,7 @@ F: hw/arm/strongarm*
F: hw/gpio/zaurus.c
F: include/hw/arm/sharpsl.h
F: docs/system/arm/collie.rst
-F: tests/functional/test_arm_collie.py
+F: tests/functional/arm/test_collie.py
Stellaris
M: Peter Maydell <peter.maydell@linaro.org>
@@ -1015,7 +1016,7 @@ F: hw/display/ssd03*
F: include/hw/input/stellaris_gamepad.h
F: include/hw/timer/stellaris-gptm.h
F: docs/system/arm/stellaris.rst
-F: tests/functional/test_arm_stellaris.py
+F: tests/functional/arm/test_stellaris.py
STM32L4x5 SoC Family
M: Samuel Tardieu <sam@rfc1149.net>
@@ -1044,7 +1045,7 @@ S: Odd Fixes
F: hw/arm/vexpress.c
F: hw/display/sii9022.c
F: docs/system/arm/vexpress.rst
-F: tests/functional/test_arm_vexpress.py
+F: tests/functional/arm/test_vexpress.py
Versatile PB
M: Peter Maydell <peter.maydell@linaro.org>
@@ -1065,8 +1066,8 @@ F: include/hw/arm/virt.h
F: docs/system/arm/virt.rst
F: tests/functional/aarch64/test_*virt*.py
F: tests/functional/aarch64/test_tuxrun.py
-F: tests/functional/test_arm_tuxrun.py
-F: tests/functional/test_arm_virt.py
+F: tests/functional/arm/test_tuxrun.py
+F: tests/functional/arm/test_virt.py
Xilinx Zynq
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
@@ -1187,7 +1188,7 @@ L: qemu-arm@nongnu.org
S: Maintained
F: hw/arm/msf2-som.c
F: docs/system/arm/emcraft-sf2.rst
-F: tests/functional/test_arm_emcraft_sf2.py
+F: tests/functional/arm/test_emcraft_sf2.py
ASPEED BMCs
M: Cédric Le Goater <clg@kaod.org>
@@ -1205,6 +1206,7 @@ F: hw/net/ftgmac100.c
F: include/hw/net/ftgmac100.h
F: docs/system/arm/aspeed.rst
F: docs/system/arm/fby35.rst
+F: tests/functional/*/*aspeed*
F: tests/*/*aspeed*
F: tests/*/*ast2700*
F: hw/arm/fby35.c
@@ -1220,7 +1222,7 @@ F: hw/*/microbit*.c
F: include/hw/*/nrf51*.h
F: include/hw/*/microbit*.h
F: tests/qtest/microbit-test.c
-F: tests/functional/test_arm_microbit.py
+F: tests/functional/arm/test_microbit.py
F: docs/system/arm/nrf.rst
ARM PL011 Rust device
@@ -2077,7 +2079,7 @@ S: Odd Fixes
F: hw/*/omap*
F: include/hw/arm/omap.h
F: docs/system/arm/sx1.rst
-F: tests/functional/test_arm_sx1.py
+F: tests/functional/arm/test_sx1.py
IPack
M: Alberto Garcia <berto@igalia.com>
@@ -3914,7 +3916,7 @@ F: configs/targets/*linux-user.mak
F: scripts/qemu-binfmt-conf.sh
F: scripts/update-syscalltbl.sh
F: scripts/update-mips-syscall-args.sh
-F: tests/functional/test_arm_bflt.py
+F: tests/functional/arm/test_bflt.py
Tiny Code Generator (TCG)
-------------------------
diff --git a/tests/functional/arm/meson.build b/tests/functional/arm/meson.build
new file mode 100644
index 00000000000..e4e7dba8d08
--- /dev/null
+++ b/tests/functional/arm/meson.build
@@ -0,0 +1,62 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_arm_timeouts = {
+ 'aspeed_palmetto' : 120,
+ 'aspeed_romulus' : 120,
+ 'aspeed_witherspoon' : 120,
+ 'aspeed_ast2500' : 720,
+ 'aspeed_ast2600' : 1200,
+ 'aspeed_bletchley' : 480,
+ 'aspeed_catalina' : 480,
+ 'aspeed_gb200nvl_bmc' : 480,
+ 'aspeed_rainier' : 480,
+ 'bpim2u' : 500,
+ 'collie' : 180,
+ 'cubieboard' : 360,
+ 'orangepi' : 540,
+ 'quanta_gsj' : 240,
+ 'raspi2' : 120,
+ 'replay' : 240,
+ 'tuxrun' : 240,
+ 'sx1' : 360,
+}
+
+tests_arm_system_quick = [
+ 'migration',
+]
+
+tests_arm_system_thorough = [
+ 'aspeed_ast1030',
+ 'aspeed_palmetto',
+ 'aspeed_romulus',
+ 'aspeed_witherspoon',
+ 'aspeed_ast2500',
+ 'aspeed_ast2600',
+ 'aspeed_bletchley',
+ 'aspeed_catalina',
+ 'aspeed_gb200nvl_bmc',
+ 'aspeed_rainier',
+ 'bpim2u',
+ 'canona1100',
+ 'collie',
+ 'cubieboard',
+ 'emcraft_sf2',
+ 'integratorcp',
+ 'max78000fthr',
+ 'microbit',
+ 'orangepi',
+ 'quanta_gsj',
+ 'raspi2',
+ 'realview',
+ 'replay',
+ 'smdkc210',
+ 'stellaris',
+ 'sx1',
+ 'vexpress',
+ 'virt',
+ 'tuxrun',
+]
+
+tests_arm_linuxuser_thorough = [
+ 'bflt',
+]
diff --git a/tests/functional/test_arm_aspeed_ast1030.py b/tests/functional/arm/test_aspeed_ast1030.py
similarity index 100%
rename from tests/functional/test_arm_aspeed_ast1030.py
rename to tests/functional/arm/test_aspeed_ast1030.py
diff --git a/tests/functional/test_arm_aspeed_ast2500.py b/tests/functional/arm/test_aspeed_ast2500.py
similarity index 100%
rename from tests/functional/test_arm_aspeed_ast2500.py
rename to tests/functional/arm/test_aspeed_ast2500.py
diff --git a/tests/functional/test_arm_aspeed_ast2600.py b/tests/functional/arm/test_aspeed_ast2600.py
similarity index 100%
rename from tests/functional/test_arm_aspeed_ast2600.py
rename to tests/functional/arm/test_aspeed_ast2600.py
diff --git a/tests/functional/test_arm_aspeed_bletchley.py b/tests/functional/arm/test_aspeed_bletchley.py
old mode 100644
new mode 100755
similarity index 100%
rename from tests/functional/test_arm_aspeed_bletchley.py
rename to tests/functional/arm/test_aspeed_bletchley.py
diff --git a/tests/functional/test_arm_aspeed_catalina.py b/tests/functional/arm/test_aspeed_catalina.py
similarity index 100%
rename from tests/functional/test_arm_aspeed_catalina.py
rename to tests/functional/arm/test_aspeed_catalina.py
diff --git a/tests/functional/test_arm_aspeed_gb200nvl_bmc.py b/tests/functional/arm/test_aspeed_gb200nvl_bmc.py
old mode 100644
new mode 100755
similarity index 100%
rename from tests/functional/test_arm_aspeed_gb200nvl_bmc.py
rename to tests/functional/arm/test_aspeed_gb200nvl_bmc.py
diff --git a/tests/functional/test_arm_aspeed_palmetto.py b/tests/functional/arm/test_aspeed_palmetto.py
similarity index 100%
rename from tests/functional/test_arm_aspeed_palmetto.py
rename to tests/functional/arm/test_aspeed_palmetto.py
diff --git a/tests/functional/test_arm_aspeed_rainier.py b/tests/functional/arm/test_aspeed_rainier.py
similarity index 100%
rename from tests/functional/test_arm_aspeed_rainier.py
rename to tests/functional/arm/test_aspeed_rainier.py
diff --git a/tests/functional/test_arm_aspeed_romulus.py b/tests/functional/arm/test_aspeed_romulus.py
similarity index 100%
rename from tests/functional/test_arm_aspeed_romulus.py
rename to tests/functional/arm/test_aspeed_romulus.py
diff --git a/tests/functional/test_arm_aspeed_witherspoon.py b/tests/functional/arm/test_aspeed_witherspoon.py
old mode 100644
new mode 100755
similarity index 100%
rename from tests/functional/test_arm_aspeed_witherspoon.py
rename to tests/functional/arm/test_aspeed_witherspoon.py
diff --git a/tests/functional/test_arm_bflt.py b/tests/functional/arm/test_bflt.py
similarity index 100%
rename from tests/functional/test_arm_bflt.py
rename to tests/functional/arm/test_bflt.py
diff --git a/tests/functional/test_arm_bpim2u.py b/tests/functional/arm/test_bpim2u.py
similarity index 100%
rename from tests/functional/test_arm_bpim2u.py
rename to tests/functional/arm/test_bpim2u.py
diff --git a/tests/functional/test_arm_canona1100.py b/tests/functional/arm/test_canona1100.py
similarity index 100%
rename from tests/functional/test_arm_canona1100.py
rename to tests/functional/arm/test_canona1100.py
diff --git a/tests/functional/test_arm_collie.py b/tests/functional/arm/test_collie.py
similarity index 100%
rename from tests/functional/test_arm_collie.py
rename to tests/functional/arm/test_collie.py
diff --git a/tests/functional/test_arm_cubieboard.py b/tests/functional/arm/test_cubieboard.py
similarity index 100%
rename from tests/functional/test_arm_cubieboard.py
rename to tests/functional/arm/test_cubieboard.py
diff --git a/tests/functional/test_arm_emcraft_sf2.py b/tests/functional/arm/test_emcraft_sf2.py
similarity index 100%
rename from tests/functional/test_arm_emcraft_sf2.py
rename to tests/functional/arm/test_emcraft_sf2.py
diff --git a/tests/functional/test_arm_integratorcp.py b/tests/functional/arm/test_integratorcp.py
similarity index 100%
rename from tests/functional/test_arm_integratorcp.py
rename to tests/functional/arm/test_integratorcp.py
diff --git a/tests/functional/test_arm_max78000fthr.py b/tests/functional/arm/test_max78000fthr.py
similarity index 100%
rename from tests/functional/test_arm_max78000fthr.py
rename to tests/functional/arm/test_max78000fthr.py
diff --git a/tests/functional/test_arm_microbit.py b/tests/functional/arm/test_microbit.py
similarity index 100%
rename from tests/functional/test_arm_microbit.py
rename to tests/functional/arm/test_microbit.py
diff --git a/tests/functional/test_arm_migration.py b/tests/functional/arm/test_migration.py
similarity index 100%
rename from tests/functional/test_arm_migration.py
rename to tests/functional/arm/test_migration.py
diff --git a/tests/functional/test_arm_orangepi.py b/tests/functional/arm/test_orangepi.py
similarity index 100%
rename from tests/functional/test_arm_orangepi.py
rename to tests/functional/arm/test_orangepi.py
diff --git a/tests/functional/test_arm_quanta_gsj.py b/tests/functional/arm/test_quanta_gsj.py
similarity index 100%
rename from tests/functional/test_arm_quanta_gsj.py
rename to tests/functional/arm/test_quanta_gsj.py
diff --git a/tests/functional/test_arm_raspi2.py b/tests/functional/arm/test_raspi2.py
similarity index 100%
rename from tests/functional/test_arm_raspi2.py
rename to tests/functional/arm/test_raspi2.py
diff --git a/tests/functional/test_arm_realview.py b/tests/functional/arm/test_realview.py
similarity index 100%
rename from tests/functional/test_arm_realview.py
rename to tests/functional/arm/test_realview.py
diff --git a/tests/functional/test_arm_replay.py b/tests/functional/arm/test_replay.py
similarity index 100%
rename from tests/functional/test_arm_replay.py
rename to tests/functional/arm/test_replay.py
diff --git a/tests/functional/test_arm_smdkc210.py b/tests/functional/arm/test_smdkc210.py
similarity index 100%
rename from tests/functional/test_arm_smdkc210.py
rename to tests/functional/arm/test_smdkc210.py
diff --git a/tests/functional/test_arm_stellaris.py b/tests/functional/arm/test_stellaris.py
similarity index 100%
rename from tests/functional/test_arm_stellaris.py
rename to tests/functional/arm/test_stellaris.py
diff --git a/tests/functional/test_arm_sx1.py b/tests/functional/arm/test_sx1.py
similarity index 100%
rename from tests/functional/test_arm_sx1.py
rename to tests/functional/arm/test_sx1.py
diff --git a/tests/functional/test_arm_tuxrun.py b/tests/functional/arm/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_arm_tuxrun.py
rename to tests/functional/arm/test_tuxrun.py
diff --git a/tests/functional/test_arm_vexpress.py b/tests/functional/arm/test_vexpress.py
similarity index 100%
rename from tests/functional/test_arm_vexpress.py
rename to tests/functional/arm/test_vexpress.py
diff --git a/tests/functional/test_arm_virt.py b/tests/functional/arm/test_virt.py
similarity index 100%
rename from tests/functional/test_arm_virt.py
rename to tests/functional/arm/test_virt.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index a7f8c88a078..6989446d1c4 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -11,27 +11,7 @@ endif
subdir('aarch64')
subdir('alpha')
-
-test_arm_timeouts = {
- 'arm_aspeed_palmetto' : 120,
- 'arm_aspeed_romulus' : 120,
- 'arm_aspeed_witherspoon' : 120,
- 'arm_aspeed_ast2500' : 720,
- 'arm_aspeed_ast2600' : 1200,
- 'arm_aspeed_bletchley' : 480,
- 'arm_aspeed_catalina' : 480,
- 'arm_aspeed_gb200nvl_bmc' : 480,
- 'arm_aspeed_rainier' : 480,
- 'arm_bpim2u' : 500,
- 'arm_collie' : 180,
- 'arm_cubieboard' : 360,
- 'arm_orangepi' : 540,
- 'arm_quanta_gsj' : 240,
- 'arm_raspi2' : 120,
- 'arm_replay' : 240,
- 'arm_tuxrun' : 240,
- 'arm_sx1' : 360,
-}
+subdir('arm')
test_mips_timeouts = {
'mips_malta' : 480,
@@ -97,46 +77,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_arm_system_quick = [
- 'arm_migration',
-]
-
-tests_arm_system_thorough = [
- 'arm_aspeed_ast1030',
- 'arm_aspeed_palmetto',
- 'arm_aspeed_romulus',
- 'arm_aspeed_witherspoon',
- 'arm_aspeed_ast2500',
- 'arm_aspeed_ast2600',
- 'arm_aspeed_bletchley',
- 'arm_aspeed_catalina',
- 'arm_aspeed_gb200nvl_bmc',
- 'arm_aspeed_rainier',
- 'arm_bpim2u',
- 'arm_canona1100',
- 'arm_collie',
- 'arm_cubieboard',
- 'arm_emcraft_sf2',
- 'arm_integratorcp',
- 'arm_max78000fthr',
- 'arm_microbit',
- 'arm_orangepi',
- 'arm_quanta_gsj',
- 'arm_raspi2',
- 'arm_realview',
- 'arm_replay',
- 'arm_smdkc210',
- 'arm_stellaris',
- 'arm_sx1',
- 'arm_vexpress',
- 'arm_virt',
- 'arm_tuxrun',
-]
-
-tests_arm_linuxuser_thorough = [
- 'arm_bflt',
-]
-
tests_avr_system_thorough = [
'avr_mega2560',
'avr_uno',
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 13/31] tests/functional: Move avr tests into architecture specific folder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (11 preceding siblings ...)
2025-08-27 7:54 ` [PULL 12/31] tests/functional: Move arm " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 14/31] tests/functional: Move hppa " Thomas Huth
` (18 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
avr tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-9-thuth@redhat.com>
---
MAINTAINERS | 4 ++--
tests/functional/avr/meson.build | 6 ++++++
.../{test_avr_mega2560.py => avr/test_mega2560.py} | 0
tests/functional/{test_avr_uno.py => avr/test_uno.py} | 0
tests/functional/meson.build | 6 +-----
5 files changed, 9 insertions(+), 7 deletions(-)
create mode 100644 tests/functional/avr/meson.build
rename tests/functional/{test_avr_mega2560.py => avr/test_mega2560.py} (100%)
rename tests/functional/{test_avr_uno.py => avr/test_uno.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1eb964feca4..d01afcbea6d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -221,7 +221,7 @@ S: Maintained
F: docs/system/target-avr.rst
F: gdb-xml/avr-cpu.xml
F: target/avr/
-F: tests/functional/test_avr_*.py
+F: tests/functional/avr/
Hexagon TCG CPUs
M: Brian Cain <brian.cain@oss.qualcomm.com>
@@ -1249,7 +1249,7 @@ Arduino
M: Philippe Mathieu-Daudé <philmd@linaro.org>
S: Maintained
F: hw/avr/arduino.c
-F: tests/functional/test_avr_uno.py
+F: tests/functional/avr/test_uno.py
HP-PARISC Machines
------------------
diff --git a/tests/functional/avr/meson.build b/tests/functional/avr/meson.build
new file mode 100644
index 00000000000..7a2cb7099e7
--- /dev/null
+++ b/tests/functional/avr/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_avr_system_thorough = [
+ 'mega2560',
+ 'uno',
+]
diff --git a/tests/functional/test_avr_mega2560.py b/tests/functional/avr/test_mega2560.py
similarity index 100%
rename from tests/functional/test_avr_mega2560.py
rename to tests/functional/avr/test_mega2560.py
diff --git a/tests/functional/test_avr_uno.py b/tests/functional/avr/test_uno.py
similarity index 100%
rename from tests/functional/test_avr_uno.py
rename to tests/functional/avr/test_uno.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 6989446d1c4..81eaa9c218c 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -12,6 +12,7 @@ endif
subdir('aarch64')
subdir('alpha')
subdir('arm')
+subdir('avr')
test_mips_timeouts = {
'mips_malta' : 480,
@@ -77,11 +78,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_avr_system_thorough = [
- 'avr_mega2560',
- 'avr_uno',
-]
-
tests_hppa_system_quick = [
'hppa_seabios',
]
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 14/31] tests/functional: Move hppa tests into architecture specific folder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (12 preceding siblings ...)
2025-08-27 7:54 ` [PULL 13/31] tests/functional: Move avr " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 15/31] tests/functional: Move i386 " Thomas Huth
` (17 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
avr tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-10-thuth@redhat.com>
---
MAINTAINERS | 2 +-
tests/functional/hppa/meson.build | 5 +++++
.../{test_hppa_seabios.py => hppa/test_seabios.py} | 0
tests/functional/meson.build | 5 +----
4 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 tests/functional/hppa/meson.build
rename tests/functional/{test_hppa_seabios.py => hppa/test_seabios.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index d01afcbea6d..2e1754912f6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1273,7 +1273,7 @@ F: include/hw/pci-host/astro.h
F: include/hw/pci-host/dino.h
F: pc-bios/hppa-firmware.img
F: roms/seabios-hppa/
-F: tests/functional/test_hppa_seabios.py
+F: tests/functional/hppa/test_seabios.py
LoongArch Machines
------------------
diff --git a/tests/functional/hppa/meson.build b/tests/functional/hppa/meson.build
new file mode 100644
index 00000000000..a3348370884
--- /dev/null
+++ b/tests/functional/hppa/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_hppa_system_quick = [
+ 'seabios',
+]
diff --git a/tests/functional/test_hppa_seabios.py b/tests/functional/hppa/test_seabios.py
similarity index 100%
rename from tests/functional/test_hppa_seabios.py
rename to tests/functional/hppa/test_seabios.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 81eaa9c218c..8f85c13d3d1 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -13,6 +13,7 @@ subdir('aarch64')
subdir('alpha')
subdir('arm')
subdir('avr')
+subdir('hppa')
test_mips_timeouts = {
'mips_malta' : 480,
@@ -78,10 +79,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_hppa_system_quick = [
- 'hppa_seabios',
-]
-
tests_i386_system_quick = [
'i386_migration',
]
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 15/31] tests/functional: Move i386 tests into architecture specific folder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (13 preceding siblings ...)
2025-08-27 7:54 ` [PULL 14/31] tests/functional: Move hppa " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 16/31] tests/functional: Move loongarch64 " Thomas Huth
` (16 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
i386 tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-11-thuth@redhat.com>
---
MAINTAINERS | 3 ++-
tests/functional/i386/meson.build | 10 ++++++++++
.../{test_i386_migration.py => i386/test_migration.py} | 0
.../{test_i386_replay.py => i386/test_replay.py} | 0
.../{test_i386_tuxrun.py => i386/test_tuxrun.py} | 0
tests/functional/meson.build | 10 +---------
6 files changed, 13 insertions(+), 10 deletions(-)
create mode 100644 tests/functional/i386/meson.build
rename tests/functional/{test_i386_migration.py => i386/test_migration.py} (100%)
rename tests/functional/{test_i386_replay.py => i386/test_replay.py} (100%)
rename tests/functional/{test_i386_tuxrun.py => i386/test_tuxrun.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2e1754912f6..2b109ecc18c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -146,6 +146,7 @@ F: target/i386/*.[ch]
F: target/i386/Kconfig
F: target/i386/meson.build
F: tools/i386/
+F: tests/functional/i386/
Guest CPU cores (TCG)
---------------------
@@ -1891,7 +1892,7 @@ F: hw/isa/apm.c
F: include/hw/isa/apm.h
F: tests/unit/test-x86-topo.c
F: tests/qtest/test-x86-cpuid-compat.c
-F: tests/functional/test_i386_tuxrun.py
+F: tests/functional/i386/test_tuxrun.py
F: tests/functional/test_linux_initrd.py
F: tests/functional/test_mem_addr_space.py
F: tests/functional/test_pc_cpu_hotplug_props.py
diff --git a/tests/functional/i386/meson.build b/tests/functional/i386/meson.build
new file mode 100644
index 00000000000..23d8c216be7
--- /dev/null
+++ b/tests/functional/i386/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_i386_system_quick = [
+ 'migration',
+]
+
+tests_i386_system_thorough = [
+ 'replay',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_i386_migration.py b/tests/functional/i386/test_migration.py
similarity index 100%
rename from tests/functional/test_i386_migration.py
rename to tests/functional/i386/test_migration.py
diff --git a/tests/functional/test_i386_replay.py b/tests/functional/i386/test_replay.py
similarity index 100%
rename from tests/functional/test_i386_replay.py
rename to tests/functional/i386/test_replay.py
diff --git a/tests/functional/test_i386_tuxrun.py b/tests/functional/i386/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_i386_tuxrun.py
rename to tests/functional/i386/test_tuxrun.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 8f85c13d3d1..f1fc01717c3 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -14,6 +14,7 @@ subdir('alpha')
subdir('arm')
subdir('avr')
subdir('hppa')
+subdir('i386')
test_mips_timeouts = {
'mips_malta' : 480,
@@ -79,15 +80,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_i386_system_quick = [
- 'i386_migration',
-]
-
-tests_i386_system_thorough = [
- 'i386_replay',
- 'i386_tuxrun',
-]
-
tests_loongarch64_system_thorough = [
'loongarch64_virt',
]
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 16/31] tests/functional: Move loongarch64 tests into architecture specific folder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (14 preceding siblings ...)
2025-08-27 7:54 ` [PULL 15/31] tests/functional: Move i386 " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 17/31] tests/functional: Move m68k " Thomas Huth
` (15 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
loongarch64 tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-12-thuth@redhat.com>
---
MAINTAINERS | 2 +-
tests/functional/loongarch64/meson.build | 5 +++++
.../{test_loongarch64_virt.py => loongarch64/test_virt.py} | 0
tests/functional/meson.build | 5 +----
4 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 tests/functional/loongarch64/meson.build
rename tests/functional/{test_loongarch64_virt.py => loongarch64/test_virt.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2b109ecc18c..716127e831d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -258,7 +258,7 @@ M: Song Gao <gaosong@loongson.cn>
S: Maintained
F: target/loongarch/
F: tests/tcg/loongarch64/
-F: tests/functional/test_loongarch64_virt.py
+F: tests/functional/loongarch64/test_virt.py
M68K TCG CPUs
M: Laurent Vivier <laurent@vivier.eu>
diff --git a/tests/functional/loongarch64/meson.build b/tests/functional/loongarch64/meson.build
new file mode 100644
index 00000000000..d1687176a3d
--- /dev/null
+++ b/tests/functional/loongarch64/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_loongarch64_system_thorough = [
+ 'virt',
+]
diff --git a/tests/functional/test_loongarch64_virt.py b/tests/functional/loongarch64/test_virt.py
similarity index 100%
rename from tests/functional/test_loongarch64_virt.py
rename to tests/functional/loongarch64/test_virt.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index f1fc01717c3..e2e66dcf523 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -15,6 +15,7 @@ subdir('arm')
subdir('avr')
subdir('hppa')
subdir('i386')
+subdir('loongarch64')
test_mips_timeouts = {
'mips_malta' : 480,
@@ -80,10 +81,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_loongarch64_system_thorough = [
- 'loongarch64_virt',
-]
-
tests_m68k_system_thorough = [
'm68k_mcf5208evb',
'm68k_nextcube',
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 17/31] tests/functional: Move m68k tests into architecture specific folder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (15 preceding siblings ...)
2025-08-27 7:54 ` [PULL 16/31] tests/functional: Move loongarch64 " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 18/31] tests/functional: Move microblaze " Thomas Huth
` (14 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
m68k tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-13-thuth@redhat.com>
---
MAINTAINERS | 8 ++++----
tests/functional/m68k/meson.build | 9 +++++++++
.../{test_m68k_mcf5208evb.py => m68k/test_mcf5208evb.py} | 0
.../{test_m68k_nextcube.py => m68k/test_nextcube.py} | 0
.../functional/{test_m68k_q800.py => m68k/test_q800.py} | 0
.../{test_m68k_replay.py => m68k/test_replay.py} | 0
.../{test_m68k_tuxrun.py => m68k/test_tuxrun.py} | 0
tests/functional/meson.build | 9 +--------
8 files changed, 14 insertions(+), 12 deletions(-)
create mode 100644 tests/functional/m68k/meson.build
rename tests/functional/{test_m68k_mcf5208evb.py => m68k/test_mcf5208evb.py} (100%)
rename tests/functional/{test_m68k_nextcube.py => m68k/test_nextcube.py} (100%)
rename tests/functional/{test_m68k_q800.py => m68k/test_q800.py} (100%)
rename tests/functional/{test_m68k_replay.py => m68k/test_replay.py} (100%)
rename tests/functional/{test_m68k_tuxrun.py => m68k/test_tuxrun.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 716127e831d..e188de813fb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1312,7 +1312,7 @@ F: hw/m68k/mcf_intc.c
F: hw/char/mcf_uart.c
F: hw/net/mcf_fec.c
F: include/hw/m68k/mcf*.h
-F: tests/functional/test_m68k_mcf5208evb.py
+F: tests/functional/m68k/test_mcf5208evb.py
NeXTcube
M: Thomas Huth <huth@tuxfamily.org>
@@ -1320,7 +1320,7 @@ S: Odd Fixes
F: hw/m68k/next-*.c
F: hw/display/next-fb.c
F: include/hw/m68k/next-cube.h
-F: tests/functional/test_m68k_nextcube.py
+F: tests/functional/m68k/test_nextcube.py
q800
M: Laurent Vivier <laurent@vivier.eu>
@@ -1346,7 +1346,7 @@ F: include/hw/m68k/q800-glue.h
F: include/hw/misc/djmemc.h
F: include/hw/misc/iosb.h
F: include/hw/audio/asc.h
-F: tests/functional/test_m68k_q800.py
+F: tests/functional/m68k/test_q800.py
virt
M: Laurent Vivier <laurent@vivier.eu>
@@ -1361,7 +1361,7 @@ F: include/hw/intc/goldfish_pic.h
F: include/hw/intc/m68k_irqc.h
F: include/hw/misc/virt_ctrl.h
F: docs/specs/virt-ctlr.rst
-F: tests/functional/test_m68k_tuxrun.py
+F: tests/functional/m68k/test_tuxrun.py
MicroBlaze Machines
-------------------
diff --git a/tests/functional/m68k/meson.build b/tests/functional/m68k/meson.build
new file mode 100644
index 00000000000..e29044a6d73
--- /dev/null
+++ b/tests/functional/m68k/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_m68k_system_thorough = [
+ 'mcf5208evb',
+ 'nextcube',
+ 'replay',
+ 'q800',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_m68k_mcf5208evb.py b/tests/functional/m68k/test_mcf5208evb.py
similarity index 100%
rename from tests/functional/test_m68k_mcf5208evb.py
rename to tests/functional/m68k/test_mcf5208evb.py
diff --git a/tests/functional/test_m68k_nextcube.py b/tests/functional/m68k/test_nextcube.py
similarity index 100%
rename from tests/functional/test_m68k_nextcube.py
rename to tests/functional/m68k/test_nextcube.py
diff --git a/tests/functional/test_m68k_q800.py b/tests/functional/m68k/test_q800.py
similarity index 100%
rename from tests/functional/test_m68k_q800.py
rename to tests/functional/m68k/test_q800.py
diff --git a/tests/functional/test_m68k_replay.py b/tests/functional/m68k/test_replay.py
similarity index 100%
rename from tests/functional/test_m68k_replay.py
rename to tests/functional/m68k/test_replay.py
diff --git a/tests/functional/test_m68k_tuxrun.py b/tests/functional/m68k/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_m68k_tuxrun.py
rename to tests/functional/m68k/test_tuxrun.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index e2e66dcf523..d32dd4a371f 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -16,6 +16,7 @@ subdir('avr')
subdir('hppa')
subdir('i386')
subdir('loongarch64')
+subdir('m68k')
test_mips_timeouts = {
'mips_malta' : 480,
@@ -81,14 +82,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_m68k_system_thorough = [
- 'm68k_mcf5208evb',
- 'm68k_nextcube',
- 'm68k_replay',
- 'm68k_q800',
- 'm68k_tuxrun',
-]
-
tests_microblaze_system_thorough = [
'microblaze_replay',
'microblaze_s3adsp1800'
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 18/31] tests/functional: Move microblaze tests into architecture specific folder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (16 preceding siblings ...)
2025-08-27 7:54 ` [PULL 17/31] tests/functional: Move m68k " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 19/31] tests/functional: Move mips tests into target-specific folders Thomas Huth
` (13 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
microblaze tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-14-thuth@redhat.com>
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 11 ++---------
tests/functional/microblaze/meson.build | 6 ++++++
.../test_replay.py} | 0
.../test_s3adsp1800.py} | 0
tests/functional/microblazeel/meson.build | 5 +++++
.../test_s3adsp1800.py} | 2 +-
7 files changed, 15 insertions(+), 11 deletions(-)
create mode 100644 tests/functional/microblaze/meson.build
rename tests/functional/{test_microblaze_replay.py => microblaze/test_replay.py} (100%)
rename tests/functional/{test_microblaze_s3adsp1800.py => microblaze/test_s3adsp1800.py} (100%)
create mode 100644 tests/functional/microblazeel/meson.build
rename tests/functional/{test_microblazeel_s3adsp1800.py => microblazeel/test_s3adsp1800.py} (92%)
diff --git a/MAINTAINERS b/MAINTAINERS
index e188de813fb..b6a835777bb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1370,7 +1370,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
S: Maintained
F: hw/microblaze/petalogix_s3adsp1800_mmu.c
F: include/hw/char/xilinx_uartlite.h
-F: tests/functional/test_microblaze*.py
+F: tests/functional/microblaze*/test_s3adsp1800.py
petalogix_ml605
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index d32dd4a371f..fee68056145 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -17,6 +17,8 @@ subdir('hppa')
subdir('i386')
subdir('loongarch64')
subdir('m68k')
+subdir('microblaze')
+subdir('microblazeel')
test_mips_timeouts = {
'mips_malta' : 480,
@@ -82,15 +84,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_microblaze_system_thorough = [
- 'microblaze_replay',
- 'microblaze_s3adsp1800'
-]
-
-tests_microblazeel_system_thorough = [
- 'microblazeel_s3adsp1800'
-]
-
tests_mips_system_thorough = [
'mips_malta',
'mips_replay',
diff --git a/tests/functional/microblaze/meson.build b/tests/functional/microblaze/meson.build
new file mode 100644
index 00000000000..8069ca9be60
--- /dev/null
+++ b/tests/functional/microblaze/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_microblaze_system_thorough = [
+ 'replay',
+ 's3adsp1800'
+]
diff --git a/tests/functional/test_microblaze_replay.py b/tests/functional/microblaze/test_replay.py
similarity index 100%
rename from tests/functional/test_microblaze_replay.py
rename to tests/functional/microblaze/test_replay.py
diff --git a/tests/functional/test_microblaze_s3adsp1800.py b/tests/functional/microblaze/test_s3adsp1800.py
similarity index 100%
rename from tests/functional/test_microblaze_s3adsp1800.py
rename to tests/functional/microblaze/test_s3adsp1800.py
diff --git a/tests/functional/microblazeel/meson.build b/tests/functional/microblazeel/meson.build
new file mode 100644
index 00000000000..27619dc5a9a
--- /dev/null
+++ b/tests/functional/microblazeel/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_microblazeel_system_thorough = [
+ 's3adsp1800'
+]
diff --git a/tests/functional/test_microblazeel_s3adsp1800.py b/tests/functional/microblazeel/test_s3adsp1800.py
similarity index 92%
rename from tests/functional/test_microblazeel_s3adsp1800.py
rename to tests/functional/microblazeel/test_s3adsp1800.py
index 915902d48bd..75ce8856ed1 100755
--- a/tests/functional/test_microblazeel_s3adsp1800.py
+++ b/tests/functional/microblazeel/test_s3adsp1800.py
@@ -7,7 +7,7 @@
# This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory.
-from test_microblaze_s3adsp1800 import MicroblazeMachine
+from microblaze.test_s3adsp1800 import MicroblazeMachine
class MicroblazeLittleEndianMachine(MicroblazeMachine):
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 19/31] tests/functional: Move mips tests into target-specific folders
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (17 preceding siblings ...)
2025-08-27 7:54 ` [PULL 18/31] tests/functional: Move microblaze " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 20/31] tests/functional: Move or1k " Thomas Huth
` (12 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
mips tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-15-thuth@redhat.com>
---
MAINTAINERS | 8 ++--
tests/functional/meson.build | 47 ++-----------------
tests/functional/mips/meson.build | 11 +++++
.../test_malta.py} | 0
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
tests/functional/mips64/meson.build | 10 ++++
.../test_malta.py} | 2 +-
.../test_tuxrun.py} | 0
tests/functional/mips64el/meson.build | 14 ++++++
.../test_fuloong2e.py} | 0
.../test_loongson3v.py} | 0
.../test_malta.py} | 4 +-
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
tests/functional/mipsel/meson.build | 12 +++++
.../test_malta.py} | 2 +-
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
19 files changed, 59 insertions(+), 51 deletions(-)
create mode 100644 tests/functional/mips/meson.build
rename tests/functional/{test_mips_malta.py => mips/test_malta.py} (100%)
rename tests/functional/{test_mips_replay.py => mips/test_replay.py} (100%)
rename tests/functional/{test_mips_tuxrun.py => mips/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mips64/meson.build
rename tests/functional/{test_mips64_malta.py => mips64/test_malta.py} (96%)
rename tests/functional/{test_mips64_tuxrun.py => mips64/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mips64el/meson.build
rename tests/functional/{test_mips64el_fuloong2e.py => mips64el/test_fuloong2e.py} (100%)
rename tests/functional/{test_mips64el_loongson3v.py => mips64el/test_loongson3v.py} (100%)
rename tests/functional/{test_mips64el_malta.py => mips64el/test_malta.py} (98%)
rename tests/functional/{test_mips64el_replay.py => mips64el/test_replay.py} (100%)
rename tests/functional/{test_mips64el_tuxrun.py => mips64el/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mipsel/meson.build
rename tests/functional/{test_mipsel_malta.py => mipsel/test_malta.py} (98%)
rename tests/functional/{test_mipsel_replay.py => mipsel/test_replay.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_mipsel_tuxrun.py => mipsel/test_tuxrun.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index b6a835777bb..b8f0ce33605 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1406,8 +1406,8 @@ F: hw/acpi/piix4.c
F: hw/mips/malta.c
F: hw/pci-host/gt64120.c
F: include/hw/southbridge/piix.h
-F: tests/functional/test_mips*_malta.py
-F: tests/functional/test_mips*_tuxrun.py
+F: tests/functional/mips*/test_malta.py
+F: tests/functional/mips*/test_tuxrun.py
Mipssim
R: Aleksandar Rikalo <arikalo@gmail.com>
@@ -1423,7 +1423,7 @@ S: Odd Fixes
F: hw/mips/fuloong2e.c
F: hw/pci-host/bonito.c
F: include/hw/pci-host/bonito.h
-F: tests/functional/test_mips64el_fuloong2e.py
+F: tests/functional/mips64el/test_fuloong2e.py
Loongson-3 virtual platforms
M: Huacai Chen <chenhuacai@kernel.org>
@@ -1438,7 +1438,7 @@ F: hw/mips/loongson3_virt.c
F: include/hw/intc/loongson_ipi_common.h
F: include/hw/intc/loongson_ipi.h
F: include/hw/intc/loongson_liointc.h
-F: tests/functional/test_mips64el_loongson3v.py
+F: tests/functional/mips64el/test_loongson3v.py
Boston
M: Paul Burton <paulburton@kernel.org>
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index fee68056145..52969a3ff87 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -19,24 +19,10 @@ subdir('loongarch64')
subdir('m68k')
subdir('microblaze')
subdir('microblazeel')
-
-test_mips_timeouts = {
- 'mips_malta' : 480,
-}
-
-test_mipsel_timeouts = {
- 'mipsel_malta' : 420,
- 'mipsel_replay' : 480,
-}
-
-test_mips64_timeouts = {
- 'mips64_malta' : 240,
-}
-
-test_mips64el_timeouts = {
- 'mips64el_malta' : 420,
- 'mips64el_replay' : 180,
-}
+subdir('mips')
+subdir('mipsel')
+subdir('mips64')
+subdir('mips64el')
test_ppc_timeouts = {
'ppc_40p' : 240,
@@ -84,31 +70,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_mips_system_thorough = [
- 'mips_malta',
- 'mips_replay',
- 'mips_tuxrun',
-]
-
-tests_mipsel_system_thorough = [
- 'mipsel_malta',
- 'mipsel_replay',
- 'mipsel_tuxrun',
-]
-
-tests_mips64_system_thorough = [
- 'mips64_malta',
- 'mips64_tuxrun',
-]
-
-tests_mips64el_system_thorough = [
- 'mips64el_fuloong2e',
- 'mips64el_loongson3v',
- 'mips64el_malta',
- 'mips64el_replay',
- 'mips64el_tuxrun',
-]
-
tests_or1k_system_thorough = [
'or1k_replay',
'or1k_sim',
diff --git a/tests/functional/mips/meson.build b/tests/functional/mips/meson.build
new file mode 100644
index 00000000000..49aaf53b02d
--- /dev/null
+++ b/tests/functional/mips/meson.build
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_mips_timeouts = {
+ 'malta' : 480,
+}
+
+tests_mips_system_thorough = [
+ 'malta',
+ 'replay',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_mips_malta.py b/tests/functional/mips/test_malta.py
similarity index 100%
rename from tests/functional/test_mips_malta.py
rename to tests/functional/mips/test_malta.py
diff --git a/tests/functional/test_mips_replay.py b/tests/functional/mips/test_replay.py
similarity index 100%
rename from tests/functional/test_mips_replay.py
rename to tests/functional/mips/test_replay.py
diff --git a/tests/functional/test_mips_tuxrun.py b/tests/functional/mips/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_mips_tuxrun.py
rename to tests/functional/mips/test_tuxrun.py
diff --git a/tests/functional/mips64/meson.build b/tests/functional/mips64/meson.build
new file mode 100644
index 00000000000..3ff21189879
--- /dev/null
+++ b/tests/functional/mips64/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_mips64_timeouts = {
+ 'malta' : 240,
+}
+
+tests_mips64_system_thorough = [
+ 'malta',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_mips64_malta.py b/tests/functional/mips64/test_malta.py
similarity index 96%
rename from tests/functional/test_mips64_malta.py
rename to tests/functional/mips64/test_malta.py
index 53c3e0c1221..a553d3c5bc7 100755
--- a/tests/functional/test_mips64_malta.py
+++ b/tests/functional/mips64/test_malta.py
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
from qemu_test import LinuxKernelTest, Asset
-from test_mips_malta import mips_check_wheezy
+from mips.test_malta import mips_check_wheezy
class MaltaMachineConsole(LinuxKernelTest):
diff --git a/tests/functional/test_mips64_tuxrun.py b/tests/functional/mips64/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_mips64_tuxrun.py
rename to tests/functional/mips64/test_tuxrun.py
diff --git a/tests/functional/mips64el/meson.build b/tests/functional/mips64el/meson.build
new file mode 100644
index 00000000000..69ec50174c4
--- /dev/null
+++ b/tests/functional/mips64el/meson.build
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_mips64el_timeouts = {
+ 'malta' : 420,
+ 'replay' : 180,
+}
+
+tests_mips64el_system_thorough = [
+ 'fuloong2e',
+ 'loongson3v',
+ 'malta',
+ 'replay',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_mips64el_fuloong2e.py b/tests/functional/mips64el/test_fuloong2e.py
similarity index 100%
rename from tests/functional/test_mips64el_fuloong2e.py
rename to tests/functional/mips64el/test_fuloong2e.py
diff --git a/tests/functional/test_mips64el_loongson3v.py b/tests/functional/mips64el/test_loongson3v.py
similarity index 100%
rename from tests/functional/test_mips64el_loongson3v.py
rename to tests/functional/mips64el/test_loongson3v.py
diff --git a/tests/functional/test_mips64el_malta.py b/tests/functional/mips64el/test_malta.py
similarity index 98%
rename from tests/functional/test_mips64el_malta.py
rename to tests/functional/mips64el/test_malta.py
index 3cc79b74c18..8fdc49b3005 100755
--- a/tests/functional/test_mips64el_malta.py
+++ b/tests/functional/mips64el/test_malta.py
@@ -16,7 +16,7 @@
from qemu_test import exec_command_and_wait_for_pattern
from qemu_test import skipIfMissingImports, skipFlakyTest, skipUntrustedTest
-from test_mips_malta import mips_check_wheezy
+from mips.test_malta import mips_check_wheezy
class MaltaMachineConsole(LinuxKernelTest):
@@ -191,7 +191,7 @@ def test_mips_malta_i6400_framebuffer_logo_8cores(self):
self.do_test_i6400_framebuffer_logo(8)
-from test_mipsel_malta import MaltaMachineYAMON
+from mipsel.test_malta import MaltaMachineYAMON
if __name__ == '__main__':
LinuxKernelTest.main()
diff --git a/tests/functional/test_mips64el_replay.py b/tests/functional/mips64el/test_replay.py
similarity index 100%
rename from tests/functional/test_mips64el_replay.py
rename to tests/functional/mips64el/test_replay.py
diff --git a/tests/functional/test_mips64el_tuxrun.py b/tests/functional/mips64el/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_mips64el_tuxrun.py
rename to tests/functional/mips64el/test_tuxrun.py
diff --git a/tests/functional/mipsel/meson.build b/tests/functional/mipsel/meson.build
new file mode 100644
index 00000000000..8bfdf0649b5
--- /dev/null
+++ b/tests/functional/mipsel/meson.build
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_mipsel_timeouts = {
+ 'malta' : 420,
+ 'replay' : 480,
+}
+
+tests_mipsel_system_thorough = [
+ 'malta',
+ 'replay',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_mipsel_malta.py b/tests/functional/mipsel/test_malta.py
similarity index 98%
rename from tests/functional/test_mipsel_malta.py
rename to tests/functional/mipsel/test_malta.py
index 9ee2884da8e..427e163d19d 100755
--- a/tests/functional/test_mipsel_malta.py
+++ b/tests/functional/mipsel/test_malta.py
@@ -13,7 +13,7 @@
from qemu_test import interrupt_interactive_console_until_pattern
from qemu_test import wait_for_console_pattern
-from test_mips_malta import mips_check_wheezy
+from mips.test_malta import mips_check_wheezy
class MaltaMachineConsole(LinuxKernelTest):
diff --git a/tests/functional/test_mipsel_replay.py b/tests/functional/mipsel/test_replay.py
old mode 100644
new mode 100755
similarity index 100%
rename from tests/functional/test_mipsel_replay.py
rename to tests/functional/mipsel/test_replay.py
diff --git a/tests/functional/test_mipsel_tuxrun.py b/tests/functional/mipsel/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_mipsel_tuxrun.py
rename to tests/functional/mipsel/test_tuxrun.py
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 20/31] tests/functional: Move or1k tests into target-specific folders
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (18 preceding siblings ...)
2025-08-27 7:54 ` [PULL 19/31] tests/functional: Move mips tests into target-specific folders Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 21/31] tests/functional: Move ppc/ppc64 " Thomas Huth
` (11 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
openrisc tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-16-thuth@redhat.com>
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 6 +-----
tests/functional/or1k/meson.build | 6 ++++++
.../functional/{test_or1k_replay.py => or1k/test_replay.py} | 0
tests/functional/{test_or1k_sim.py => or1k/test_sim.py} | 0
5 files changed, 8 insertions(+), 6 deletions(-)
create mode 100644 tests/functional/or1k/meson.build
rename tests/functional/{test_or1k_replay.py => or1k/test_replay.py} (100%)
rename tests/functional/{test_or1k_sim.py => or1k/test_sim.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index b8f0ce33605..56ba9b02c39 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1457,7 +1457,7 @@ S: Maintained
F: docs/system/openrisc/or1k-sim.rst
F: hw/intc/ompic.c
F: hw/openrisc/openrisc_sim.c
-F: tests/functional/test_or1k_sim.py
+F: tests/functional/or1k/test_sim.py
PowerPC Machines
----------------
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 52969a3ff87..397303ec6fb 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -23,6 +23,7 @@ subdir('mips')
subdir('mipsel')
subdir('mips64')
subdir('mips64el')
+subdir('or1k')
test_ppc_timeouts = {
'ppc_40p' : 240,
@@ -70,11 +71,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_or1k_system_thorough = [
- 'or1k_replay',
- 'or1k_sim',
-]
-
tests_ppc_system_quick = [
'ppc_migration',
'ppc_74xx',
diff --git a/tests/functional/or1k/meson.build b/tests/functional/or1k/meson.build
new file mode 100644
index 00000000000..e246e2ab08d
--- /dev/null
+++ b/tests/functional/or1k/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_or1k_system_thorough = [
+ 'replay',
+ 'sim',
+]
diff --git a/tests/functional/test_or1k_replay.py b/tests/functional/or1k/test_replay.py
similarity index 100%
rename from tests/functional/test_or1k_replay.py
rename to tests/functional/or1k/test_replay.py
diff --git a/tests/functional/test_or1k_sim.py b/tests/functional/or1k/test_sim.py
similarity index 100%
rename from tests/functional/test_or1k_sim.py
rename to tests/functional/or1k/test_sim.py
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 21/31] tests/functional: Move ppc/ppc64 tests into target-specific folders
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (19 preceding siblings ...)
2025-08-27 7:54 ` [PULL 20/31] tests/functional: Move or1k " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 22/31] tests/functional: Move riscv32/riscv64 " Thomas Huth
` (10 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
ppc and ppc64 tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-17-thuth@redhat.com>
---
MAINTAINERS | 32 ++++++-------
tests/functional/meson.build | 47 +------------------
tests/functional/ppc/meson.build | 22 +++++++++
.../{test_ppc_40p.py => ppc/test_40p.py} | 0
.../{test_ppc_74xx.py => ppc/test_74xx.py} | 0
.../{test_ppc_amiga.py => ppc/test_amiga.py} | 0
.../test_bamboo.py} | 0
.../{test_ppc_mac.py => ppc/test_mac.py} | 0
.../test_migration.py} | 0
.../test_mpc8544ds.py} | 0
.../test_replay.py} | 0
.../test_sam460ex.py} | 0
.../test_tuxrun.py} | 0
.../test_virtex_ml507.py} | 0
tests/functional/ppc64/meson.build | 25 ++++++++++
.../test_e500.py} | 0
.../{test_ppc64_hv.py => ppc64/test_hv.py} | 0
.../test_mac99.py} | 0
.../test_migration.py} | 0
.../test_powernv.py} | 0
.../test_pseries.py} | 0
.../test_replay.py} | 0
.../test_reverse_debug.py} | 0
.../test_tuxrun.py} | 0
24 files changed, 65 insertions(+), 61 deletions(-)
create mode 100644 tests/functional/ppc/meson.build
rename tests/functional/{test_ppc_40p.py => ppc/test_40p.py} (100%)
rename tests/functional/{test_ppc_74xx.py => ppc/test_74xx.py} (100%)
rename tests/functional/{test_ppc_amiga.py => ppc/test_amiga.py} (100%)
rename tests/functional/{test_ppc_bamboo.py => ppc/test_bamboo.py} (100%)
rename tests/functional/{test_ppc_mac.py => ppc/test_mac.py} (100%)
rename tests/functional/{test_ppc_migration.py => ppc/test_migration.py} (100%)
rename tests/functional/{test_ppc_mpc8544ds.py => ppc/test_mpc8544ds.py} (100%)
rename tests/functional/{test_ppc_replay.py => ppc/test_replay.py} (100%)
rename tests/functional/{test_ppc_sam460ex.py => ppc/test_sam460ex.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_ppc_tuxrun.py => ppc/test_tuxrun.py} (100%)
rename tests/functional/{test_ppc_virtex_ml507.py => ppc/test_virtex_ml507.py} (100%)
create mode 100644 tests/functional/ppc64/meson.build
rename tests/functional/{test_ppc64_e500.py => ppc64/test_e500.py} (100%)
rename tests/functional/{test_ppc64_hv.py => ppc64/test_hv.py} (100%)
rename tests/functional/{test_ppc64_mac99.py => ppc64/test_mac99.py} (100%)
rename tests/functional/{test_ppc64_migration.py => ppc64/test_migration.py} (100%)
rename tests/functional/{test_ppc64_powernv.py => ppc64/test_powernv.py} (100%)
rename tests/functional/{test_ppc64_pseries.py => ppc64/test_pseries.py} (100%)
rename tests/functional/{test_ppc64_replay.py => ppc64/test_replay.py} (100%)
rename tests/functional/{test_ppc64_reverse_debug.py => ppc64/test_reverse_debug.py} (100%)
rename tests/functional/{test_ppc64_tuxrun.py => ppc64/test_tuxrun.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 56ba9b02c39..b0d440cf751 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -310,7 +310,7 @@ F: configs/devices/ppc*
F: docs/system/ppc/embedded.rst
F: docs/system/target-ppc.rst
F: tests/tcg/ppc*/*
-F: tests/functional/test_ppc_74xx.py
+F: tests/functional/ppc/test_74xx.py
RISC-V TCG CPUs
M: Palmer Dabbelt <palmer@dabbelt.com>
@@ -1466,7 +1466,7 @@ L: qemu-ppc@nongnu.org
S: Orphan
F: hw/ppc/ppc440_bamboo.c
F: hw/pci-host/ppc4xx_pci.c
-F: tests/functional/test_ppc_bamboo.py
+F: tests/functional/ppc/test_bamboo.py
e500
M: Bernhard Beschow <shentey@gmail.com>
@@ -1484,8 +1484,8 @@ F: pc-bios/u-boot.e500
F: hw/intc/openpic_kvm.c
F: include/hw/ppc/openpic_kvm.h
F: docs/system/ppc/ppce500.rst
-F: tests/functional/test_ppc64_e500.py
-F: tests/functional/test_ppc_tuxrun.py
+F: tests/functional/ppc64/test_e500.py
+F: tests/functional/ppc/test_tuxrun.py
mpc8544ds
M: Bernhard Beschow <shentey@gmail.com>
@@ -1493,7 +1493,7 @@ L: qemu-ppc@nongnu.org
S: Odd Fixes
F: hw/ppc/mpc8544ds.c
F: hw/ppc/mpc8544_guts.c
-F: tests/functional/test_ppc_mpc8544ds.py
+F: tests/functional/ppc/test_mpc8544ds.py
New World (mac99)
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
@@ -1515,8 +1515,8 @@ F: include/hw/ppc/mac_dbdma.h
F: include/hw/pci-host/uninorth.h
F: include/hw/input/adb*
F: pc-bios/qemu_vga.ndrv
-F: tests/functional/test_ppc_mac.py
-F: tests/functional/test_ppc64_mac99.py
+F: tests/functional/ppc/test_mac.py
+F: tests/functional/ppc64/test_mac99.py
Old World (g3beige)
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
@@ -1532,7 +1532,7 @@ F: include/hw/intc/heathrow_pic.h
F: include/hw/input/adb*
F: include/hw/pci-host/grackle.h
F: pc-bios/qemu_vga.ndrv
-F: tests/functional/test_ppc_mac.py
+F: tests/functional/ppc/test_mac.py
PReP
M: Hervé Poussineau <hpoussin@reactos.org>
@@ -1549,7 +1549,7 @@ F: hw/dma/i82374.c
F: hw/rtc/m48t59-isa.c
F: include/hw/isa/pc87312.h
F: include/hw/rtc/m48t59.h
-F: tests/functional/test_ppc_40p.py
+F: tests/functional/ppc/test_40p.py
sPAPR (pseries)
M: Nicholas Piggin <npiggin@gmail.com>
@@ -1572,9 +1572,9 @@ F: tests/qtest/spapr*
F: tests/qtest/libqos/*spapr*
F: tests/qtest/rtas*
F: tests/qtest/libqos/rtas*
-F: tests/functional/test_ppc64_pseries.py
-F: tests/functional/test_ppc64_hv.py
-F: tests/functional/test_ppc64_tuxrun.py
+F: tests/functional/ppc64/test_pseries.py
+F: tests/functional/ppc64/test_hv.py
+F: tests/functional/ppc64/test_tuxrun.py
PowerNV (Non-Virtualized)
M: Nicholas Piggin <npiggin@gmail.com>
@@ -1593,7 +1593,7 @@ F: include/hw/ssi/pnv_spi*
F: pc-bios/skiboot.lid
F: pc-bios/pnv-pnor.bin
F: tests/qtest/pnv*
-F: tests/functional/test_ppc64_powernv.py
+F: tests/functional/ppc64/test_powernv.py
pca955x
M: Glenn Miles <milesg@linux.ibm.com>
@@ -1608,7 +1608,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
L: qemu-ppc@nongnu.org
S: Odd Fixes
F: hw/ppc/virtex_ml507.c
-F: tests/functional/test_ppc_virtex_ml507.py
+F: tests/functional/ppc/test_virtex_ml507.py
sam460ex
M: BALATON Zoltan <balaton@eik.bme.hu>
@@ -1624,7 +1624,7 @@ F: pc-bios/dtb/canyonlands.dt[sb]
F: pc-bios/u-boot-sam460ex-20100605.bin
F: roms/u-boot-sam460ex
F: docs/system/ppc/amigang.rst
-F: tests/functional/test_ppc_sam460ex.py
+F: tests/functional/ppc/test_sam460ex.py
pegasos2
M: BALATON Zoltan <balaton@eik.bme.hu>
@@ -1642,7 +1642,7 @@ S: Maintained
F: hw/ppc/amigaone.c
F: hw/pci-host/articia.c
F: include/hw/pci-host/articia.h
-F: tests/functional/test_ppc_amiga.py
+F: tests/functional/ppc/test_amiga.py
Virtual Open Firmware (VOF)
M: Alexey Kardashevskiy <aik@ozlabs.ru>
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 397303ec6fb..3caeea5ebdd 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -24,19 +24,8 @@ subdir('mipsel')
subdir('mips64')
subdir('mips64el')
subdir('or1k')
-
-test_ppc_timeouts = {
- 'ppc_40p' : 240,
-}
-
-test_ppc64_timeouts = {
- 'ppc64_hv' : 1000,
- 'ppc64_powernv' : 480,
- 'ppc64_pseries' : 480,
- 'ppc64_replay' : 210,
- 'ppc64_tuxrun' : 420,
- 'ppc64_mac99' : 120,
-}
+subdir('ppc')
+subdir('ppc64')
test_riscv64_timeouts = {
'riscv64_tuxrun' : 120,
@@ -71,38 +60,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_ppc_system_quick = [
- 'ppc_migration',
- 'ppc_74xx',
-]
-
-tests_ppc_system_thorough = [
- 'ppc_40p',
- 'ppc_amiga',
- 'ppc_bamboo',
- 'ppc_mac',
- 'ppc_mpc8544ds',
- 'ppc_replay',
- 'ppc_sam460ex',
- 'ppc_tuxrun',
- 'ppc_virtex_ml507',
-]
-
-tests_ppc64_system_quick = [
- 'ppc64_migration',
-]
-
-tests_ppc64_system_thorough = [
- 'ppc64_e500',
- 'ppc64_hv',
- 'ppc64_powernv',
- 'ppc64_pseries',
- 'ppc64_replay',
- 'ppc64_reverse_debug',
- 'ppc64_tuxrun',
- 'ppc64_mac99',
-]
-
tests_riscv32_system_quick = [
'riscv32_migration',
'riscv_opensbi',
diff --git a/tests/functional/ppc/meson.build b/tests/functional/ppc/meson.build
new file mode 100644
index 00000000000..3d562010d8c
--- /dev/null
+++ b/tests/functional/ppc/meson.build
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_ppc_timeouts = {
+ '40p' : 240,
+}
+
+tests_ppc_system_quick = [
+ 'migration',
+ '74xx',
+]
+
+tests_ppc_system_thorough = [
+ '40p',
+ 'amiga',
+ 'bamboo',
+ 'mac',
+ 'mpc8544ds',
+ 'replay',
+ 'sam460ex',
+ 'tuxrun',
+ 'virtex_ml507',
+]
diff --git a/tests/functional/test_ppc_40p.py b/tests/functional/ppc/test_40p.py
similarity index 100%
rename from tests/functional/test_ppc_40p.py
rename to tests/functional/ppc/test_40p.py
diff --git a/tests/functional/test_ppc_74xx.py b/tests/functional/ppc/test_74xx.py
similarity index 100%
rename from tests/functional/test_ppc_74xx.py
rename to tests/functional/ppc/test_74xx.py
diff --git a/tests/functional/test_ppc_amiga.py b/tests/functional/ppc/test_amiga.py
similarity index 100%
rename from tests/functional/test_ppc_amiga.py
rename to tests/functional/ppc/test_amiga.py
diff --git a/tests/functional/test_ppc_bamboo.py b/tests/functional/ppc/test_bamboo.py
similarity index 100%
rename from tests/functional/test_ppc_bamboo.py
rename to tests/functional/ppc/test_bamboo.py
diff --git a/tests/functional/test_ppc_mac.py b/tests/functional/ppc/test_mac.py
similarity index 100%
rename from tests/functional/test_ppc_mac.py
rename to tests/functional/ppc/test_mac.py
diff --git a/tests/functional/test_ppc_migration.py b/tests/functional/ppc/test_migration.py
similarity index 100%
rename from tests/functional/test_ppc_migration.py
rename to tests/functional/ppc/test_migration.py
diff --git a/tests/functional/test_ppc_mpc8544ds.py b/tests/functional/ppc/test_mpc8544ds.py
similarity index 100%
rename from tests/functional/test_ppc_mpc8544ds.py
rename to tests/functional/ppc/test_mpc8544ds.py
diff --git a/tests/functional/test_ppc_replay.py b/tests/functional/ppc/test_replay.py
similarity index 100%
rename from tests/functional/test_ppc_replay.py
rename to tests/functional/ppc/test_replay.py
diff --git a/tests/functional/test_ppc_sam460ex.py b/tests/functional/ppc/test_sam460ex.py
old mode 100644
new mode 100755
similarity index 100%
rename from tests/functional/test_ppc_sam460ex.py
rename to tests/functional/ppc/test_sam460ex.py
diff --git a/tests/functional/test_ppc_tuxrun.py b/tests/functional/ppc/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_ppc_tuxrun.py
rename to tests/functional/ppc/test_tuxrun.py
diff --git a/tests/functional/test_ppc_virtex_ml507.py b/tests/functional/ppc/test_virtex_ml507.py
similarity index 100%
rename from tests/functional/test_ppc_virtex_ml507.py
rename to tests/functional/ppc/test_virtex_ml507.py
diff --git a/tests/functional/ppc64/meson.build b/tests/functional/ppc64/meson.build
new file mode 100644
index 00000000000..842fe0fc715
--- /dev/null
+++ b/tests/functional/ppc64/meson.build
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_ppc64_timeouts = {
+ 'hv' : 1000,
+ 'mac99' : 120,
+ 'powernv' : 480,
+ 'pseries' : 480,
+ 'replay' : 210,
+ 'tuxrun' : 420,
+}
+
+tests_ppc64_system_quick = [
+ 'migration',
+]
+
+tests_ppc64_system_thorough = [
+ 'e500',
+ 'hv',
+ 'mac99',
+ 'powernv',
+ 'pseries',
+ 'replay',
+ 'reverse_debug',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_ppc64_e500.py b/tests/functional/ppc64/test_e500.py
similarity index 100%
rename from tests/functional/test_ppc64_e500.py
rename to tests/functional/ppc64/test_e500.py
diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/ppc64/test_hv.py
similarity index 100%
rename from tests/functional/test_ppc64_hv.py
rename to tests/functional/ppc64/test_hv.py
diff --git a/tests/functional/test_ppc64_mac99.py b/tests/functional/ppc64/test_mac99.py
similarity index 100%
rename from tests/functional/test_ppc64_mac99.py
rename to tests/functional/ppc64/test_mac99.py
diff --git a/tests/functional/test_ppc64_migration.py b/tests/functional/ppc64/test_migration.py
similarity index 100%
rename from tests/functional/test_ppc64_migration.py
rename to tests/functional/ppc64/test_migration.py
diff --git a/tests/functional/test_ppc64_powernv.py b/tests/functional/ppc64/test_powernv.py
similarity index 100%
rename from tests/functional/test_ppc64_powernv.py
rename to tests/functional/ppc64/test_powernv.py
diff --git a/tests/functional/test_ppc64_pseries.py b/tests/functional/ppc64/test_pseries.py
similarity index 100%
rename from tests/functional/test_ppc64_pseries.py
rename to tests/functional/ppc64/test_pseries.py
diff --git a/tests/functional/test_ppc64_replay.py b/tests/functional/ppc64/test_replay.py
similarity index 100%
rename from tests/functional/test_ppc64_replay.py
rename to tests/functional/ppc64/test_replay.py
diff --git a/tests/functional/test_ppc64_reverse_debug.py b/tests/functional/ppc64/test_reverse_debug.py
similarity index 100%
rename from tests/functional/test_ppc64_reverse_debug.py
rename to tests/functional/ppc64/test_reverse_debug.py
diff --git a/tests/functional/test_ppc64_tuxrun.py b/tests/functional/ppc64/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_ppc64_tuxrun.py
rename to tests/functional/ppc64/test_tuxrun.py
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 22/31] tests/functional: Move riscv32/riscv64 tests into target-specific folders
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (20 preceding siblings ...)
2025-08-27 7:54 ` [PULL 21/31] tests/functional: Move ppc/ppc64 " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 23/31] tests/functional: Move rx test " Thomas Huth
` (9 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The opensbi test is used for both, riscv32 and riscv64. Copy the main
test to the riscv64 folder and add a simple wrapper to the riscv32
folder to be able to run it for that target, too.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-18-thuth@redhat.com>
---
MAINTAINERS | 3 ++-
tests/functional/meson.build | 25 ++-----------------
tests/functional/riscv32/meson.build | 10 ++++++++
.../test_migration.py} | 0
tests/functional/riscv32/test_opensbi.py | 10 ++++++++
.../test_tuxrun.py} | 0
tests/functional/riscv64/meson.build | 15 +++++++++++
.../test_migration.py} | 0
.../test_opensbi.py} | 0
.../test_sifive_u.py} | 0
.../test_tuxrun.py} | 0
11 files changed, 39 insertions(+), 24 deletions(-)
create mode 100644 tests/functional/riscv32/meson.build
rename tests/functional/{test_riscv32_migration.py => riscv32/test_migration.py} (100%)
create mode 100755 tests/functional/riscv32/test_opensbi.py
rename tests/functional/{test_riscv32_tuxrun.py => riscv32/test_tuxrun.py} (100%)
create mode 100644 tests/functional/riscv64/meson.build
rename tests/functional/{test_riscv64_migration.py => riscv64/test_migration.py} (100%)
rename tests/functional/{test_riscv_opensbi.py => riscv64/test_opensbi.py} (100%)
rename tests/functional/{test_riscv64_sifive_u.py => riscv64/test_sifive_u.py} (100%)
rename tests/functional/{test_riscv64_tuxrun.py => riscv64/test_tuxrun.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index b0d440cf751..81262546c4b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -332,7 +332,8 @@ F: include/hw/riscv/
F: linux-user/host/riscv32/
F: linux-user/host/riscv64/
F: common-user/host/riscv*
-F: tests/functional/test_riscv*
+F: tests/functional/riscv32
+F: tests/functional/riscv64
F: tests/tcg/riscv64/
RISC-V XThead* extensions
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 3caeea5ebdd..2d8f67fd94f 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -26,10 +26,8 @@ subdir('mips64el')
subdir('or1k')
subdir('ppc')
subdir('ppc64')
-
-test_riscv64_timeouts = {
- 'riscv64_tuxrun' : 120,
-}
+subdir('riscv32')
+subdir('riscv64')
test_s390x_timeouts = {
's390x_ccw_virtio' : 420,
@@ -60,25 +58,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_riscv32_system_quick = [
- 'riscv32_migration',
- 'riscv_opensbi',
-]
-
-tests_riscv32_system_thorough = [
- 'riscv32_tuxrun',
-]
-
-tests_riscv64_system_quick = [
- 'riscv64_migration',
- 'riscv_opensbi',
-]
-
-tests_riscv64_system_thorough = [
- 'riscv64_sifive_u',
- 'riscv64_tuxrun',
-]
-
tests_rx_system_thorough = [
'rx_gdbsim',
]
diff --git a/tests/functional/riscv32/meson.build b/tests/functional/riscv32/meson.build
new file mode 100644
index 00000000000..f3ebbb8db5d
--- /dev/null
+++ b/tests/functional/riscv32/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_riscv32_system_quick = [
+ 'migration',
+ 'opensbi',
+]
+
+tests_riscv32_system_thorough = [
+ 'tuxrun',
+]
diff --git a/tests/functional/test_riscv32_migration.py b/tests/functional/riscv32/test_migration.py
similarity index 100%
rename from tests/functional/test_riscv32_migration.py
rename to tests/functional/riscv32/test_migration.py
diff --git a/tests/functional/riscv32/test_opensbi.py b/tests/functional/riscv32/test_opensbi.py
new file mode 100755
index 00000000000..d1ac706f0bb
--- /dev/null
+++ b/tests/functional/riscv32/test_opensbi.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Reuse the 64-bit OpenSBI test for RISC-V 32-bit machines
+
+from riscv64.test_opensbi import RiscvOpenSBI
+
+if __name__ == '__main__':
+ RiscvOpenSBI.main()
diff --git a/tests/functional/test_riscv32_tuxrun.py b/tests/functional/riscv32/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_riscv32_tuxrun.py
rename to tests/functional/riscv32/test_tuxrun.py
diff --git a/tests/functional/riscv64/meson.build b/tests/functional/riscv64/meson.build
new file mode 100644
index 00000000000..c1704d92751
--- /dev/null
+++ b/tests/functional/riscv64/meson.build
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_riscv64_timeouts = {
+ 'tuxrun' : 120,
+}
+
+tests_riscv64_system_quick = [
+ 'migration',
+ 'opensbi',
+]
+
+tests_riscv64_system_thorough = [
+ 'sifive_u',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_riscv64_migration.py b/tests/functional/riscv64/test_migration.py
similarity index 100%
rename from tests/functional/test_riscv64_migration.py
rename to tests/functional/riscv64/test_migration.py
diff --git a/tests/functional/test_riscv_opensbi.py b/tests/functional/riscv64/test_opensbi.py
similarity index 100%
rename from tests/functional/test_riscv_opensbi.py
rename to tests/functional/riscv64/test_opensbi.py
diff --git a/tests/functional/test_riscv64_sifive_u.py b/tests/functional/riscv64/test_sifive_u.py
similarity index 100%
rename from tests/functional/test_riscv64_sifive_u.py
rename to tests/functional/riscv64/test_sifive_u.py
diff --git a/tests/functional/test_riscv64_tuxrun.py b/tests/functional/riscv64/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_riscv64_tuxrun.py
rename to tests/functional/riscv64/test_tuxrun.py
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 23/31] tests/functional: Move rx test into target-specific folders
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (21 preceding siblings ...)
2025-08-27 7:54 ` [PULL 22/31] tests/functional: Move riscv32/riscv64 " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 24/31] tests/functional: Move s390x tests " Thomas Huth
` (8 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
Move the architecture specific test into an architecture specific
subdirectory.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-19-thuth@redhat.com>
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 5 +----
tests/functional/rx/meson.build | 5 +++++
tests/functional/{test_rx_gdbsim.py => rx/test_gdbsim.py} | 0
4 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 tests/functional/rx/meson.build
rename tests/functional/{test_rx_gdbsim.py => rx/test_gdbsim.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 81262546c4b..c6410a5f5fd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1721,7 +1721,7 @@ R: Yoshinori Sato <yoshinori.sato@nifty.com>
S: Orphan
F: docs/system/target-rx.rst
F: hw/rx/rx-gdbsim.c
-F: tests/functional/test_rx_gdbsim.py
+F: tests/functional/rx/test_gdbsim.py
SH4 Machines
------------
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 2d8f67fd94f..7e7a6aa0c93 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -28,6 +28,7 @@ subdir('ppc')
subdir('ppc64')
subdir('riscv32')
subdir('riscv64')
+subdir('rx')
test_s390x_timeouts = {
's390x_ccw_virtio' : 420,
@@ -58,10 +59,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_rx_system_thorough = [
- 'rx_gdbsim',
-]
-
tests_s390x_system_thorough = [
's390x_ccw_virtio',
's390x_pxelinux',
diff --git a/tests/functional/rx/meson.build b/tests/functional/rx/meson.build
new file mode 100644
index 00000000000..6af83a9f23f
--- /dev/null
+++ b/tests/functional/rx/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_rx_system_thorough = [
+ 'gdbsim',
+]
diff --git a/tests/functional/test_rx_gdbsim.py b/tests/functional/rx/test_gdbsim.py
similarity index 100%
rename from tests/functional/test_rx_gdbsim.py
rename to tests/functional/rx/test_gdbsim.py
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 24/31] tests/functional: Move s390x tests into target-specific folders
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (22 preceding siblings ...)
2025-08-27 7:54 ` [PULL 23/31] tests/functional: Move rx test " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 25/31] tests/functional: Move sh4/sh4eb " Thomas Huth
` (7 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
s390x tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-20-thuth@redhat.com>
---
MAINTAINERS | 6 +++---
tests/functional/meson.build | 13 +------------
tests/functional/s390x/meson.build | 13 +++++++++++++
.../test_ccw_virtio.py} | 0
.../test_pxelinux.py} | 0
.../{test_s390x_replay.py => s390x/test_replay.py} | 0
.../test_topology.py} | 0
.../{test_s390x_tuxrun.py => s390x/test_tuxrun.py} | 0
8 files changed, 17 insertions(+), 15 deletions(-)
create mode 100644 tests/functional/s390x/meson.build
rename tests/functional/{test_s390x_ccw_virtio.py => s390x/test_ccw_virtio.py} (100%)
rename tests/functional/{test_s390x_pxelinux.py => s390x/test_pxelinux.py} (100%)
rename tests/functional/{test_s390x_replay.py => s390x/test_replay.py} (100%)
rename tests/functional/{test_s390x_topology.py => s390x/test_topology.py} (100%)
rename tests/functional/{test_s390x_tuxrun.py => s390x/test_tuxrun.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index c6410a5f5fd..4a55a20f6a5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1797,7 +1797,7 @@ S: Supported
F: hw/s390x/
F: include/hw/s390x/
F: configs/devices/s390x-softmmu/default.mak
-F: tests/functional/test_s390x_*
+F: tests/functional/s390x
T: git https://github.com/borntraeger/qemu.git s390-next
L: qemu-s390x@nongnu.org
@@ -1811,7 +1811,7 @@ F: hw/s390x/ipl.*
F: pc-bios/s390-ccw/
F: pc-bios/s390-ccw.img
F: docs/devel/s390-dasd-ipl.rst
-F: tests/functional/test_s390x_pxelinux.py
+F: tests/functional/s390x/test_pxelinux.py
T: git https://github.com/borntraeger/qemu.git s390-next
L: qemu-s390x@nongnu.org
@@ -1865,7 +1865,7 @@ F: hw/s390x/cpu-topology.c
F: target/s390x/kvm/stsi-topology.c
F: docs/devel/s390-cpu-topology.rst
F: docs/system/s390x/cpu-topology.rst
-F: tests/functional/test_s390x_topology.py
+F: tests/functional/s390x/test_topology.py
X86 Machines
------------
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 7e7a6aa0c93..abaa4e00fca 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -29,10 +29,7 @@ subdir('ppc64')
subdir('riscv32')
subdir('riscv64')
subdir('rx')
-
-test_s390x_timeouts = {
- 's390x_ccw_virtio' : 420,
-}
+subdir('s390x')
test_sh4_timeouts = {
'sh4_tuxrun' : 240,
@@ -59,14 +56,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_s390x_system_thorough = [
- 's390x_ccw_virtio',
- 's390x_pxelinux',
- 's390x_replay',
- 's390x_topology',
- 's390x_tuxrun',
-]
-
tests_sh4_system_thorough = [
'sh4_r2d',
'sh4_tuxrun',
diff --git a/tests/functional/s390x/meson.build b/tests/functional/s390x/meson.build
new file mode 100644
index 00000000000..030b116039c
--- /dev/null
+++ b/tests/functional/s390x/meson.build
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_s390x_timeouts = {
+ 'ccw_virtio' : 420,
+}
+
+tests_s390x_system_thorough = [
+ 'ccw_virtio',
+ 'pxelinux',
+ 'replay',
+ 'topology',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_s390x_ccw_virtio.py b/tests/functional/s390x/test_ccw_virtio.py
similarity index 100%
rename from tests/functional/test_s390x_ccw_virtio.py
rename to tests/functional/s390x/test_ccw_virtio.py
diff --git a/tests/functional/test_s390x_pxelinux.py b/tests/functional/s390x/test_pxelinux.py
similarity index 100%
rename from tests/functional/test_s390x_pxelinux.py
rename to tests/functional/s390x/test_pxelinux.py
diff --git a/tests/functional/test_s390x_replay.py b/tests/functional/s390x/test_replay.py
similarity index 100%
rename from tests/functional/test_s390x_replay.py
rename to tests/functional/s390x/test_replay.py
diff --git a/tests/functional/test_s390x_topology.py b/tests/functional/s390x/test_topology.py
similarity index 100%
rename from tests/functional/test_s390x_topology.py
rename to tests/functional/s390x/test_topology.py
diff --git a/tests/functional/test_s390x_tuxrun.py b/tests/functional/s390x/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_s390x_tuxrun.py
rename to tests/functional/s390x/test_tuxrun.py
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 25/31] tests/functional: Move sh4/sh4eb tests into target-specific folders
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (23 preceding siblings ...)
2025-08-27 7:54 ` [PULL 24/31] tests/functional: Move s390x tests " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 26/31] tests/functional: Move sparc/sparc64 " Thomas Huth
` (6 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
sh4 tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-21-thuth@redhat.com>
---
MAINTAINERS | 4 ++--
tests/functional/meson.build | 15 ++-------------
tests/functional/sh4/meson.build | 10 ++++++++++
.../{test_sh4_r2d.py => sh4/test_r2d.py} | 0
.../{test_sh4_tuxrun.py => sh4/test_tuxrun.py} | 0
tests/functional/sh4eb/meson.build | 5 +++++
.../{test_sh4eb_r2d.py => sh4eb/test_r2d.py} | 0
7 files changed, 19 insertions(+), 15 deletions(-)
create mode 100644 tests/functional/sh4/meson.build
rename tests/functional/{test_sh4_r2d.py => sh4/test_r2d.py} (100%)
rename tests/functional/{test_sh4_tuxrun.py => sh4/test_tuxrun.py} (100%)
create mode 100644 tests/functional/sh4eb/meson.build
rename tests/functional/{test_sh4eb_r2d.py => sh4eb/test_r2d.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4a55a20f6a5..eddec0058e0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1736,8 +1736,8 @@ F: hw/pci-host/sh_pci.c
F: hw/timer/sh_timer.c
F: include/hw/sh4/sh_intc.h
F: include/hw/timer/tmu012.h
-F: tests/functional/test_sh4*_r2d.py
-F: tests/functional/test_sh4_tuxrun.py
+F: tests/functional/sh4*/test_r2d.py
+F: tests/functional/sh4/test_tuxrun.py
SPARC Machines
--------------
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index abaa4e00fca..ce713509e32 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -30,10 +30,8 @@ subdir('riscv32')
subdir('riscv64')
subdir('rx')
subdir('s390x')
-
-test_sh4_timeouts = {
- 'sh4_tuxrun' : 240,
-}
+subdir('sh4')
+subdir('sh4eb')
test_x86_64_timeouts = {
'acpi_bits' : 420,
@@ -56,15 +54,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_sh4_system_thorough = [
- 'sh4_r2d',
- 'sh4_tuxrun',
-]
-
-tests_sh4eb_system_thorough = [
- 'sh4eb_r2d',
-]
-
tests_sparc_system_quick = [
'sparc_migration',
]
diff --git a/tests/functional/sh4/meson.build b/tests/functional/sh4/meson.build
new file mode 100644
index 00000000000..56f824e1e71
--- /dev/null
+++ b/tests/functional/sh4/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_sh4_timeouts = {
+ 'tuxrun' : 240,
+}
+
+tests_sh4_system_thorough = [
+ 'r2d',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_sh4_r2d.py b/tests/functional/sh4/test_r2d.py
similarity index 100%
rename from tests/functional/test_sh4_r2d.py
rename to tests/functional/sh4/test_r2d.py
diff --git a/tests/functional/test_sh4_tuxrun.py b/tests/functional/sh4/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_sh4_tuxrun.py
rename to tests/functional/sh4/test_tuxrun.py
diff --git a/tests/functional/sh4eb/meson.build b/tests/functional/sh4eb/meson.build
new file mode 100644
index 00000000000..25e9a6e4041
--- /dev/null
+++ b/tests/functional/sh4eb/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_sh4eb_system_thorough = [
+ 'r2d',
+]
diff --git a/tests/functional/test_sh4eb_r2d.py b/tests/functional/sh4eb/test_r2d.py
similarity index 100%
rename from tests/functional/test_sh4eb_r2d.py
rename to tests/functional/sh4eb/test_r2d.py
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 26/31] tests/functional: Move sparc/sparc64 tests into target-specific folders
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (24 preceding siblings ...)
2025-08-27 7:54 ` [PULL 25/31] tests/functional: Move sh4/sh4eb " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 27/31] tests/functional: Move x86_64 tests into target-specific folder Thomas Huth
` (5 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
sparc tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-22-thuth@redhat.com>
---
MAINTAINERS | 6 +++---
tests/functional/meson.build | 20 ++-----------------
tests/functional/sparc/meson.build | 10 ++++++++++
.../test_migration.py} | 0
.../test_replay.py} | 0
.../test_sun4m.py} | 0
tests/functional/sparc64/meson.build | 10 ++++++++++
.../test_migration.py} | 0
.../test_sun4u.py} | 0
.../test_tuxrun.py} | 0
10 files changed, 25 insertions(+), 21 deletions(-)
create mode 100644 tests/functional/sparc/meson.build
rename tests/functional/{test_sparc_migration.py => sparc/test_migration.py} (100%)
rename tests/functional/{test_sparc_replay.py => sparc/test_replay.py} (100%)
rename tests/functional/{test_sparc_sun4m.py => sparc/test_sun4m.py} (100%)
create mode 100644 tests/functional/sparc64/meson.build
rename tests/functional/{test_sparc64_migration.py => sparc64/test_migration.py} (100%)
rename tests/functional/{test_sparc64_sun4u.py => sparc64/test_sun4u.py} (100%)
rename tests/functional/{test_sparc64_tuxrun.py => sparc64/test_tuxrun.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index eddec0058e0..b46445ff5c0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1755,7 +1755,7 @@ F: include/hw/nvram/sun_nvram.h
F: include/hw/sparc/sparc32_dma.h
F: include/hw/sparc/sun4m_iommu.h
F: pc-bios/openbios-sparc32
-F: tests/functional/test_sparc_sun4m.py
+F: tests/functional/sparc/test_sun4m.py
Sun4u
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
@@ -1768,8 +1768,8 @@ F: include/hw/pci-host/sabre.h
F: hw/pci-bridge/simba.c
F: include/hw/pci-bridge/simba.h
F: pc-bios/openbios-sparc64
-F: tests/functional/test_sparc64_sun4u.py
-F: tests/functional/test_sparc64_tuxrun.py
+F: tests/functional/sparc64/test_sun4u.py
+F: tests/functional/sparc64/test_tuxrun.py
Sun4v
M: Artyom Tarasenko <atar4qemu@gmail.com>
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index ce713509e32..00d18dba3ce 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -32,6 +32,8 @@ subdir('rx')
subdir('s390x')
subdir('sh4')
subdir('sh4eb')
+subdir('sparc')
+subdir('sparc64')
test_x86_64_timeouts = {
'acpi_bits' : 420,
@@ -54,24 +56,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_sparc_system_quick = [
- 'sparc_migration',
-]
-
-tests_sparc_system_thorough = [
- 'sparc_replay',
- 'sparc_sun4m',
-]
-
-tests_sparc64_system_quick = [
- 'sparc64_migration',
-]
-
-tests_sparc64_system_thorough = [
- 'sparc64_sun4u',
- 'sparc64_tuxrun',
-]
-
tests_x86_64_system_quick = [
'cpu_queries',
'mem_addr_space',
diff --git a/tests/functional/sparc/meson.build b/tests/functional/sparc/meson.build
new file mode 100644
index 00000000000..88732becd81
--- /dev/null
+++ b/tests/functional/sparc/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_sparc_system_quick = [
+ 'migration',
+]
+
+tests_sparc_system_thorough = [
+ 'replay',
+ 'sun4m',
+]
diff --git a/tests/functional/test_sparc_migration.py b/tests/functional/sparc/test_migration.py
similarity index 100%
rename from tests/functional/test_sparc_migration.py
rename to tests/functional/sparc/test_migration.py
diff --git a/tests/functional/test_sparc_replay.py b/tests/functional/sparc/test_replay.py
similarity index 100%
rename from tests/functional/test_sparc_replay.py
rename to tests/functional/sparc/test_replay.py
diff --git a/tests/functional/test_sparc_sun4m.py b/tests/functional/sparc/test_sun4m.py
similarity index 100%
rename from tests/functional/test_sparc_sun4m.py
rename to tests/functional/sparc/test_sun4m.py
diff --git a/tests/functional/sparc64/meson.build b/tests/functional/sparc64/meson.build
new file mode 100644
index 00000000000..2e04e7d4f3d
--- /dev/null
+++ b/tests/functional/sparc64/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_sparc64_system_quick = [
+ 'migration',
+]
+
+tests_sparc64_system_thorough = [
+ 'sun4u',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_sparc64_migration.py b/tests/functional/sparc64/test_migration.py
similarity index 100%
rename from tests/functional/test_sparc64_migration.py
rename to tests/functional/sparc64/test_migration.py
diff --git a/tests/functional/test_sparc64_sun4u.py b/tests/functional/sparc64/test_sun4u.py
similarity index 100%
rename from tests/functional/test_sparc64_sun4u.py
rename to tests/functional/sparc64/test_sun4u.py
diff --git a/tests/functional/test_sparc64_tuxrun.py b/tests/functional/sparc64/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_sparc64_tuxrun.py
rename to tests/functional/sparc64/test_tuxrun.py
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 27/31] tests/functional: Move x86_64 tests into target-specific folder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (25 preceding siblings ...)
2025-08-27 7:54 ` [PULL 26/31] tests/functional: Move sparc/sparc64 " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 28/31] tests/functional: Move xtensa " Thomas Huth
` (4 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
x86_64 tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-23-thuth@redhat.com>
---
MAINTAINERS | 32 ++++++++--------
tests/functional/meson.build | 37 +------------------
tests/functional/x86_64/meson.build | 37 +++++++++++++++++++
.../functional/{ => x86_64}/test_acpi_bits.py | 0
.../test_cpu_model_versions.py} | 0
.../{ => x86_64}/test_cpu_queries.py | 0
.../test_hotplug_blk.py} | 0
.../test_hotplug_cpu.py} | 0
.../{ => x86_64}/test_intel_iommu.py | 0
.../test_kvm_xen.py} | 0
.../{ => x86_64}/test_linux_initrd.py | 0
.../{ => x86_64}/test_mem_addr_space.py | 0
tests/functional/{ => x86_64}/test_memlock.py | 0
.../test_migration.py} | 0
.../test_multiprocess.py} | 0
.../{ => x86_64}/test_netdev_ethtool.py | 0
.../{ => x86_64}/test_pc_cpu_hotplug_props.py | 0
.../test_replay.py} | 0
.../test_reverse_debug.py} | 0
.../test_tuxrun.py} | 0
.../{ => x86_64}/test_virtio_balloon.py | 0
.../{ => x86_64}/test_virtio_gpu.py | 0
.../{ => x86_64}/test_virtio_version.py | 0
23 files changed, 55 insertions(+), 51 deletions(-)
create mode 100644 tests/functional/x86_64/meson.build
rename tests/functional/{ => x86_64}/test_acpi_bits.py (100%)
rename tests/functional/{test_x86_cpu_model_versions.py => x86_64/test_cpu_model_versions.py} (100%)
rename tests/functional/{ => x86_64}/test_cpu_queries.py (100%)
rename tests/functional/{test_x86_64_hotplug_blk.py => x86_64/test_hotplug_blk.py} (100%)
rename tests/functional/{test_x86_64_hotplug_cpu.py => x86_64/test_hotplug_cpu.py} (100%)
rename tests/functional/{ => x86_64}/test_intel_iommu.py (100%)
rename tests/functional/{test_x86_64_kvm_xen.py => x86_64/test_kvm_xen.py} (100%)
rename tests/functional/{ => x86_64}/test_linux_initrd.py (100%)
rename tests/functional/{ => x86_64}/test_mem_addr_space.py (100%)
rename tests/functional/{ => x86_64}/test_memlock.py (100%)
rename tests/functional/{test_x86_64_migration.py => x86_64/test_migration.py} (100%)
rename tests/functional/{test_x86_64_multiprocess.py => x86_64/test_multiprocess.py} (100%)
rename tests/functional/{ => x86_64}/test_netdev_ethtool.py (100%)
rename tests/functional/{ => x86_64}/test_pc_cpu_hotplug_props.py (100%)
rename tests/functional/{test_x86_64_replay.py => x86_64/test_replay.py} (100%)
rename tests/functional/{test_x86_64_reverse_debug.py => x86_64/test_reverse_debug.py} (100%)
rename tests/functional/{test_x86_64_tuxrun.py => x86_64/test_tuxrun.py} (100%)
rename tests/functional/{ => x86_64}/test_virtio_balloon.py (100%)
rename tests/functional/{ => x86_64}/test_virtio_gpu.py (100%)
rename tests/functional/{ => x86_64}/test_virtio_version.py (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index b46445ff5c0..7b1a94f696c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -147,6 +147,7 @@ F: target/i386/Kconfig
F: target/i386/meson.build
F: tools/i386/
F: tests/functional/i386/
+F: tests/functional/x86_64/
Guest CPU cores (TCG)
---------------------
@@ -483,7 +484,7 @@ F: docs/system/i386/sgx.rst
F: target/i386/kvm/
F: target/i386/sev*
F: scripts/kvm/vmxcap
-F: tests/functional/test_x86_64_hotplug_cpu.py
+F: tests/functional/x86_64/test_hotplug_cpu.py
Xen emulation on X86 KVM CPUs
M: David Woodhouse <dwmw2@infradead.org>
@@ -492,7 +493,7 @@ S: Supported
F: include/system/kvm_xen.h
F: target/i386/kvm/xen*
F: hw/i386/kvm/xen*
-F: tests/functional/test_x86_64_kvm_xen.py
+F: tests/functional/x86_64/test_kvm_xen.py
Guest CPU Cores (other accelerators)
------------------------------------
@@ -1894,11 +1895,11 @@ F: include/hw/isa/apm.h
F: tests/unit/test-x86-topo.c
F: tests/qtest/test-x86-cpuid-compat.c
F: tests/functional/i386/test_tuxrun.py
-F: tests/functional/test_linux_initrd.py
-F: tests/functional/test_mem_addr_space.py
-F: tests/functional/test_pc_cpu_hotplug_props.py
-F: tests/functional/test_x86_64_tuxrun.py
-F: tests/functional/test_x86_cpu_model_versions.py
+F: tests/functional/x86_64/test_linux_initrd.py
+F: tests/functional/x86_64/test_mem_addr_space.py
+F: tests/functional/x86_64/test_pc_cpu_hotplug_props.py
+F: tests/functional/x86_64/test_tuxrun.py
+F: tests/functional/x86_64/test_cpu_model_versions.py
PC Chipset
M: Michael S. Tsirkin <mst@redhat.com>
@@ -1974,7 +1975,7 @@ F: include/hw/boards.h
F: include/hw/core/cpu.h
F: include/hw/cpu/cluster.h
F: include/system/numa.h
-F: tests/functional/test_cpu_queries.py
+F: tests/functional/x86_64/test_cpu_queries.py
F: tests/functional/test_empty_cpu_model.py
F: tests/unit/test-smp-parse.c
T: git https://gitlab.com/ehabkost/qemu.git machine-next
@@ -2159,7 +2160,7 @@ M: Ani Sinha <anisinha@redhat.com>
M: Michael S. Tsirkin <mst@redhat.com>
S: Supported
F: tests/functional/acpi-bits/*
-F: tests/functional/test_acpi_bits.py
+F: tests/functional/x86_64/test_acpi_bits.py
F: docs/devel/testing/acpi-bits.rst
ACPI/HEST/GHES
@@ -2345,7 +2346,7 @@ F: net/vhost-user.c
F: include/hw/virtio/
F: docs/devel/virtio*
F: docs/devel/migration/virtio.rst
-F: tests/functional/test_virtio_version.py
+F: tests/functional/x86_64/test_virtio_version.py
virtio-balloon
M: Michael S. Tsirkin <mst@redhat.com>
@@ -2357,7 +2358,7 @@ F: include/hw/virtio/virtio-balloon.h
F: system/balloon.c
F: include/system/balloon.h
F: tests/qtest/virtio-balloon-test.c
-F: tests/functional/test_virtio_balloon.py
+F: tests/functional/x86_64/test_virtio_balloon.py
virtio-9p
M: Christian Schoenebeck <qemu_oss@crudebyte.com>
@@ -2380,7 +2381,7 @@ F: hw/block/virtio-blk.c
F: hw/block/dataplane/*
F: include/hw/virtio/virtio-blk-common.h
F: tests/qtest/virtio-blk-test.c
-F: tests/functional/test_x86_64_hotplug_blk.py
+F: tests/functional/x86_64/test_hotplug_blk.py
T: git https://github.com/stefanha/qemu.git block
virtio-ccw
@@ -2604,7 +2605,7 @@ R: Sriram Yagnaraman <sriram.yagnaraman@ericsson.com>
S: Odd Fixes
F: docs/system/devices/igb.rst
F: hw/net/igb*
-F: tests/functional/test_netdev_ethtool.py
+F: tests/functional/x86_64/test_netdev_ethtool.py
F: tests/qtest/igb-test.c
F: tests/qtest/libqos/igb.c
@@ -2713,6 +2714,7 @@ F: hw/display/virtio-vga.*
F: include/hw/virtio/virtio-gpu.h
F: docs/system/devices/virtio-gpu.rst
F: tests/functional/aarch64/test_virt_gpu.py
+F: tests/functional/x86_64/test_virtio_gpu.py
vhost-user-blk
M: Raphael Norwitz <raphael@enfabrica.net>
@@ -3856,7 +3858,7 @@ S: Supported
F: hw/i386/intel_iommu.c
F: hw/i386/intel_iommu_internal.h
F: include/hw/i386/intel_iommu.h
-F: tests/functional/test_intel_iommu.py
+F: tests/functional/x86_64/test_intel_iommu.py
F: tests/qtest/intel-iommu-test.c
AMD-Vi Emulation
@@ -4330,7 +4332,7 @@ F: scripts/ci/
F: tests/docker/
F: tests/vm/
F: tests/lcitool/
-F: tests/functional/test_*_tuxrun.py
+F: tests/functional/*/test_tuxrun.py
F: scripts/archive-source.sh
F: docs/devel/testing/ci*
F: docs/devel/testing/main.rst
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 00d18dba3ce..34e30239a6b 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -34,15 +34,7 @@ subdir('sh4')
subdir('sh4eb')
subdir('sparc')
subdir('sparc64')
-
-test_x86_64_timeouts = {
- 'acpi_bits' : 420,
- 'intel_iommu': 300,
- 'netdev_ethtool' : 180,
- 'virtio_balloon': 120,
- 'x86_64_kvm_xen' : 180,
- 'x86_64_replay' : 480,
-}
+subdir('x86_64')
tests_generic_system = [
'empty_cpu_model',
@@ -56,33 +48,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_x86_64_system_quick = [
- 'cpu_queries',
- 'mem_addr_space',
- 'x86_64_migration',
- 'pc_cpu_hotplug_props',
- 'virtio_version',
- 'x86_cpu_model_versions',
- 'vnc',
- 'memlock',
-]
-
-tests_x86_64_system_thorough = [
- 'acpi_bits',
- 'intel_iommu',
- 'linux_initrd',
- 'x86_64_multiprocess',
- 'netdev_ethtool',
- 'virtio_balloon',
- 'virtio_gpu',
- 'x86_64_hotplug_blk',
- 'x86_64_hotplug_cpu',
- 'x86_64_kvm_xen',
- 'x86_64_replay',
- 'x86_64_reverse_debug',
- 'x86_64_tuxrun',
-]
-
tests_xtensa_system_thorough = [
'xtensa_lx60',
'xtensa_replay',
diff --git a/tests/functional/x86_64/meson.build b/tests/functional/x86_64/meson.build
new file mode 100644
index 00000000000..696a9ecab42
--- /dev/null
+++ b/tests/functional/x86_64/meson.build
@@ -0,0 +1,37 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_x86_64_timeouts = {
+ 'acpi_bits' : 420,
+ 'intel_iommu': 300,
+ 'kvm_xen' : 180,
+ 'netdev_ethtool' : 180,
+ 'replay' : 480,
+ 'virtio_balloon': 120,
+}
+
+tests_x86_64_system_quick = [
+ 'cpu_model_versions',
+ 'cpu_queries',
+ 'mem_addr_space',
+ 'migration',
+ 'pc_cpu_hotplug_props',
+ 'virtio_version',
+ 'vnc',
+ 'memlock',
+]
+
+tests_x86_64_system_thorough = [
+ 'acpi_bits',
+ 'hotplug_blk',
+ 'hotplug_cpu',
+ 'intel_iommu',
+ 'kvm_xen',
+ 'linux_initrd',
+ 'multiprocess',
+ 'netdev_ethtool',
+ 'replay',
+ 'reverse_debug',
+ 'tuxrun',
+ 'virtio_balloon',
+ 'virtio_gpu',
+]
diff --git a/tests/functional/test_acpi_bits.py b/tests/functional/x86_64/test_acpi_bits.py
similarity index 100%
rename from tests/functional/test_acpi_bits.py
rename to tests/functional/x86_64/test_acpi_bits.py
diff --git a/tests/functional/test_x86_cpu_model_versions.py b/tests/functional/x86_64/test_cpu_model_versions.py
similarity index 100%
rename from tests/functional/test_x86_cpu_model_versions.py
rename to tests/functional/x86_64/test_cpu_model_versions.py
diff --git a/tests/functional/test_cpu_queries.py b/tests/functional/x86_64/test_cpu_queries.py
similarity index 100%
rename from tests/functional/test_cpu_queries.py
rename to tests/functional/x86_64/test_cpu_queries.py
diff --git a/tests/functional/test_x86_64_hotplug_blk.py b/tests/functional/x86_64/test_hotplug_blk.py
similarity index 100%
rename from tests/functional/test_x86_64_hotplug_blk.py
rename to tests/functional/x86_64/test_hotplug_blk.py
diff --git a/tests/functional/test_x86_64_hotplug_cpu.py b/tests/functional/x86_64/test_hotplug_cpu.py
similarity index 100%
rename from tests/functional/test_x86_64_hotplug_cpu.py
rename to tests/functional/x86_64/test_hotplug_cpu.py
diff --git a/tests/functional/test_intel_iommu.py b/tests/functional/x86_64/test_intel_iommu.py
similarity index 100%
rename from tests/functional/test_intel_iommu.py
rename to tests/functional/x86_64/test_intel_iommu.py
diff --git a/tests/functional/test_x86_64_kvm_xen.py b/tests/functional/x86_64/test_kvm_xen.py
similarity index 100%
rename from tests/functional/test_x86_64_kvm_xen.py
rename to tests/functional/x86_64/test_kvm_xen.py
diff --git a/tests/functional/test_linux_initrd.py b/tests/functional/x86_64/test_linux_initrd.py
similarity index 100%
rename from tests/functional/test_linux_initrd.py
rename to tests/functional/x86_64/test_linux_initrd.py
diff --git a/tests/functional/test_mem_addr_space.py b/tests/functional/x86_64/test_mem_addr_space.py
similarity index 100%
rename from tests/functional/test_mem_addr_space.py
rename to tests/functional/x86_64/test_mem_addr_space.py
diff --git a/tests/functional/test_memlock.py b/tests/functional/x86_64/test_memlock.py
similarity index 100%
rename from tests/functional/test_memlock.py
rename to tests/functional/x86_64/test_memlock.py
diff --git a/tests/functional/test_x86_64_migration.py b/tests/functional/x86_64/test_migration.py
similarity index 100%
rename from tests/functional/test_x86_64_migration.py
rename to tests/functional/x86_64/test_migration.py
diff --git a/tests/functional/test_x86_64_multiprocess.py b/tests/functional/x86_64/test_multiprocess.py
similarity index 100%
rename from tests/functional/test_x86_64_multiprocess.py
rename to tests/functional/x86_64/test_multiprocess.py
diff --git a/tests/functional/test_netdev_ethtool.py b/tests/functional/x86_64/test_netdev_ethtool.py
similarity index 100%
rename from tests/functional/test_netdev_ethtool.py
rename to tests/functional/x86_64/test_netdev_ethtool.py
diff --git a/tests/functional/test_pc_cpu_hotplug_props.py b/tests/functional/x86_64/test_pc_cpu_hotplug_props.py
similarity index 100%
rename from tests/functional/test_pc_cpu_hotplug_props.py
rename to tests/functional/x86_64/test_pc_cpu_hotplug_props.py
diff --git a/tests/functional/test_x86_64_replay.py b/tests/functional/x86_64/test_replay.py
similarity index 100%
rename from tests/functional/test_x86_64_replay.py
rename to tests/functional/x86_64/test_replay.py
diff --git a/tests/functional/test_x86_64_reverse_debug.py b/tests/functional/x86_64/test_reverse_debug.py
similarity index 100%
rename from tests/functional/test_x86_64_reverse_debug.py
rename to tests/functional/x86_64/test_reverse_debug.py
diff --git a/tests/functional/test_x86_64_tuxrun.py b/tests/functional/x86_64/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_x86_64_tuxrun.py
rename to tests/functional/x86_64/test_tuxrun.py
diff --git a/tests/functional/test_virtio_balloon.py b/tests/functional/x86_64/test_virtio_balloon.py
similarity index 100%
rename from tests/functional/test_virtio_balloon.py
rename to tests/functional/x86_64/test_virtio_balloon.py
diff --git a/tests/functional/test_virtio_gpu.py b/tests/functional/x86_64/test_virtio_gpu.py
similarity index 100%
rename from tests/functional/test_virtio_gpu.py
rename to tests/functional/x86_64/test_virtio_gpu.py
diff --git a/tests/functional/test_virtio_version.py b/tests/functional/x86_64/test_virtio_version.py
similarity index 100%
rename from tests/functional/test_virtio_version.py
rename to tests/functional/x86_64/test_virtio_version.py
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 28/31] tests/functional: Move xtensa tests into target-specific folder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (26 preceding siblings ...)
2025-08-27 7:54 ` [PULL 27/31] tests/functional: Move x86_64 tests into target-specific folder Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 29/31] tests/functional: Move the generic tests to a subfolder Thomas Huth
` (3 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
xtensa tests into a target-specific subfolder.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-24-thuth@redhat.com>
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 6 +-----
tests/functional/xtensa/meson.build | 6 ++++++
.../functional/{test_xtensa_lx60.py => xtensa/test_lx60.py} | 0
.../{test_xtensa_replay.py => xtensa/test_replay.py} | 0
5 files changed, 8 insertions(+), 6 deletions(-)
create mode 100644 tests/functional/xtensa/meson.build
rename tests/functional/{test_xtensa_lx60.py => xtensa/test_lx60.py} (100%)
rename tests/functional/{test_xtensa_replay.py => xtensa/test_replay.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7b1a94f696c..792d2d6f2de 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2005,7 +2005,7 @@ S: Maintained
F: hw/xtensa/xtfpga.c
F: hw/net/opencores_eth.c
F: include/hw/xtensa/mx_pic.h
-F: tests/functional/test_xtensa_lx60.py
+F: tests/functional/xtensa/test_lx60.py
Devices
-------
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 34e30239a6b..b1eec16add8 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -35,6 +35,7 @@ subdir('sh4eb')
subdir('sparc')
subdir('sparc64')
subdir('x86_64')
+subdir('xtensa')
tests_generic_system = [
'empty_cpu_model',
@@ -48,11 +49,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_xtensa_system_thorough = [
- 'xtensa_lx60',
- 'xtensa_replay',
-]
-
precache_all = []
foreach speed : ['quick', 'thorough']
foreach dir : target_dirs
diff --git a/tests/functional/xtensa/meson.build b/tests/functional/xtensa/meson.build
new file mode 100644
index 00000000000..d61d82a1356
--- /dev/null
+++ b/tests/functional/xtensa/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_xtensa_system_thorough = [
+ 'lx60',
+ 'replay',
+]
diff --git a/tests/functional/test_xtensa_lx60.py b/tests/functional/xtensa/test_lx60.py
similarity index 100%
rename from tests/functional/test_xtensa_lx60.py
rename to tests/functional/xtensa/test_lx60.py
diff --git a/tests/functional/test_xtensa_replay.py b/tests/functional/xtensa/test_replay.py
similarity index 100%
rename from tests/functional/test_xtensa_replay.py
rename to tests/functional/xtensa/test_replay.py
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 29/31] tests/functional: Move the generic tests to a subfolder
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (27 preceding siblings ...)
2025-08-27 7:54 ` [PULL 28/31] tests/functional: Move xtensa " Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 30/31] MAINTAINERS: Adjust wildcards for the migration, multiprocess and replay tests Thomas Huth
` (2 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson,
Pierrick Bouvier
From: Thomas Huth <thuth@redhat.com>
This also removes the line for using tests from the main folder
since we do not have any tests left here. And while we're at it,
also mark the vnc test as generic now since it is not specific to x86.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-25-thuth@redhat.com>
---
MAINTAINERS | 8 ++++----
tests/functional/generic/meson.build | 14 ++++++++++++++
.../{ => generic}/test_empty_cpu_model.py | 0
.../{ => generic}/test_info_usernet.py | 0
tests/functional/{ => generic}/test_version.py | 0
tests/functional/{ => generic}/test_vnc.py | 0
tests/functional/meson.build | 17 ++---------------
tests/functional/x86_64/meson.build | 1 -
8 files changed, 20 insertions(+), 20 deletions(-)
create mode 100644 tests/functional/generic/meson.build
rename tests/functional/{ => generic}/test_empty_cpu_model.py (100%)
rename tests/functional/{ => generic}/test_info_usernet.py (100%)
rename tests/functional/{ => generic}/test_version.py (100%)
rename tests/functional/{ => generic}/test_vnc.py (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 792d2d6f2de..625fe67b41d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1976,7 +1976,7 @@ F: include/hw/core/cpu.h
F: include/hw/cpu/cluster.h
F: include/system/numa.h
F: tests/functional/x86_64/test_cpu_queries.py
-F: tests/functional/test_empty_cpu_model.py
+F: tests/functional/generic/test_empty_cpu_model.py
F: tests/unit/test-smp-parse.c
T: git https://gitlab.com/ehabkost/qemu.git machine-next
@@ -2197,7 +2197,7 @@ S: Odd Fixes
F: hw/net/
F: include/hw/net/
F: tests/qtest/virtio-net-test.c
-F: tests/functional/test_info_usernet.py
+F: tests/functional/generic/test_info_usernet.py
F: docs/system/virtio-net-failover.rst
T: git https://github.com/jasowang/qemu.git net
@@ -3134,7 +3134,7 @@ S: Supported
F: include/qemu/option.h
F: tests/unit/test-keyval.c
F: tests/unit/test-qemu-opts.c
-F: tests/functional/test_version.py
+F: tests/functional/generic/test_version.py
F: util/keyval.c
F: util/qemu-option.c
@@ -3252,7 +3252,7 @@ F: include/ui/
F: qapi/ui.json
F: util/drm.c
F: docs/devel/ui.rst
-F: tests/functional/test_vnc.py
+F: tests/functional/generic/test_vnc.py
Cocoa graphics
M: Peter Maydell <peter.maydell@linaro.org>
diff --git a/tests/functional/generic/meson.build b/tests/functional/generic/meson.build
new file mode 100644
index 00000000000..013cc96fbf8
--- /dev/null
+++ b/tests/functional/generic/meson.build
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_generic_system = [
+ 'empty_cpu_model',
+ 'info_usernet',
+ 'version',
+ 'vnc',
+]
+
+tests_generic_linuxuser = [
+]
+
+tests_generic_bsduser = [
+]
diff --git a/tests/functional/test_empty_cpu_model.py b/tests/functional/generic/test_empty_cpu_model.py
similarity index 100%
rename from tests/functional/test_empty_cpu_model.py
rename to tests/functional/generic/test_empty_cpu_model.py
diff --git a/tests/functional/test_info_usernet.py b/tests/functional/generic/test_info_usernet.py
similarity index 100%
rename from tests/functional/test_info_usernet.py
rename to tests/functional/generic/test_info_usernet.py
diff --git a/tests/functional/test_version.py b/tests/functional/generic/test_version.py
similarity index 100%
rename from tests/functional/test_version.py
rename to tests/functional/generic/test_version.py
diff --git a/tests/functional/test_vnc.py b/tests/functional/generic/test_vnc.py
similarity index 100%
rename from tests/functional/test_vnc.py
rename to tests/functional/generic/test_vnc.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index b1eec16add8..2a0c5aa1418 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -36,18 +36,7 @@ subdir('sparc')
subdir('sparc64')
subdir('x86_64')
subdir('xtensa')
-
-tests_generic_system = [
- 'empty_cpu_model',
- 'info_usernet',
- 'version',
-]
-
-tests_generic_linuxuser = [
-]
-
-tests_generic_bsduser = [
-]
+subdir('generic')
precache_all = []
foreach speed : ['quick', 'thorough']
@@ -90,9 +79,7 @@ foreach speed : ['quick', 'thorough']
foreach test : target_tests
testname = '@0@-@1@'.format(target_base, test)
- if fs.exists('test_' + test + '.py')
- testfile = 'test_' + test + '.py'
- elif fs.exists('generic' / 'test_' + test + '.py')
+ if fs.exists('generic' / 'test_' + test + '.py')
testfile = 'generic' / 'test_' + test + '.py'
else
testfile = target_base / 'test_' + test + '.py'
diff --git a/tests/functional/x86_64/meson.build b/tests/functional/x86_64/meson.build
index 696a9ecab42..d0b4667bb8a 100644
--- a/tests/functional/x86_64/meson.build
+++ b/tests/functional/x86_64/meson.build
@@ -16,7 +16,6 @@ tests_x86_64_system_quick = [
'migration',
'pc_cpu_hotplug_props',
'virtio_version',
- 'vnc',
'memlock',
]
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 30/31] MAINTAINERS: Adjust wildcards for the migration, multiprocess and replay tests
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (28 preceding siblings ...)
2025-08-27 7:54 ` [PULL 29/31] tests/functional: Move the generic tests to a subfolder Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 7:54 ` [PULL 31/31] tests/functional: Mark main in QemuBaseTest class as a static method Thomas Huth
2025-08-27 20:26 ` [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Richard Henderson
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson
From: Thomas Huth <thuth@redhat.com>
Now that we moved the tests into subfolders, we have to adjust the
wildcards accordingly.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250819112403.432587-26-thuth@redhat.com>
---
MAINTAINERS | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 625fe67b41d..a64b5b849b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3604,7 +3604,8 @@ F: include/migration/
F: include/qemu/userfaultfd.h
F: migration/
F: scripts/vmstate-static-checker.py
-F: tests/functional/*migration.py
+F: tests/functional/migration.py
+F: tests/functional/*/*migration.py
F: tests/vmstate-static-checker-data/
F: tests/qtest/migration/
F: tests/qtest/migration-*
@@ -3773,8 +3774,10 @@ F: include/system/replay.h
F: docs/devel/replay.rst
F: docs/system/replay.rst
F: stubs/replay.c
-F: tests/functional/*reverse_debug*.py
-F: tests/functional/*replay*.py
+F: tests/functional/replay_kernel.py
+F: tests/functional/reverse_debugging.py
+F: tests/functional/*/*replay*.py
+F: tests/functional/*/*reverse_debug*.py
F: qapi/replay.json
IOVA Tree
@@ -4293,7 +4296,8 @@ F: hw/remote/vfio-user-obj.c
F: include/hw/remote/vfio-user-obj.h
F: hw/remote/iommu.c
F: include/hw/remote/iommu.h
-F: tests/functional/*multiprocess.py
+F: tests/functional/multiprocess.py
+F: tests/functional/*/*multiprocess.py
VFIO-USER:
M: John Levon <john.levon@nutanix.com>
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PULL 31/31] tests/functional: Mark main in QemuBaseTest class as a static method
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (29 preceding siblings ...)
2025-08-27 7:54 ` [PULL 30/31] MAINTAINERS: Adjust wildcards for the migration, multiprocess and replay tests Thomas Huth
@ 2025-08-27 7:54 ` Thomas Huth
2025-08-27 20:26 ` [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Richard Henderson
31 siblings, 0 replies; 33+ messages in thread
From: Thomas Huth @ 2025-08-27 7:54 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Hajnoczi, Peter Maydell, Richard Henderson, Gustavo Romero,
Daniel P. Berrangé
From: Gustavo Romero <gustavo.romero@linaro.org>
The main() method in the QemuBaseTest class has no parameters but is
defined as a regular method. Currently, this does not cause any issues
because in the functional tests main() is always called directly from
QemuBaseTest (never from instances), but the way this method is defined
makes its signature wrong, implying a 'self'. Hence, it's best practice
to define such a method as a static method, so decorate it with
@staticmethod.
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Message-ID: <20250819143916.4138035-4-gustavo.romero@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/functional/qemu_test/testcase.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu_test/testcase.py
index 5caf7b13fe3..fbeb1710587 100644
--- a/tests/functional/qemu_test/testcase.py
+++ b/tests/functional/qemu_test/testcase.py
@@ -235,6 +235,7 @@ def tearDown(self):
self.log.removeHandler(self._log_fh)
self._log_fh.close()
+ @staticmethod
def main():
warnings.simplefilter("default")
os.environ["PYTHONWARNINGS"] = "default"
--
2.50.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PULL 00/31] First pull request with functional tests patches for QEMU 10.2
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
` (30 preceding siblings ...)
2025-08-27 7:54 ` [PULL 31/31] tests/functional: Mark main in QemuBaseTest class as a static method Thomas Huth
@ 2025-08-27 20:26 ` Richard Henderson
31 siblings, 0 replies; 33+ messages in thread
From: Richard Henderson @ 2025-08-27 20:26 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: Stefan Hajnoczi, Peter Maydell
On 8/27/25 17:54, Thomas Huth wrote:
> Hi!
>
> The following changes since commit 88f72048d2f5835a1b9eaba690c7861393aef283:
>
> Update version for the v10.1.0-rc4 release (2025-08-19 14:05:56 -0400)
>
> are available in the Git repository at:
>
> https://gitlab.com/thuth/qemu.git tags/pull-request-2025-08-27
>
> for you to fetch changes up to 0ac3c314130eff8e3ea9860fe3202908a7746225:
>
> tests/functional: Mark main in QemuBaseTest class as a static method (2025-08-27 09:46:55 +0200)
>
> ----------------------------------------------------------------
> * Add v10.2 compat machines
> * Move functional tests to target specific subfolders
> * Fix some issues in functional tests
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/10.2 as appropriate.
r~
^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2025-08-27 20:28 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-27 7:54 [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Thomas Huth
2025-08-27 7:54 ` [PULL 01/31] hw: add compat machines for 10.2 Thomas Huth
2025-08-27 7:54 ` [PULL 02/31] CI: Use mingw-w64-x86_64-curl-winssl instead of mingw-w64-x86_64-curl for Windows build Thomas Huth
2025-08-27 7:54 ` [PULL 03/31] tests/functional/test_aarch64_virt_gpu: Skip test if EGL won't initialize Thomas Huth
2025-08-27 7:54 ` [PULL 04/31] tests/functional: Fix reverse_debugging asset precaching Thomas Huth
2025-08-27 7:54 ` [PULL 05/31] tests/functional: Use more fine-grained locking when looking for free ports Thomas Huth
2025-08-27 7:54 ` [PULL 06/31] tests/functional: Rework the migration test to have target-specific files Thomas Huth
2025-08-27 7:54 ` [PULL 07/31] tests/functional: Rework the multiprocess " Thomas Huth
2025-08-27 7:54 ` [PULL 08/31] tests/functional/meson.build: Split timeout settings by target Thomas Huth
2025-08-27 7:54 ` [PULL 09/31] tests/functional/meson.build: Allow tests to reside in subfolders Thomas Huth
2025-08-27 7:54 ` [PULL 10/31] tests/functional: Move aarch64 tests into architecture specific folder Thomas Huth
2025-08-27 7:54 ` [PULL 11/31] tests/functional: Move alpha " Thomas Huth
2025-08-27 7:54 ` [PULL 12/31] tests/functional: Move arm " Thomas Huth
2025-08-27 7:54 ` [PULL 13/31] tests/functional: Move avr " Thomas Huth
2025-08-27 7:54 ` [PULL 14/31] tests/functional: Move hppa " Thomas Huth
2025-08-27 7:54 ` [PULL 15/31] tests/functional: Move i386 " Thomas Huth
2025-08-27 7:54 ` [PULL 16/31] tests/functional: Move loongarch64 " Thomas Huth
2025-08-27 7:54 ` [PULL 17/31] tests/functional: Move m68k " Thomas Huth
2025-08-27 7:54 ` [PULL 18/31] tests/functional: Move microblaze " Thomas Huth
2025-08-27 7:54 ` [PULL 19/31] tests/functional: Move mips tests into target-specific folders Thomas Huth
2025-08-27 7:54 ` [PULL 20/31] tests/functional: Move or1k " Thomas Huth
2025-08-27 7:54 ` [PULL 21/31] tests/functional: Move ppc/ppc64 " Thomas Huth
2025-08-27 7:54 ` [PULL 22/31] tests/functional: Move riscv32/riscv64 " Thomas Huth
2025-08-27 7:54 ` [PULL 23/31] tests/functional: Move rx test " Thomas Huth
2025-08-27 7:54 ` [PULL 24/31] tests/functional: Move s390x tests " Thomas Huth
2025-08-27 7:54 ` [PULL 25/31] tests/functional: Move sh4/sh4eb " Thomas Huth
2025-08-27 7:54 ` [PULL 26/31] tests/functional: Move sparc/sparc64 " Thomas Huth
2025-08-27 7:54 ` [PULL 27/31] tests/functional: Move x86_64 tests into target-specific folder Thomas Huth
2025-08-27 7:54 ` [PULL 28/31] tests/functional: Move xtensa " Thomas Huth
2025-08-27 7:54 ` [PULL 29/31] tests/functional: Move the generic tests to a subfolder Thomas Huth
2025-08-27 7:54 ` [PULL 30/31] MAINTAINERS: Adjust wildcards for the migration, multiprocess and replay tests Thomas Huth
2025-08-27 7:54 ` [PULL 31/31] tests/functional: Mark main in QemuBaseTest class as a static method Thomas Huth
2025-08-27 20:26 ` [PULL 00/31] First pull request with functional tests patches for QEMU 10.2 Richard Henderson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).