tests/functional: Move tests into architecture specific folders
Subsystems (7)
RFC PATCH 1/1 tests/functional: Move tests into architecture specific folders
This patch tackles two issues. First, the tests/functional folder has become quite crowded already, some restructuring would be helpful here. Second, we currently encode the target architecture twice in the test names since a lot of the test file names contain the target, too. This contributes to the very long output lines when running "make check-functional".
So let's move the individual test files to target specific folders now. Then we can drop the target from the file name (and thus from the test name).
Before the change, the output looked like this:
...
195/236 qemu:func-thorough+func-microblazeel-thorough+thorough / func-microblazeel-microblazeel_s3adsp1800 OK 2.00s 2 subtests passed 196/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-microblaze_replay OK 2.78s 1 subtests passed 197/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-microblaze_s3adsp1800 OK 2.02s 2 subtests passed 198/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_fuloong2e OK 1.95s 1 subtests passed 199/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_loongson3v SKIP 0.07s 0 subtests passed 200/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_tuxrun OK 8.52s 1 subtests passed
...
After this change, it gets a little bit shorter:
...
195/236 qemu:func-thorough+func-microblazeel-thorough+thorough / func-microblazeel-s3adsp1800 OK 2.12s 2 subtests passed 196/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-replay OK 2.90s 1 subtests passed 197/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-s3adsp1800 OK 2.07s 2 subtests passed 198/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-fuloong2e OK 2.05s 1 subtests passed 199/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-loongson3v SKIP 0.07s 0 subtests passed 200/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-tuxrun OK 8.84s 1 subtests passed
...
Tests that can be used for multiple but not all targets (like the "migration" test) are now handled via symlinks in the target folders.
---
Note: Marked as RFC since I'm not that happy about the symlinks yet ...
if someone has a better idea, please let me know!
Also the update to the MAINTAINERS file is still missing - I'll add that once we agreed on whether this patch is a good idea or not.
tests/functional/aarch64/meson.build | 47 +++
.../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
tests/functional/aarch64/test_migration.py | 1 +
tests/functional/aarch64/test_multiprocess.py | 1 +
.../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/alpha/meson.build | 9 +
.../test_clipper.py} | 0
tests/functional/alpha/test_migration.py | 1 +
.../test_replay.py} | 0
tests/functional/arm/meson.build | 61 +++
.../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_microbit.py} | 0
tests/functional/arm/test_migration.py | 1 +
.../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/avr/meson.build | 5 +
.../test_mega2560.py} | 0
.../{test_avr_uno.py => avr/test_uno.py} | 0
.../{ => generic}/test_empty_cpu_model.py | 0
.../{ => generic}/test_info_usernet.py | 0
.../{ => generic}/test_migration.py | 0
.../functional/{ => generic}/test_version.py | 0
tests/functional/hppa/meson.build | 4 +
.../test_seabios.py} | 0
tests/functional/i386/meson.build | 9 +
tests/functional/i386/test_migration.py | 1 +
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
tests/functional/loongarch64/meson.build | 4 +
.../test_virt.py} | 0
tests/functional/m68k/meson.build | 8 +
.../test_mcf5208evb.py} | 0
.../test_nextcube.py} | 0
.../{test_m68k_q800.py => m68k/test_q800.py} | 0
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
tests/functional/meson.build | 364 ++----------------
tests/functional/microblaze/meson.build | 5 +
.../test_replay.py} | 0
.../test_s3adsp1800.py} | 0
tests/functional/microblazeel/meson.build | 4 +
.../test_s3adsp1800.py} | 2 +-
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
tests/functional/or1k/meson.build | 5 +
.../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_bamboo.py} | 0
.../{test_ppc_mac.py => ppc/test_mac.py} | 0
tests/functional/ppc/test_migration.py | 1 +
.../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
tests/functional/ppc64/test_migration.py | 1 +
.../test_powernv.py} | 0
.../test_pseries.py} | 0
.../test_replay.py} | 0
.../test_reverse_debug.py} | 0
.../test_tuxrun.py} | 0
tests/functional/riscv32/meson.build | 9 +
tests/functional/riscv32/test_migration.py | 1 +
tests/functional/riscv32/test_opensbi.py | 1 +
.../test_tuxrun.py} | 0
tests/functional/riscv64/meson.build | 13 +
.../test_opensbi.py} | 0
.../test_tuxrun.py} | 0
tests/functional/rx/meson.build | 4 +
.../{test_rx_gdbsim.py => rx/test_gdbsim.py} | 0
tests/functional/s390x/meson.build | 12 +
.../test_ccw_virtio.py} | 0
.../test_replay.py} | 0
.../test_topology.py} | 0
.../test_tuxrun.py} | 0
tests/functional/sh4/meson.build | 10 +
.../{test_sh4_r2d.py => sh4/test_r2d.py} | 0
.../test_tuxrun.py} | 0
tests/functional/sh4eb/meson.build | 4 +
.../{test_sh4eb_r2d.py => sh4eb/test_r2d.py} | 0
tests/functional/sparc/meson.build | 9 +
tests/functional/sparc/test_migration.py | 1 +
.../test_replay.py} | 0
.../test_sun4m.py} | 0
tests/functional/sparc64/meson.build | 9 +
tests/functional/sparc64/test_migration.py | 1 +
.../test_sun4u.py} | 0
.../test_tuxrun.py} | 0
tests/functional/x86_64/meson.build | 37 ++
.../functional/{ => x86_64}/test_acpi_bits.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
tests/functional/x86_64/test_migration.py | 1 +
.../{ => x86_64}/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
tests/functional/{ => x86_64}/test_vnc.py | 0
.../test_x86_cpu_model_versions.py | 0
tests/functional/xtensa/meson.build | 5 +
.../test_lx60.py} | 0
.../test_replay.py} | 0
180 files changed, 426 insertions(+), 333 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%)
create mode 120000 tests/functional/aarch64/test_migration.py
create mode 120000 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} (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%)
create mode 100644 tests/functional/alpha/meson.build
rename tests/functional/{test_alpha_clipper.py => alpha/test_clipper.py} (100%)
create mode 120000 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%)
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%)
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_microbit.py => arm/test_microbit.py} (100%)
create mode 120000 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%)
rename tests/functional/{ => generic}/test_empty_cpu_model.py (100%)
rename tests/functional/{ => generic}/test_info_usernet.py (100%)
rename tests/functional/{ => generic}/test_migration.py (100%)
rename tests/functional/{ => generic}/test_version.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 120000 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%)
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%)
rename tests/functional/{test_mipsel_tuxrun.py => mipsel/test_tuxrun.py} (100%)
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 120000 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%)
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 120000 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 120000 tests/functional/riscv32/test_migration.py
create mode 120000 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_riscv_opensbi.py => riscv64/test_opensbi.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_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 120000 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 120000 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/{ => 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 120000 tests/functional/x86_64/test_migration.py
rename tests/functional/{ => 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%)
rename tests/functional/{ => x86_64}/test_vnc.py (100%)
rename tests/functional/{ => x86_64}/test_x86_cpu_model_versions.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%)tests/functional/aarch64/meson.build new file +47 -0
@@ -0,0 +1,47 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +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', + 'raspi3', + 'raspi4', + 'replay', + 'reverse_debug', + 'rme_virt', + 'rme_sbsaref', + 'sbsaref', + 'sbsaref_alpine', + 'sbsaref_freebsd', + 'smmu', + 'tcg_plugins', + 'tuxrun', + 'virt', + 'virt_gpu', + 'xen', + 'xlnx_versal', + 'multiprocess', +]
tests/functional/aarch64/test_aspeed_ast2700.py renamed from tests/functional/test_aarch64_aspeed_ast2700.py +0 -0
tests/functional/aarch64/test_aspeed_ast2700fc.py renamed from tests/functional/test_aarch64_aspeed_ast2700fc.py +0 -0
tests/functional/aarch64/test_device_passthrough.py renamed from tests/functional/test_aarch64_device_passthrough.py +0 -0
tests/functional/aarch64/test_hotplug_pci.py renamed from tests/functional/test_aarch64_hotplug_pci.py +0 -0
tests/functional/aarch64/test_imx8mp_evk.py renamed from tests/functional/test_aarch64_imx8mp_evk.py +0 -0
tests/functional/aarch64/test_migration.py new file +1 -0
@@ -0,0 +1 @@ +../generic/test_migration.py
tests/functional/aarch64/test_multiprocess.py new file +1 -0
@@ -0,0 +1 @@ +../x86_64/test_multiprocess.py
tests/functional/aarch64/test_raspi3.py renamed from tests/functional/test_aarch64_raspi3.py +0 -0
tests/functional/aarch64/test_raspi4.py renamed from tests/functional/test_aarch64_raspi4.py +0 -0
tests/functional/aarch64/test_replay.py renamed from tests/functional/test_aarch64_replay.py +0 -0
tests/functional/aarch64/test_reverse_debug.py renamed from tests/functional/test_aarch64_reverse_debug.py +0 -0
tests/functional/aarch64/test_rme_sbsaref.py renamed from tests/functional/test_aarch64_rme_sbsaref.py +1 -1
@@ -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):
tests/functional/aarch64/test_rme_virt.py renamed from tests/functional/test_aarch64_rme_virt.py +0 -0
tests/functional/aarch64/test_sbsaref.py renamed from tests/functional/test_aarch64_sbsaref.py +0 -0
tests/functional/aarch64/test_sbsaref_alpine.py renamed from tests/functional/test_aarch64_sbsaref_alpine.py +1 -1
@@ -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):
tests/functional/aarch64/test_sbsaref_freebsd.py renamed from tests/functional/test_aarch64_sbsaref_freebsd.py +1 -1
@@ -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):
tests/functional/aarch64/test_smmu.py renamed from tests/functional/test_aarch64_smmu.py +0 -0
tests/functional/aarch64/test_tcg_plugins.py renamed from tests/functional/test_aarch64_tcg_plugins.py +0 -0
tests/functional/aarch64/test_tuxrun.py renamed from tests/functional/test_aarch64_tuxrun.py +0 -0
tests/functional/aarch64/test_virt.py renamed from tests/functional/test_aarch64_virt.py +0 -0
tests/functional/aarch64/test_virt_gpu.py renamed from tests/functional/test_aarch64_virt_gpu.py +0 -0
tests/functional/aarch64/test_xen.py renamed from tests/functional/test_aarch64_xen.py +0 -0
tests/functional/aarch64/test_xlnx_versal.py renamed from tests/functional/test_aarch64_xlnx_versal.py +0 -0
tests/functional/alpha/meson.build new file +9 -0
@@ -0,0 +1,9 @@ + +tests_alpha_system_quick = [ + 'migration', +] + +tests_alpha_system_thorough = [ + 'clipper', + 'replay', +]
tests/functional/alpha/test_clipper.py renamed from tests/functional/test_alpha_clipper.py +0 -0
tests/functional/alpha/test_migration.py new file +1 -0
@@ -0,0 +1 @@ +../generic/test_migration.py
tests/functional/alpha/test_replay.py renamed from tests/functional/test_alpha_replay.py +0 -0
tests/functional/arm/meson.build new file +61 -0
61 lines not on this page · raw message
tests/functional/arm/test_aspeed_ast1030.py renamed from tests/functional/test_arm_aspeed_ast1030.py +0 -0
tests/functional/arm/test_aspeed_ast2500.py renamed from tests/functional/test_arm_aspeed_ast2500.py +0 -0
tests/functional/arm/test_aspeed_ast2600.py renamed from tests/functional/test_arm_aspeed_ast2600.py +0 -0
tests/functional/arm/test_aspeed_bletchley.py renamed from tests/functional/test_arm_aspeed_bletchley.py +0 -0
tests/functional/arm/test_aspeed_catalina.py renamed from tests/functional/test_arm_aspeed_catalina.py +0 -0
tests/functional/arm/test_aspeed_gb200nvl_bmc.py renamed from tests/functional/test_arm_aspeed_gb200nvl_bmc.py +0 -0
tests/functional/arm/test_aspeed_palmetto.py renamed from tests/functional/test_arm_aspeed_palmetto.py +0 -0
tests/functional/arm/test_aspeed_rainier.py renamed from tests/functional/test_arm_aspeed_rainier.py +0 -0
tests/functional/arm/test_aspeed_romulus.py renamed from tests/functional/test_arm_aspeed_romulus.py +0 -0
tests/functional/arm/test_aspeed_witherspoon.py renamed from tests/functional/test_arm_aspeed_witherspoon.py +0 -0
tests/functional/arm/test_bflt.py renamed from tests/functional/test_arm_bflt.py +0 -0
tests/functional/arm/test_bpim2u.py renamed from tests/functional/test_arm_bpim2u.py +0 -0
tests/functional/arm/test_canona1100.py renamed from tests/functional/test_arm_canona1100.py +0 -0
tests/functional/arm/test_collie.py renamed from tests/functional/test_arm_collie.py +0 -0
tests/functional/arm/test_cubieboard.py renamed from tests/functional/test_arm_cubieboard.py +0 -0
tests/functional/arm/test_emcraft_sf2.py renamed from tests/functional/test_arm_emcraft_sf2.py +0 -0
tests/functional/arm/test_integratorcp.py renamed from tests/functional/test_arm_integratorcp.py +0 -0
tests/functional/arm/test_microbit.py renamed from tests/functional/test_arm_microbit.py +0 -0
tests/functional/arm/test_migration.py new file +1 -0
@@ -0,0 +1 @@ +../generic/test_migration.py
tests/functional/arm/test_orangepi.py renamed from tests/functional/test_arm_orangepi.py +0 -0
tests/functional/arm/test_quanta_gsj.py renamed from tests/functional/test_arm_quanta_gsj.py +0 -0
tests/functional/arm/test_raspi2.py renamed from tests/functional/test_arm_raspi2.py +0 -0
tests/functional/arm/test_realview.py renamed from tests/functional/test_arm_realview.py +0 -0
tests/functional/arm/test_replay.py renamed from tests/functional/test_arm_replay.py +0 -0
tests/functional/arm/test_smdkc210.py renamed from tests/functional/test_arm_smdkc210.py +0 -0
tests/functional/arm/test_stellaris.py renamed from tests/functional/test_arm_stellaris.py +0 -0
tests/functional/arm/test_sx1.py renamed from tests/functional/test_arm_sx1.py +0 -0
tests/functional/arm/test_tuxrun.py renamed from tests/functional/test_arm_tuxrun.py +0 -0
tests/functional/arm/test_vexpress.py renamed from tests/functional/test_arm_vexpress.py +0 -0
tests/functional/arm/test_virt.py renamed from tests/functional/test_arm_virt.py +0 -0
tests/functional/avr/meson.build new file +5 -0
@@ -0,0 +1,5 @@ + +tests_avr_system_thorough = [ + 'mega2560', + 'uno', +]
tests/functional/avr/test_mega2560.py renamed from tests/functional/test_avr_mega2560.py +0 -0
tests/functional/avr/test_uno.py renamed from tests/functional/test_avr_uno.py +0 -0
tests/functional/generic/test_empty_cpu_model.py renamed from tests/functional/test_empty_cpu_model.py +0 -0
tests/functional/generic/test_info_usernet.py renamed from tests/functional/test_info_usernet.py +0 -0
tests/functional/generic/test_migration.py renamed from tests/functional/test_migration.py +0 -0
tests/functional/generic/test_version.py renamed from tests/functional/test_version.py +0 -0
tests/functional/hppa/meson.build new file +4 -0
@@ -0,0 +1,4 @@ + +tests_hppa_system_quick = [ + 'seabios', +]
tests/functional/hppa/test_seabios.py renamed from tests/functional/test_hppa_seabios.py +0 -0
tests/functional/i386/meson.build new file +9 -0
@@ -0,0 +1,9 @@ + +tests_i386_system_quick = [ + 'migration', +] + +tests_i386_system_thorough = [ + 'replay', + 'tuxrun', +]
tests/functional/i386/test_migration.py new file +1 -0
@@ -0,0 +1 @@ +../generic/test_migration.py
tests/functional/i386/test_replay.py renamed from tests/functional/test_i386_replay.py +0 -0
tests/functional/i386/test_tuxrun.py renamed from tests/functional/test_i386_tuxrun.py +0 -0
tests/functional/loongarch64/meson.build new file +4 -0
@@ -0,0 +1,4 @@ + +tests_loongarch64_system_thorough = [ + 'virt', +]
tests/functional/loongarch64/test_virt.py renamed from tests/functional/test_loongarch64_virt.py +0 -0
tests/functional/m68k/meson.build new file +8 -0
@@ -0,0 +1,8 @@ + +tests_m68k_system_thorough = [ + 'mcf5208evb', + 'nextcube', + 'replay', + 'q800', + 'tuxrun', +]
tests/functional/m68k/test_mcf5208evb.py renamed from tests/functional/test_m68k_mcf5208evb.py +0 -0
tests/functional/m68k/test_nextcube.py renamed from tests/functional/test_m68k_nextcube.py +0 -0
tests/functional/m68k/test_q800.py renamed from tests/functional/test_m68k_q800.py +0 -0
tests/functional/m68k/test_replay.py renamed from tests/functional/test_m68k_replay.py +0 -0
tests/functional/m68k/test_tuxrun.py renamed from tests/functional/test_m68k_tuxrun.py +0 -0
tests/functional/meson.build +39 -325
394 lines not on this page · raw message
tests/functional/microblaze/meson.build new file +5 -0
@@ -0,0 +1,5 @@ + +tests_microblaze_system_thorough = [ + 'replay', + 's3adsp1800' +]
tests/functional/microblaze/test_replay.py renamed from tests/functional/test_microblaze_replay.py +0 -0
tests/functional/microblaze/test_s3adsp1800.py renamed from tests/functional/test_microblaze_s3adsp1800.py +0 -0
tests/functional/microblazeel/meson.build new file +4 -0
@@ -0,0 +1,4 @@ + +tests_microblazeel_system_thorough = [ + 's3adsp1800' +]
tests/functional/microblazeel/test_s3adsp1800.py renamed from tests/functional/test_microblazeel_s3adsp1800.py +1 -1
@@ -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):
tests/functional/mips/meson.build new file +11 -0
@@ -0,0 +1,11 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_mips_timeouts = { + 'malta' : 480, +} + +tests_mips_system_thorough = [ + 'malta', + 'replay', + 'tuxrun', +]
tests/functional/mips/test_malta.py renamed from tests/functional/test_mips_malta.py +0 -0
tests/functional/mips/test_replay.py renamed from tests/functional/test_mips_replay.py +0 -0
tests/functional/mips/test_tuxrun.py renamed from tests/functional/test_mips_tuxrun.py +0 -0
tests/functional/mips64/meson.build new file +10 -0
@@ -0,0 +1,10 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_mips64_timeouts = { + 'malta' : 240, +} + +tests_mips64_system_thorough = [ + 'malta', + 'tuxrun', +]
tests/functional/mips64/test_malta.py renamed from tests/functional/test_mips64_malta.py +1 -1
@@ -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):
tests/functional/mips64/test_tuxrun.py renamed from tests/functional/test_mips64_tuxrun.py +0 -0
tests/functional/mips64el/meson.build new file +14 -0
@@ -0,0 +1,14 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_mips64el_timeouts = { + 'malta' : 420, + 'replay' : 180, +} + +tests_mips64el_system_thorough = [ + 'fuloong2e', + 'loongson3v', + 'malta', + 'replay', + 'tuxrun', +]
tests/functional/mips64el/test_fuloong2e.py renamed from tests/functional/test_mips64el_fuloong2e.py +0 -0
tests/functional/mips64el/test_loongson3v.py renamed from tests/functional/test_mips64el_loongson3v.py +0 -0
tests/functional/mips64el/test_malta.py renamed from tests/functional/test_mips64el_malta.py +2 -2
@@ -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()
tests/functional/mips64el/test_replay.py renamed from tests/functional/test_mips64el_replay.py +0 -0
tests/functional/mips64el/test_tuxrun.py renamed from tests/functional/test_mips64el_tuxrun.py +0 -0
tests/functional/mipsel/meson.build new file +12 -0
@@ -0,0 +1,12 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_mipsel_timeouts = { + 'malta' : 420, + 'replay' : 480, +} + +tests_mipsel_system_thorough = [ + 'malta', + 'replay', + 'tuxrun', +]
tests/functional/mipsel/test_malta.py renamed from tests/functional/test_mipsel_malta.py +1 -1
@@ -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):
tests/functional/mipsel/test_replay.py renamed from tests/functional/test_mipsel_replay.py +0 -0
tests/functional/mipsel/test_tuxrun.py renamed from tests/functional/test_mipsel_tuxrun.py +0 -0
tests/functional/or1k/meson.build new file +5 -0
@@ -0,0 +1,5 @@ + +tests_or1k_system_thorough = [ + 'replay', + 'sim', +]
tests/functional/or1k/test_replay.py renamed from tests/functional/test_or1k_replay.py +0 -0
tests/functional/or1k/test_sim.py renamed from tests/functional/test_or1k_sim.py +0 -0
tests/functional/ppc/meson.build new file +22 -0
@@ -0,0 +1,22 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +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', +]
tests/functional/ppc/test_40p.py renamed from tests/functional/test_ppc_40p.py +0 -0
tests/functional/ppc/test_74xx.py renamed from tests/functional/test_ppc_74xx.py +0 -0
tests/functional/ppc/test_amiga.py renamed from tests/functional/test_ppc_amiga.py +0 -0
tests/functional/ppc/test_bamboo.py renamed from tests/functional/test_ppc_bamboo.py +0 -0
tests/functional/ppc/test_mac.py renamed from tests/functional/test_ppc_mac.py +0 -0
tests/functional/ppc/test_migration.py new file +1 -0
@@ -0,0 +1 @@ +../generic/test_migration.py
tests/functional/ppc/test_mpc8544ds.py renamed from tests/functional/test_ppc_mpc8544ds.py +0 -0
tests/functional/ppc/test_replay.py renamed from tests/functional/test_ppc_replay.py +0 -0
tests/functional/ppc/test_sam460ex.py renamed from tests/functional/test_ppc_sam460ex.py +0 -0
tests/functional/ppc/test_tuxrun.py renamed from tests/functional/test_ppc_tuxrun.py +0 -0
tests/functional/ppc/test_virtex_ml507.py renamed from tests/functional/test_ppc_virtex_ml507.py +0 -0
tests/functional/ppc64/meson.build new file +25 -0
@@ -0,0 +1,25 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_ppc64_timeouts = { + 'hv' : 1000, + 'powernv' : 480, + 'pseries' : 480, + 'replay' : 210, + 'tuxrun' : 420, + 'mac99' : 120, +} + +tests_ppc64_system_quick = [ + 'migration', +] + +tests_ppc64_system_thorough = [ + 'e500', + 'hv', + 'powernv', + 'pseries', + 'replay', + 'reverse_debug', + 'tuxrun', + 'mac99', +]
tests/functional/ppc64/test_e500.py renamed from tests/functional/test_ppc64_e500.py +0 -0
tests/functional/ppc64/test_hv.py renamed from tests/functional/test_ppc64_hv.py +0 -0
tests/functional/ppc64/test_mac99.py renamed from tests/functional/test_ppc64_mac99.py +0 -0
tests/functional/ppc64/test_migration.py new file +1 -0
@@ -0,0 +1 @@ +../generic/test_migration.py
tests/functional/ppc64/test_powernv.py renamed from tests/functional/test_ppc64_powernv.py +0 -0
tests/functional/ppc64/test_pseries.py renamed from tests/functional/test_ppc64_pseries.py +0 -0
tests/functional/ppc64/test_replay.py renamed from tests/functional/test_ppc64_replay.py +0 -0
tests/functional/ppc64/test_reverse_debug.py renamed from tests/functional/test_ppc64_reverse_debug.py +0 -0
tests/functional/ppc64/test_tuxrun.py renamed from tests/functional/test_ppc64_tuxrun.py +0 -0
tests/functional/riscv32/meson.build new file +9 -0
@@ -0,0 +1,9 @@ + +tests_riscv32_system_quick = [ + 'migration', + 'opensbi', +] + +tests_riscv32_system_thorough = [ + 'tuxrun', +]
tests/functional/riscv32/test_migration.py new file +1 -0
@@ -0,0 +1 @@ +../generic/test_migration.py
tests/functional/riscv32/test_opensbi.py new file +1 -0
@@ -0,0 +1 @@ +../riscv64/test_opensbi.py
tests/functional/riscv32/test_tuxrun.py renamed from tests/functional/test_riscv32_tuxrun.py +0 -0
tests/functional/riscv64/meson.build new file +13 -0
@@ -0,0 +1,13 @@ + +test_riscv64_timeouts = { + 'tuxrun' : 120, +} + +tests_riscv64_system_quick = [ + 'migration', + 'opensbi', +] + +tests_riscv64_system_thorough = [ + 'tuxrun', +]
tests/functional/riscv64/test_opensbi.py renamed from tests/functional/test_riscv_opensbi.py +0 -0
tests/functional/riscv64/test_tuxrun.py renamed from tests/functional/test_riscv64_tuxrun.py +0 -0
tests/functional/rx/meson.build new file +4 -0
@@ -0,0 +1,4 @@ + +tests_rx_system_thorough = [ + 'gdbsim', +]
tests/functional/rx/test_gdbsim.py renamed from tests/functional/test_rx_gdbsim.py +0 -0
tests/functional/s390x/meson.build new file +12 -0
@@ -0,0 +1,12 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_s390x_timeouts = { + 'ccw_virtio' : 420, +} + +tests_s390x_system_thorough = [ + 'ccw_virtio', + 'replay', + 'topology', + 'tuxrun', +]
tests/functional/s390x/test_ccw_virtio.py renamed from tests/functional/test_s390x_ccw_virtio.py +0 -0
tests/functional/s390x/test_replay.py renamed from tests/functional/test_s390x_replay.py +0 -0
tests/functional/s390x/test_topology.py renamed from tests/functional/test_s390x_topology.py +0 -0
tests/functional/s390x/test_tuxrun.py renamed from tests/functional/test_s390x_tuxrun.py +0 -0
tests/functional/sh4/meson.build new file +10 -0
@@ -0,0 +1,10 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_sh4_timeouts = { + 'tuxrun' : 240, +} + +tests_sh4_system_thorough = [ + 'r2d', + 'tuxrun', +]
tests/functional/sh4/test_r2d.py renamed from tests/functional/test_sh4_r2d.py +0 -0
tests/functional/sh4/test_tuxrun.py renamed from tests/functional/test_sh4_tuxrun.py +0 -0
tests/functional/sh4eb/meson.build new file +4 -0
@@ -0,0 +1,4 @@ + +tests_sh4eb_system_thorough = [ + 'r2d', +]
tests/functional/sh4eb/test_r2d.py renamed from tests/functional/test_sh4eb_r2d.py +0 -0
tests/functional/sparc/meson.build new file +9 -0
@@ -0,0 +1,9 @@ + +tests_sparc_system_quick = [ + 'migration', +] + +tests_sparc_system_thorough = [ + 'replay', + 'sun4m', +]
tests/functional/sparc/test_migration.py new file +1 -0
@@ -0,0 +1 @@ +../generic/test_migration.py
tests/functional/sparc/test_replay.py renamed from tests/functional/test_sparc_replay.py +0 -0
tests/functional/sparc/test_sun4m.py renamed from tests/functional/test_sparc_sun4m.py +0 -0
tests/functional/sparc64/meson.build new file +9 -0
@@ -0,0 +1,9 @@ + +tests_sparc64_system_quick = [ + 'migration', +] + +tests_sparc64_system_thorough = [ + 'sun4u', + 'tuxrun', +]
tests/functional/sparc64/test_migration.py new file +1 -0
@@ -0,0 +1 @@ +../generic/test_migration.py
tests/functional/sparc64/test_sun4u.py renamed from tests/functional/test_sparc64_sun4u.py +0 -0
tests/functional/sparc64/test_tuxrun.py renamed from tests/functional/test_sparc64_tuxrun.py +0 -0
tests/functional/x86_64/meson.build new file +37 -0
@@ -0,0 +1,37 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_x86_64_timeouts = { + 'acpi_bits' : 420, + 'intel_iommu': 300, + 'netdev_ethtool' : 180, + 'kvm_xen' : 180, + 'replay' : 480, + 'virtio_balloon': 120, +} + +tests_x86_64_system_quick = [ + 'cpu_queries', + 'mem_addr_space', + 'migration', + 'pc_cpu_hotplug_props', + 'virtio_version', + 'x86_cpu_model_versions', + 'vnc', + 'memlock', +] + +tests_x86_64_system_thorough = [ + 'acpi_bits', + 'intel_iommu', + 'linux_initrd', + 'multiprocess', + 'netdev_ethtool', + 'virtio_balloon', + 'virtio_gpu', + 'hotplug_blk', + 'hotplug_cpu', + 'kvm_xen', + 'replay', + 'reverse_debug', + 'tuxrun', +]
tests/functional/x86_64/test_acpi_bits.py renamed from tests/functional/test_acpi_bits.py +0 -0
tests/functional/x86_64/test_cpu_queries.py renamed from tests/functional/test_cpu_queries.py +0 -0
tests/functional/x86_64/test_hotplug_blk.py renamed from tests/functional/test_x86_64_hotplug_blk.py +0 -0
tests/functional/x86_64/test_hotplug_cpu.py renamed from tests/functional/test_x86_64_hotplug_cpu.py +0 -0
tests/functional/x86_64/test_intel_iommu.py renamed from tests/functional/test_intel_iommu.py +0 -0
tests/functional/x86_64/test_kvm_xen.py renamed from tests/functional/test_x86_64_kvm_xen.py +0 -0
tests/functional/x86_64/test_linux_initrd.py renamed from tests/functional/test_linux_initrd.py +0 -0
tests/functional/x86_64/test_mem_addr_space.py renamed from tests/functional/test_mem_addr_space.py +0 -0
tests/functional/x86_64/test_memlock.py renamed from tests/functional/test_memlock.py +0 -0
tests/functional/x86_64/test_migration.py new file +1 -0
@@ -0,0 +1 @@ +../generic/test_migration.py
tests/functional/x86_64/test_multiprocess.py renamed from tests/functional/test_multiprocess.py +0 -0
tests/functional/x86_64/test_netdev_ethtool.py renamed from tests/functional/test_netdev_ethtool.py +0 -0
tests/functional/x86_64/test_pc_cpu_hotplug_props.py renamed from tests/functional/test_pc_cpu_hotplug_props.py +0 -0
tests/functional/x86_64/test_replay.py renamed from tests/functional/test_x86_64_replay.py +0 -0
tests/functional/x86_64/test_reverse_debug.py renamed from tests/functional/test_x86_64_reverse_debug.py +0 -0
tests/functional/x86_64/test_tuxrun.py renamed from tests/functional/test_x86_64_tuxrun.py +0 -0
tests/functional/x86_64/test_virtio_balloon.py renamed from tests/functional/test_virtio_balloon.py +0 -0
tests/functional/x86_64/test_virtio_gpu.py renamed from tests/functional/test_virtio_gpu.py +0 -0
tests/functional/x86_64/test_virtio_version.py renamed from tests/functional/test_virtio_version.py +0 -0
tests/functional/x86_64/test_vnc.py renamed from tests/functional/test_vnc.py +0 -0
tests/functional/x86_64/test_x86_cpu_model_versions.py renamed from tests/functional/test_x86_cpu_model_versions.py +0 -0
tests/functional/xtensa/meson.build new file +5 -0
@@ -0,0 +1,5 @@ + +tests_xtensa_system_thorough = [ + 'lx60', + 'replay', +]
tests/functional/xtensa/test_lx60.py renamed from tests/functional/test_xtensa_lx60.py +0 -0
tests/functional/xtensa/test_replay.py renamed from tests/functional/test_xtensa_replay.py +0 -0
Signature · 1 line
2.50.0
Quoted 34 lines · Thomas Huth
This patch tackles two issues. First, the tests/functional folder has become quite crowded already, some restructuring would be helpful here. Second, we currently encode the target architecture twice in the test names since a lot of the test file names contain the target, too. This contributes to the very long output lines when running "make check-functional".
So let's move the individual test files to target specific folders now. Then we can drop the target from the file name (and thus from the test name).
Before the change, the output looked like this:
...
195/236 qemu:func-thorough+func-microblazeel-thorough+thorough / func-microblazeel-microblazeel_s3adsp1800 OK 2.00s 2 subtests passed 196/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-microblaze_replay OK 2.78s 1 subtests passed 197/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-microblaze_s3adsp1800 OK 2.02s 2 subtests passed 198/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_fuloong2e OK 1.95s 1 subtests passed 199/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_loongson3v SKIP 0.07s 0 subtests passed 200/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_tuxrun OK 8.52s 1 subtests passed...
After this change, it gets a little bit shorter:
...
195/236 qemu:func-thorough+func-microblazeel-thorough+thorough / func-microblazeel-s3adsp1800 OK 2.12s 2 subtests passed 196/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-replay OK 2.90s 1 subtests passed 197/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-s3adsp1800 OK 2.07s 2 subtests passed 198/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-fuloong2e OK 2.05s 1 subtests passed 199/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-loongson3v SKIP 0.07s 0 subtests passed 200/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-tuxrun OK 8.84s 1 subtests passed...
Quoted 7 lines
Tests that can be used for multiple but not all targets (like the "migration" test) are now handled via symlinks in the target folders.
Signed-off-by Thomas Huth <[email protected]>---
Note: Marked as RFC since I'm not that happy about the symlinks yet ...
if someone has a better idea, please let me know!
How about making those tests utility functions that each target arch imports and calls? It feels cleaner than symlinks, I think.
Quoted 2,052 lines
Also the update to the
MAINTAINERSfile is still missing - I'll add that once we agreed on whether this patch is a good idea or not.tests/functional/aarch64/meson.build | 47 +++ .../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 tests/functional/aarch64/test_migration.py | 1 + tests/functional/aarch64/test_multiprocess.py | 1 + .../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/alpha/meson.build | 9 + .../test_clipper.py} | 0 tests/functional/alpha/test_migration.py | 1 + .../test_replay.py} | 0 tests/functional/arm/meson.build | 61 +++ .../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_microbit.py} | 0 tests/functional/arm/test_migration.py | 1 + .../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/avr/meson.build | 5 + .../test_mega2560.py} | 0 .../{test_avr_uno.py => avr/test_uno.py} | 0 .../{ => generic}/test_empty_cpu_model.py | 0 .../{ => generic}/test_info_usernet.py | 0 .../{ => generic}/test_migration.py | 0 .../functional/{ => generic}/test_version.py | 0 tests/functional/hppa/meson.build | 4 + .../test_seabios.py} | 0 tests/functional/i386/meson.build | 9 + tests/functional/i386/test_migration.py | 1 + .../test_replay.py} | 0 .../test_tuxrun.py} | 0 tests/functional/loongarch64/meson.build | 4 + .../test_virt.py} | 0 tests/functional/m68k/meson.build | 8 + .../test_mcf5208evb.py} | 0 .../test_nextcube.py} | 0 .../{test_m68k_q800.py => m68k/test_q800.py} | 0 .../test_replay.py} | 0 .../test_tuxrun.py} | 0 tests/functional/meson.build | 364 ++---------------- tests/functional/microblaze/meson.build | 5 + .../test_replay.py} | 0 .../test_s3adsp1800.py} | 0 tests/functional/microblazeel/meson.build | 4 + .../test_s3adsp1800.py} | 2 +- 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 tests/functional/or1k/meson.build | 5 + .../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_bamboo.py} | 0 .../{test_ppc_mac.py => ppc/test_mac.py} | 0 tests/functional/ppc/test_migration.py | 1 + .../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 tests/functional/ppc64/test_migration.py | 1 + .../test_powernv.py} | 0 .../test_pseries.py} | 0 .../test_replay.py} | 0 .../test_reverse_debug.py} | 0 .../test_tuxrun.py} | 0 tests/functional/riscv32/meson.build | 9 + tests/functional/riscv32/test_migration.py | 1 + tests/functional/riscv32/test_opensbi.py | 1 + .../test_tuxrun.py} | 0 tests/functional/riscv64/meson.build | 13 + .../test_opensbi.py} | 0 .../test_tuxrun.py} | 0 tests/functional/rx/meson.build | 4 + .../{test_rx_gdbsim.py => rx/test_gdbsim.py} | 0 tests/functional/s390x/meson.build | 12 + .../test_ccw_virtio.py} | 0 .../test_replay.py} | 0 .../test_topology.py} | 0 .../test_tuxrun.py} | 0 tests/functional/sh4/meson.build | 10 + .../{test_sh4_r2d.py => sh4/test_r2d.py} | 0 .../test_tuxrun.py} | 0 tests/functional/sh4eb/meson.build | 4 + .../{test_sh4eb_r2d.py => sh4eb/test_r2d.py} | 0 tests/functional/sparc/meson.build | 9 + tests/functional/sparc/test_migration.py | 1 + .../test_replay.py} | 0 .../test_sun4m.py} | 0 tests/functional/sparc64/meson.build | 9 + tests/functional/sparc64/test_migration.py | 1 + .../test_sun4u.py} | 0 .../test_tuxrun.py} | 0 tests/functional/x86_64/meson.build | 37 ++ .../functional/{ => x86_64}/test_acpi_bits.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 tests/functional/x86_64/test_migration.py | 1 + .../{ => x86_64}/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 tests/functional/{ => x86_64}/test_vnc.py | 0 .../test_x86_cpu_model_versions.py | 0 tests/functional/xtensa/meson.build | 5 + .../test_lx60.py} | 0 .../test_replay.py} | 0 180 files changed, 426 insertions(+), 333 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%) create mode 120000 tests/functional/aarch64/test_migration.py create mode 120000 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} (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%) create mode 100644 tests/functional/alpha/meson.build rename tests/functional/{test_alpha_clipper.py => alpha/test_clipper.py} (100%) create mode 120000 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%) 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%) 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_microbit.py => arm/test_microbit.py} (100%) create mode 120000 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%) rename tests/functional/{ => generic}/test_empty_cpu_model.py (100%) rename tests/functional/{ => generic}/test_info_usernet.py (100%) rename tests/functional/{ => generic}/test_migration.py (100%) rename tests/functional/{ => generic}/test_version.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 120000 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%) 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%) rename tests/functional/{test_mipsel_tuxrun.py => mipsel/test_tuxrun.py} (100%) 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 120000 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%) 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 120000 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 120000 tests/functional/riscv32/test_migration.py create mode 120000 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_riscv_opensbi.py => riscv64/test_opensbi.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_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 120000 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 120000 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/{ => 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 120000 tests/functional/x86_64/test_migration.py rename tests/functional/{ => 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%) rename tests/functional/{ => x86_64}/test_vnc.py (100%) rename tests/functional/{ => x86_64}/test_x86_cpu_model_versions.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%)tests/functional/aarch64/meson.build new file +47
-0@@ -0,0 +1,47 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +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', + 'raspi3', + 'raspi4', + 'replay', + 'reverse_debug', + 'rme_virt', + 'rme_sbsaref', + 'sbsaref', + 'sbsaref_alpine', + 'sbsaref_freebsd', + 'smmu', + 'tcg_plugins', + 'tuxrun', + 'virt', + 'virt_gpu', + 'xen', + 'xlnx_versal', + 'multiprocess', +]tests/functional/aarch64/test_aspeed_ast2700.py renamed from tests/functional/test_aarch64_aspeed_ast2700.py +0
-0tests/functional/aarch64/test_aspeed_ast2700fc.py renamed from tests/functional/test_aarch64_aspeed_ast2700fc.py +0
-0tests/functional/aarch64/test_device_passthrough.py renamed from tests/functional/test_aarch64_device_passthrough.py +0
-0tests/functional/aarch64/test_hotplug_pci.py renamed from tests/functional/test_aarch64_hotplug_pci.py +0
-0tests/functional/aarch64/test_imx8mp_evk.py renamed from tests/functional/test_aarch64_imx8mp_evk.py +0
-0tests/functional/aarch64/test_migration.py new file +1
-0@@ -0,0 +1 @@ +../generic/test_migration.pytests/functional/aarch64/test_multiprocess.py new file +1
-0@@ -0,0 +1 @@ +../x86_64/test_multiprocess.pytests/functional/aarch64/test_raspi3.py renamed from tests/functional/test_aarch64_raspi3.py +0
-0tests/functional/aarch64/test_raspi4.py renamed from tests/functional/test_aarch64_raspi4.py +0
-0tests/functional/aarch64/test_replay.py renamed from tests/functional/test_aarch64_replay.py +0
-0tests/functional/aarch64/test_reverse_debug.py renamed from tests/functional/test_aarch64_reverse_debug.py +0
-0tests/functional/aarch64/test_rme_sbsaref.py renamed from tests/functional/test_aarch64_rme_sbsaref.py +1
-1@@ -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):tests/functional/aarch64/test_rme_virt.py renamed from tests/functional/test_aarch64_rme_virt.py +0
-0tests/functional/aarch64/test_sbsaref.py renamed from tests/functional/test_aarch64_sbsaref.py +0
-0tests/functional/aarch64/test_sbsaref_alpine.py renamed from tests/functional/test_aarch64_sbsaref_alpine.py +1
-1@@ -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):tests/functional/aarch64/test_sbsaref_freebsd.py renamed from tests/functional/test_aarch64_sbsaref_freebsd.py +1
-1@@ -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):tests/functional/aarch64/test_smmu.py renamed from tests/functional/test_aarch64_smmu.py +0
-0tests/functional/aarch64/test_tcg_plugins.py renamed from tests/functional/test_aarch64_tcg_plugins.py +0
-0tests/functional/aarch64/test_tuxrun.py renamed from tests/functional/test_aarch64_tuxrun.py +0
-0tests/functional/aarch64/test_virt.py renamed from tests/functional/test_aarch64_virt.py +0
-0tests/functional/aarch64/test_virt_gpu.py renamed from tests/functional/test_aarch64_virt_gpu.py +0
-0tests/functional/aarch64/test_xen.py renamed from tests/functional/test_aarch64_xen.py +0
-0tests/functional/aarch64/test_xlnx_versal.py renamed from tests/functional/test_aarch64_xlnx_versal.py +0
-0tests/functional/alpha/meson.build new file +9
-0@@ -0,0 +1,9 @@ + +tests_alpha_system_quick = [ + 'migration', +] + +tests_alpha_system_thorough = [ + 'clipper', + 'replay', +]tests/functional/alpha/test_clipper.py renamed from tests/functional/test_alpha_clipper.py +0
-0tests/functional/alpha/test_migration.py new file +1
-0@@ -0,0 +1 @@ +../generic/test_migration.pytests/functional/alpha/test_replay.py renamed from tests/functional/test_alpha_replay.py +0
-0tests/functional/arm/meson.build new file +61
-0@@ -0,0 +1,61 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +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', + 'microbit', + 'orangepi', + 'quanta_gsj', + 'raspi2', + 'realview', + 'replay', + 'smdkc210', + 'stellaris', + 'sx1', + 'vexpress', + 'virt', + 'tuxrun', +] + +tests_arm_linuxuser_thorough = [ + 'bflt', +]tests/functional/arm/test_aspeed_ast1030.py renamed from tests/functional/test_arm_aspeed_ast1030.py +0
-0tests/functional/arm/test_aspeed_ast2500.py renamed from tests/functional/test_arm_aspeed_ast2500.py +0
-0tests/functional/arm/test_aspeed_ast2600.py renamed from tests/functional/test_arm_aspeed_ast2600.py +0
-0tests/functional/arm/test_aspeed_bletchley.py renamed from tests/functional/test_arm_aspeed_bletchley.py +0
-0tests/functional/arm/test_aspeed_catalina.py renamed from tests/functional/test_arm_aspeed_catalina.py +0
-0tests/functional/arm/test_aspeed_gb200nvl_bmc.py renamed from tests/functional/test_arm_aspeed_gb200nvl_bmc.py +0
-0tests/functional/arm/test_aspeed_palmetto.py renamed from tests/functional/test_arm_aspeed_palmetto.py +0
-0tests/functional/arm/test_aspeed_rainier.py renamed from tests/functional/test_arm_aspeed_rainier.py +0
-0tests/functional/arm/test_aspeed_romulus.py renamed from tests/functional/test_arm_aspeed_romulus.py +0
-0tests/functional/arm/test_aspeed_witherspoon.py renamed from tests/functional/test_arm_aspeed_witherspoon.py +0
-0tests/functional/arm/test_bflt.py renamed from tests/functional/test_arm_bflt.py +0
-0tests/functional/arm/test_bpim2u.py renamed from tests/functional/test_arm_bpim2u.py +0
-0tests/functional/arm/test_canona1100.py renamed from tests/functional/test_arm_canona1100.py +0
-0tests/functional/arm/test_collie.py renamed from tests/functional/test_arm_collie.py +0
-0tests/functional/arm/test_cubieboard.py renamed from tests/functional/test_arm_cubieboard.py +0
-0tests/functional/arm/test_emcraft_sf2.py renamed from tests/functional/test_arm_emcraft_sf2.py +0
-0tests/functional/arm/test_integratorcp.py renamed from tests/functional/test_arm_integratorcp.py +0
-0tests/functional/arm/test_microbit.py renamed from tests/functional/test_arm_microbit.py +0
-0tests/functional/arm/test_migration.py new file +1
-0@@ -0,0 +1 @@ +../generic/test_migration.pytests/functional/arm/test_orangepi.py renamed from tests/functional/test_arm_orangepi.py +0
-0tests/functional/arm/test_quanta_gsj.py renamed from tests/functional/test_arm_quanta_gsj.py +0
-0tests/functional/arm/test_raspi2.py renamed from tests/functional/test_arm_raspi2.py +0
-0tests/functional/arm/test_realview.py renamed from tests/functional/test_arm_realview.py +0
-0tests/functional/arm/test_replay.py renamed from tests/functional/test_arm_replay.py +0
-0tests/functional/arm/test_smdkc210.py renamed from tests/functional/test_arm_smdkc210.py +0
-0tests/functional/arm/test_stellaris.py renamed from tests/functional/test_arm_stellaris.py +0
-0tests/functional/arm/test_sx1.py renamed from tests/functional/test_arm_sx1.py +0
-0tests/functional/arm/test_tuxrun.py renamed from tests/functional/test_arm_tuxrun.py +0
-0tests/functional/arm/test_vexpress.py renamed from tests/functional/test_arm_vexpress.py +0
-0tests/functional/arm/test_virt.py renamed from tests/functional/test_arm_virt.py +0
-0tests/functional/avr/meson.build new file +5
-0@@ -0,0 +1,5 @@ + +tests_avr_system_thorough = [ + 'mega2560', + 'uno', +]tests/functional/avr/test_mega2560.py renamed from tests/functional/test_avr_mega2560.py +0
-0tests/functional/avr/test_uno.py renamed from tests/functional/test_avr_uno.py +0
-0tests/functional/generic/test_empty_cpu_model.py renamed from tests/functional/test_empty_cpu_model.py +0
-0tests/functional/generic/test_info_usernet.py renamed from tests/functional/test_info_usernet.py +0
-0tests/functional/generic/test_migration.py renamed from tests/functional/test_migration.py +0
-0tests/functional/generic/test_version.py renamed from tests/functional/test_version.py +0
-0tests/functional/hppa/meson.build new file +4
-0@@ -0,0 +1,4 @@ + +tests_hppa_system_quick = [ + 'seabios', +]tests/functional/hppa/test_seabios.py renamed from tests/functional/test_hppa_seabios.py +0
-0tests/functional/i386/meson.build new file +9
-0@@ -0,0 +1,9 @@ + +tests_i386_system_quick = [ + 'migration', +] + +tests_i386_system_thorough = [ + 'replay', + 'tuxrun', +]tests/functional/i386/test_migration.py new file +1
-0@@ -0,0 +1 @@ +../generic/test_migration.pytests/functional/i386/test_replay.py renamed from tests/functional/test_i386_replay.py +0
-0tests/functional/i386/test_tuxrun.py renamed from tests/functional/test_i386_tuxrun.py +0
-0tests/functional/loongarch64/meson.build new file +4
-0@@ -0,0 +1,4 @@ + +tests_loongarch64_system_thorough = [ + 'virt', +]tests/functional/loongarch64/test_virt.py renamed from tests/functional/test_loongarch64_virt.py +0
-0tests/functional/m68k/meson.build new file +8
-0@@ -0,0 +1,8 @@ + +tests_m68k_system_thorough = [ + 'mcf5208evb', + 'nextcube', + 'replay', + 'q800', + 'tuxrun', +]tests/functional/m68k/test_mcf5208evb.py renamed from tests/functional/test_m68k_mcf5208evb.py +0
-0tests/functional/m68k/test_nextcube.py renamed from tests/functional/test_m68k_nextcube.py +0
-0tests/functional/m68k/test_q800.py renamed from tests/functional/test_m68k_q800.py +0
-0tests/functional/m68k/test_replay.py renamed from tests/functional/test_m68k_replay.py +0
-0tests/functional/m68k/test_tuxrun.py renamed from tests/functional/test_m68k_tuxrun.py +0
-0tests/functional/meson.build +39
-325@@ -9,63 +9,33 @@ if get_option('tcg_interpreter') subdir_done() endif -# Timeouts for individual tests that can be slow e.g. with debugging enabled -test_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, - 'acpi_bits' : 420, - '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, - 'intel_iommu': 300, - 'mips_malta' : 480, - 'mipsel_malta' : 420, - 'mipsel_replay' : 480, - 'mips64_malta' : 240, - 'mips64el_malta' : 420, - 'mips64el_replay' : 180, - 'netdev_ethtool' : 180, - 'ppc_40p' : 240, - 'ppc64_hv' : 1000, - 'ppc64_powernv' : 480, - 'ppc64_pseries' : 480, - 'ppc64_replay' : 210, - 'ppc64_tuxrun' : 420, - 'ppc64_mac99' : 120, - 'riscv64_tuxrun' : 120, - 's390x_ccw_virtio' : 420, - 'sh4_tuxrun' : 240, - 'virtio_balloon': 120, - 'x86_64_kvm_xen' : 180, - 'x86_64_replay' : 480, -} +subdir('aarch64') +subdir('alpha') +subdir('arm') +subdir('avr') +subdir('hppa') +subdir('i386') +subdir('loongarch64') +subdir('m68k') +subdir('microblaze') +subdir('microblazeel') +subdir('mips') +subdir('mips64') +subdir('mips64el') +subdir('mipsel') +subdir('or1k') +subdir('ppc') +subdir('ppc64') +subdir('riscv32') +subdir('riscv64') +subdir('rx') +subdir('s390x') +subdir('sh4') +subdir('sh4eb') +subdir('sparc') +subdir('sparc64') +subdir('x86_64') +subdir('xtensa') tests_generic_system = [ 'empty_cpu_model',@@ -79,271 +49,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_aarch64_system_quick = [ - 'migration', -] - -tests_aarch64_system_thorough = [ - 'aarch64_aspeed_ast2700', - 'aarch64_aspeed_ast2700fc', - 'aarch64_device_passthrough', - 'aarch64_hotplug_pci', - 'aarch64_imx8mp_evk', - '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', - 'multiprocess', -] - -tests_alpha_system_quick = [ - 'migration', -] - -tests_alpha_system_thorough = [ - 'alpha_clipper', - 'alpha_replay', -] - -tests_arm_system_quick = [ - '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_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', -] - -tests_hppa_system_quick = [ - 'hppa_seabios', -] - -tests_i386_system_quick = [ - 'migration', -] - -tests_i386_system_thorough = [ - 'i386_replay', - 'i386_tuxrun', -] - -tests_loongarch64_system_thorough = [ - 'loongarch64_virt', -] - -tests_m68k_system_thorough = [ - 'm68k_mcf5208evb', - 'm68k_nextcube', - 'm68k_replay', - 'm68k_q800', - 'm68k_tuxrun', -] - -tests_microblaze_system_thorough = [ - 'microblaze_replay', - 'microblaze_s3adsp1800' -] - -tests_microblazeel_system_thorough = [ - 'microblazeel_s3adsp1800' -] - -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', -] - -tests_ppc_system_quick = [ - '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 = [ - '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 = [ - 'migration', - 'riscv_opensbi', -] - -tests_riscv32_system_thorough = [ - 'riscv32_tuxrun', -] - -tests_riscv64_system_quick = [ - 'migration', - 'riscv_opensbi', -] - -tests_riscv64_system_thorough = [ - 'riscv64_tuxrun', -] - -tests_rx_system_thorough = [ - 'rx_gdbsim', -] - -tests_s390x_system_thorough = [ - 's390x_ccw_virtio', - 's390x_replay', - 's390x_topology', - 's390x_tuxrun', -] - -tests_sh4_system_thorough = [ - 'sh4_r2d', - 'sh4_tuxrun', -] - -tests_sh4eb_system_thorough = [ - 'sh4eb_r2d', -] - -tests_sparc_system_quick = [ - 'migration', -] - -tests_sparc_system_thorough = [ - 'sparc_replay', - 'sparc_sun4m', -] - -tests_sparc64_system_quick = [ - 'migration', -] - -tests_sparc64_system_thorough = [ - 'sparc64_sun4u', - 'sparc64_tuxrun', -] - -tests_x86_64_system_quick = [ - 'cpu_queries', - 'mem_addr_space', - 'migration', - 'pc_cpu_hotplug_props', - 'virtio_version', - 'x86_cpu_model_versions', - 'vnc', - 'memlock', -] - -tests_x86_64_system_thorough = [ - 'acpi_bits', - 'intel_iommu', - 'linux_initrd', - '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', -] precache_all = [] foreach speed : ['quick', 'thorough']@@ -386,7 +91,11 @@ foreach speed : ['quick', 'thorough'] foreach test : target_tests testname = '@0@-@1@'.format(target_base, test) - testfile = 'test_' + test + '.py' + if 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()@@ -400,6 +109,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@@ -415,8 +129,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 endforeachtests/functional/microblaze/meson.build new file +5
-0@@ -0,0 +1,5 @@ + +tests_microblaze_system_thorough = [ + 'replay', + 's3adsp1800' +]tests/functional/microblaze/test_replay.py renamed from tests/functional/test_microblaze_replay.py +0
-0tests/functional/microblaze/test_s3adsp1800.py renamed from tests/functional/test_microblaze_s3adsp1800.py +0
-0tests/functional/microblazeel/meson.build new file +4
-0@@ -0,0 +1,4 @@ + +tests_microblazeel_system_thorough = [ + 's3adsp1800' +]tests/functional/microblazeel/test_s3adsp1800.py renamed from tests/functional/test_microblazeel_s3adsp1800.py +1
-1@@ -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):tests/functional/mips/meson.build new file +11
-0@@ -0,0 +1,11 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_mips_timeouts = { + 'malta' : 480, +} + +tests_mips_system_thorough = [ + 'malta', + 'replay', + 'tuxrun', +]tests/functional/mips/test_malta.py renamed from tests/functional/test_mips_malta.py +0
-0tests/functional/mips/test_replay.py renamed from tests/functional/test_mips_replay.py +0
-0tests/functional/mips/test_tuxrun.py renamed from tests/functional/test_mips_tuxrun.py +0
-0tests/functional/mips64/meson.build new file +10
-0@@ -0,0 +1,10 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_mips64_timeouts = { + 'malta' : 240, +} + +tests_mips64_system_thorough = [ + 'malta', + 'tuxrun', +]tests/functional/mips64/test_malta.py renamed from tests/functional/test_mips64_malta.py +1
-1@@ -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):tests/functional/mips64/test_tuxrun.py renamed from tests/functional/test_mips64_tuxrun.py +0
-0tests/functional/mips64el/meson.build new file +14
-0@@ -0,0 +1,14 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_mips64el_timeouts = { + 'malta' : 420, + 'replay' : 180, +} + +tests_mips64el_system_thorough = [ + 'fuloong2e', + 'loongson3v', + 'malta', + 'replay', + 'tuxrun', +]tests/functional/mips64el/test_fuloong2e.py renamed from tests/functional/test_mips64el_fuloong2e.py +0
-0tests/functional/mips64el/test_loongson3v.py renamed from tests/functional/test_mips64el_loongson3v.py +0
-0tests/functional/mips64el/test_malta.py renamed from tests/functional/test_mips64el_malta.py +2
-2@@ -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()tests/functional/mips64el/test_replay.py renamed from tests/functional/test_mips64el_replay.py +0
-0tests/functional/mips64el/test_tuxrun.py renamed from tests/functional/test_mips64el_tuxrun.py +0
-0tests/functional/mipsel/meson.build new file +12
-0@@ -0,0 +1,12 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_mipsel_timeouts = { + 'malta' : 420, + 'replay' : 480, +} + +tests_mipsel_system_thorough = [ + 'malta', + 'replay', + 'tuxrun', +]tests/functional/mipsel/test_malta.py renamed from tests/functional/test_mipsel_malta.py +1
-1@@ -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):tests/functional/mipsel/test_replay.py renamed from tests/functional/test_mipsel_replay.py +0
-0tests/functional/mipsel/test_tuxrun.py renamed from tests/functional/test_mipsel_tuxrun.py +0
-0tests/functional/or1k/meson.build new file +5
-0@@ -0,0 +1,5 @@ + +tests_or1k_system_thorough = [ + 'replay', + 'sim', +]tests/functional/or1k/test_replay.py renamed from tests/functional/test_or1k_replay.py +0
-0tests/functional/or1k/test_sim.py renamed from tests/functional/test_or1k_sim.py +0
-0tests/functional/ppc/meson.build new file +22
-0@@ -0,0 +1,22 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +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', +]tests/functional/ppc/test_40p.py renamed from tests/functional/test_ppc_40p.py +0
-0tests/functional/ppc/test_74xx.py renamed from tests/functional/test_ppc_74xx.py +0
-0tests/functional/ppc/test_amiga.py renamed from tests/functional/test_ppc_amiga.py +0
-0tests/functional/ppc/test_bamboo.py renamed from tests/functional/test_ppc_bamboo.py +0
-0tests/functional/ppc/test_mac.py renamed from tests/functional/test_ppc_mac.py +0
-0tests/functional/ppc/test_migration.py new file +1
-0@@ -0,0 +1 @@ +../generic/test_migration.pytests/functional/ppc/test_mpc8544ds.py renamed from tests/functional/test_ppc_mpc8544ds.py +0
-0tests/functional/ppc/test_replay.py renamed from tests/functional/test_ppc_replay.py +0
-0tests/functional/ppc/test_sam460ex.py renamed from tests/functional/test_ppc_sam460ex.py +0
-0tests/functional/ppc/test_tuxrun.py renamed from tests/functional/test_ppc_tuxrun.py +0
-0tests/functional/ppc/test_virtex_ml507.py renamed from tests/functional/test_ppc_virtex_ml507.py +0
-0tests/functional/ppc64/meson.build new file +25
-0@@ -0,0 +1,25 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_ppc64_timeouts = { + 'hv' : 1000, + 'powernv' : 480, + 'pseries' : 480, + 'replay' : 210, + 'tuxrun' : 420, + 'mac99' : 120, +} + +tests_ppc64_system_quick = [ + 'migration', +] + +tests_ppc64_system_thorough = [ + 'e500', + 'hv', + 'powernv', + 'pseries', + 'replay', + 'reverse_debug', + 'tuxrun', + 'mac99', +]tests/functional/ppc64/test_e500.py renamed from tests/functional/test_ppc64_e500.py +0
-0tests/functional/ppc64/test_hv.py renamed from tests/functional/test_ppc64_hv.py +0
-0tests/functional/ppc64/test_mac99.py renamed from tests/functional/test_ppc64_mac99.py +0
-0tests/functional/ppc64/test_migration.py new file +1
-0@@ -0,0 +1 @@ +../generic/test_migration.pytests/functional/ppc64/test_powernv.py renamed from tests/functional/test_ppc64_powernv.py +0
-0tests/functional/ppc64/test_pseries.py renamed from tests/functional/test_ppc64_pseries.py +0
-0tests/functional/ppc64/test_replay.py renamed from tests/functional/test_ppc64_replay.py +0
-0tests/functional/ppc64/test_reverse_debug.py renamed from tests/functional/test_ppc64_reverse_debug.py +0
-0tests/functional/ppc64/test_tuxrun.py renamed from tests/functional/test_ppc64_tuxrun.py +0
-0tests/functional/riscv32/meson.build new file +9
-0@@ -0,0 +1,9 @@ + +tests_riscv32_system_quick = [ + 'migration', + 'opensbi', +] + +tests_riscv32_system_thorough = [ + 'tuxrun', +]tests/functional/riscv32/test_migration.py new file +1
-0@@ -0,0 +1 @@ +../generic/test_migration.pytests/functional/riscv32/test_opensbi.py new file +1
-0@@ -0,0 +1 @@ +../riscv64/test_opensbi.pytests/functional/riscv32/test_tuxrun.py renamed from tests/functional/test_riscv32_tuxrun.py +0
-0tests/functional/riscv64/meson.build new file +13
-0@@ -0,0 +1,13 @@ + +test_riscv64_timeouts = { + 'tuxrun' : 120, +} + +tests_riscv64_system_quick = [ + 'migration', + 'opensbi', +] + +tests_riscv64_system_thorough = [ + 'tuxrun', +]tests/functional/riscv64/test_opensbi.py renamed from tests/functional/test_riscv_opensbi.py +0
-0tests/functional/riscv64/test_tuxrun.py renamed from tests/functional/test_riscv64_tuxrun.py +0
-0tests/functional/rx/meson.build new file +4
-0@@ -0,0 +1,4 @@ + +tests_rx_system_thorough = [ + 'gdbsim', +]tests/functional/rx/test_gdbsim.py renamed from tests/functional/test_rx_gdbsim.py +0
-0tests/functional/s390x/meson.build new file +12
-0@@ -0,0 +1,12 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_s390x_timeouts = { + 'ccw_virtio' : 420, +} + +tests_s390x_system_thorough = [ + 'ccw_virtio', + 'replay', + 'topology', + 'tuxrun', +]tests/functional/s390x/test_ccw_virtio.py renamed from tests/functional/test_s390x_ccw_virtio.py +0
-0tests/functional/s390x/test_replay.py renamed from tests/functional/test_s390x_replay.py +0
-0tests/functional/s390x/test_topology.py renamed from tests/functional/test_s390x_topology.py +0
-0tests/functional/s390x/test_tuxrun.py renamed from tests/functional/test_s390x_tuxrun.py +0
-0tests/functional/sh4/meson.build new file +10
-0@@ -0,0 +1,10 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_sh4_timeouts = { + 'tuxrun' : 240, +} + +tests_sh4_system_thorough = [ + 'r2d', + 'tuxrun', +]tests/functional/sh4/test_r2d.py renamed from tests/functional/test_sh4_r2d.py +0
-0tests/functional/sh4/test_tuxrun.py renamed from tests/functional/test_sh4_tuxrun.py +0
-0tests/functional/sh4eb/meson.build new file +4
-0@@ -0,0 +1,4 @@ + +tests_sh4eb_system_thorough = [ + 'r2d', +]tests/functional/sh4eb/test_r2d.py renamed from tests/functional/test_sh4eb_r2d.py +0
-0tests/functional/sparc/meson.build new file +9
-0@@ -0,0 +1,9 @@ + +tests_sparc_system_quick = [ + 'migration', +] + +tests_sparc_system_thorough = [ + 'replay', + 'sun4m', +]tests/functional/sparc/test_migration.py new file +1
-0@@ -0,0 +1 @@ +../generic/test_migration.pytests/functional/sparc/test_replay.py renamed from tests/functional/test_sparc_replay.py +0
-0tests/functional/sparc/test_sun4m.py renamed from tests/functional/test_sparc_sun4m.py +0
-0tests/functional/sparc64/meson.build new file +9
-0@@ -0,0 +1,9 @@ + +tests_sparc64_system_quick = [ + 'migration', +] + +tests_sparc64_system_thorough = [ + 'sun4u', + 'tuxrun', +]tests/functional/sparc64/test_migration.py new file +1
-0@@ -0,0 +1 @@ +../generic/test_migration.pytests/functional/sparc64/test_sun4u.py renamed from tests/functional/test_sparc64_sun4u.py +0
-0tests/functional/sparc64/test_tuxrun.py renamed from tests/functional/test_sparc64_tuxrun.py +0
-0tests/functional/x86_64/meson.build new file +37
-0@@ -0,0 +1,37 @@ + +# Timeouts for individual tests that can be slow e.g. with debugging enabled +test_x86_64_timeouts = { + 'acpi_bits' : 420, + 'intel_iommu': 300, + 'netdev_ethtool' : 180, + 'kvm_xen' : 180, + 'replay' : 480, + 'virtio_balloon': 120, +} + +tests_x86_64_system_quick = [ + 'cpu_queries', + 'mem_addr_space', + 'migration', + 'pc_cpu_hotplug_props', + 'virtio_version', + 'x86_cpu_model_versions', + 'vnc', + 'memlock', +] + +tests_x86_64_system_thorough = [ + 'acpi_bits', + 'intel_iommu', + 'linux_initrd', + 'multiprocess', + 'netdev_ethtool', + 'virtio_balloon', + 'virtio_gpu', + 'hotplug_blk', + 'hotplug_cpu', + 'kvm_xen', + 'replay', + 'reverse_debug', + 'tuxrun', +]tests/functional/x86_64/test_acpi_bits.py renamed from tests/functional/test_acpi_bits.py +0
-0tests/functional/x86_64/test_cpu_queries.py renamed from tests/functional/test_cpu_queries.py +0
-0tests/functional/x86_64/test_hotplug_blk.py renamed from tests/functional/test_x86_64_hotplug_blk.py +0
-0tests/functional/x86_64/test_hotplug_cpu.py renamed from tests/functional/test_x86_64_hotplug_cpu.py +0
-0tests/functional/x86_64/test_intel_iommu.py renamed from tests/functional/test_intel_iommu.py +0
-0tests/functional/x86_64/test_kvm_xen.py renamed from tests/functional/test_x86_64_kvm_xen.py +0
-0tests/functional/x86_64/test_linux_initrd.py renamed from tests/functional/test_linux_initrd.py +0
-0tests/functional/x86_64/test_mem_addr_space.py renamed from tests/functional/test_mem_addr_space.py +0
-0tests/functional/x86_64/test_memlock.py renamed from tests/functional/test_memlock.py +0
-0tests/functional/x86_64/test_migration.py new file +1
-0@@ -0,0 +1 @@ +../generic/test_migration.pytests/functional/x86_64/test_multiprocess.py renamed from tests/functional/test_multiprocess.py +0
-0tests/functional/x86_64/test_netdev_ethtool.py renamed from tests/functional/test_netdev_ethtool.py +0
-0tests/functional/x86_64/test_pc_cpu_hotplug_props.py renamed from tests/functional/test_pc_cpu_hotplug_props.py +0
-0tests/functional/x86_64/test_replay.py renamed from tests/functional/test_x86_64_replay.py +0
-0tests/functional/x86_64/test_reverse_debug.py renamed from tests/functional/test_x86_64_reverse_debug.py +0
-0tests/functional/x86_64/test_tuxrun.py renamed from tests/functional/test_x86_64_tuxrun.py +0
-0tests/functional/x86_64/test_virtio_balloon.py renamed from tests/functional/test_virtio_balloon.py +0
-0tests/functional/x86_64/test_virtio_gpu.py renamed from tests/functional/test_virtio_gpu.py +0
-0tests/functional/x86_64/test_virtio_version.py renamed from tests/functional/test_virtio_version.py +0
-0tests/functional/x86_64/test_vnc.py renamed from tests/functional/test_vnc.py +0
-0tests/functional/x86_64/test_x86_cpu_model_versions.py renamed from tests/functional/test_x86_cpu_model_versions.py +0
-0tests/functional/xtensa/meson.build new file +5
-0@@ -0,0 +1,5 @@ + +tests_xtensa_system_thorough = [ + 'lx60', + 'replay', +]tests/functional/xtensa/test_lx60.py renamed from tests/functional/test_xtensa_lx60.py +0
-0tests/functional/xtensa/test_replay.py renamed from tests/functional/test_xtensa_replay.py +0
-1--2.50.0
Quoted 38 lines · Manos Pitsidianakis
Quoted 37 lines · Thomas Huth
This patch tackles two issues. First, the tests/functional folder has become quite crowded already, some restructuring would be helpful here. Second, we currently encode the target architecture twice in the test names since a lot of the test file names contain the target, too. This contributes to the very long output lines when running "make check-functional".
So let's move the individual test files to target specific folders now. Then we can drop the target from the file name (and thus from the test name).
Before the change, the output looked like this:
...
195/236 qemu:func-thorough+func-microblazeel-thorough+thorough / func-microblazeel-microblazeel_s3adsp1800 OK 2.00s 2 subtests passed 196/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-microblaze_replay OK 2.78s 1 subtests passed 197/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-microblaze_s3adsp1800 OK 2.02s 2 subtests passed 198/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_fuloong2e OK 1.95s 1 subtests passed 199/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_loongson3v SKIP 0.07s 0 subtests passed 200/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_tuxrun OK 8.52s 1 subtests passed...
After this change, it gets a little bit shorter:
...
195/236 qemu:func-thorough+func-microblazeel-thorough+thorough / func-microblazeel-s3adsp1800 OK 2.12s 2 subtests passed 196/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-replay OK 2.90s 1 subtests passed 197/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-s3adsp1800 OK 2.07s 2 subtests passed 198/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-fuloong2e OK 2.05s 1 subtests passed 199/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-loongson3v SKIP 0.07s 0 subtests passed 200/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-tuxrun OK 8.84s 1 subtests passed...
Tests that can be used for multiple but not all targets (like the "migration" test) are now handled via symlinks in the target folders.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Thomas Huth <[email protected]>---
Note: Marked as RFC since I'm not that happy about the symlinks yet ...
if someone has a better idea, please let me know!How about making those tests utility functions that each target arch imports and calls? It feels cleaner than symlinks, I think.
That sounds better, indeed. I'll give it a try...
Thanks,
Thomas
Quoted 11 lines · Thomas Huth
This patch tackles two issues. First, the tests/functional folder has become quite crowded already, some restructuring would be helpful here. Second, we currently encode the target architecture twice in the test names since a lot of the test file names contain the target, too. This contributes to the very long output lines when running "make check-functional".
So let's move the individual test files to target specific folders now. Then we can drop the target from the file name (and thus from the test name).
Quoted 5 lines
---
Note: Marked as RFC since I'm not that happy about the symlinks yet ...
if someone has a better idea, please let me know!
Also the update to theMAINTAINERSfile is still missing - I'll add that once we agreed on whether this patch is a good idea or not.
FWIW, I don't find the symlinks to be a problem, but if they bother you, we could probably just have a trivial subclass.
from ../generic/test_migration import MigrationTest
class MigrateTestX86(MigrationTest):
pass
Unless pytest runner really needs the 'test_XXX' methods to be only on the leaf class, not a parent, in order to enumerate test cases ?
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 22 lines · Daniel P. Berrangé
Quoted 11 lines · Thomas Huth
This patch tackles two issues. First, the tests/functional folder has become quite crowded already, some restructuring would be helpful here. Second, we currently encode the target architecture twice in the test names since a lot of the test file names contain the target, too. This contributes to the very long output lines when running "make check-functional".
So let's move the individual test files to target specific folders now. Then we can drop the target from the file name (and thus from the test name).
Quoted 5 lines
---
Note: Marked as RFC since I'm not that happy about the symlinks yet ...
if someone has a better idea, please let me know!
Also the update to theMAINTAINERSfile is still missing - I'll add that once we agreed on whether this patch is a good idea or not.FWIW, I don't find the symlinks to be a problem, but if they bother you, we could probably just have a trivial subclass.
Quoted 8 lines
from ../generic/test_migration import MigrationTest
class MigrateTestX86(MigrationTest):
passUnless pytest runner really needs the '
test_XXX' methods to be only on the leaf class, not a parent, in order to enumerate test cases ?
I played a little bit with this now, and it seems to be worse: If I keep the test_* methods in the parent class, each test is now executed twice, once for the leaf class, and once for the parent class :-/
I guess I could rename the functions in the parent class to use a different prefix ("do_test_...) and then add test_... functions to the leaf classes that call the ones from the parent, but that's quite a bit cumbersome...
I'll ponder for it a little bit longer, but if you have any other ideas, that's welcome, too, of course!
Thomas
Quoted 7 lines · Thomas Huth
This patch tackles two issues. First, the tests/functional folder has become quite crowded already, some restructuring would be helpful here. Second, we currently encode the target architecture twice in the test names since a lot of the test file names contain the target, too. This contributes to the very long output lines when running "make check-functional".
I agree with the "crowded" aspect of functional tests, and subfolders are definitely welcome.
Concerning the long line, it seems that setup ("thorough" in this example) is repeated 3 times on it, which is a bigger issue than having arch name being repeated.
A simpler solution for the "long line" issue would be to change mtest2make.py to generate shorter test target names. This would not benefit for using meson test directly, but from what I understood, this is not recommended nor supported anyway.
Quoted 26 lines
So let's move the individual test files to target specific folders now. Then we can drop the target from the file name (and thus from the test name).
Before the change, the output looked like this:
...
195/236 qemu:func-thorough+func-microblazeel-thorough+thorough / func-microblazeel-microblazeel_s3adsp1800 OK 2.00s 2 subtests passed 196/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-microblaze_replay OK 2.78s 1 subtests passed 197/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-microblaze_s3adsp1800 OK 2.02s 2 subtests passed 198/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_fuloong2e OK 1.95s 1 subtests passed 199/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_loongson3v SKIP 0.07s 0 subtests passed 200/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-mips64el_tuxrun OK 8.52s 1 subtests passed...
After this change, it gets a little bit shorter:
...
195/236 qemu:func-thorough+func-microblazeel-thorough+thorough / func-microblazeel-s3adsp1800 OK 2.12s 2 subtests passed 196/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-replay OK 2.90s 1 subtests passed 197/236 qemu:func-thorough+func-microblaze-thorough+thorough / func-microblaze-s3adsp1800 OK 2.07s 2 subtests passed 198/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-fuloong2e OK 2.05s 1 subtests passed 199/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-loongson3v SKIP 0.07s 0 subtests passed 200/236 qemu:func-thorough+func-mips64el-thorough+thorough / func-mips64el-tuxrun OK 8.84s 1 subtests passed...
Quoted 7 lines
Tests that can be used for multiple but not all targets (like the "migration" test) are now handled via symlinks in the target folders.
Signed-off-by Thomas Huth <[email protected]>---
Note: Marked as RFC since I'm not that happy about the symlinks yet ...
if someone has a better idea, please let me know!
Same as Manos, correctly extracting common code looks better than finding a workaround with symlinks to satisfy import rules.
Quoted 3 lines
Also the update to the
MAINTAINERSfile is still missing - I'll add that once we agreed on whether this patch is a good idea or not.
Thanks,
Pierrick
Quoted 9 lines · Pierrick Bouvier
Quoted 7 lines · Thomas Huth
This patch tackles two issues. First, the tests/functional folder has become quite crowded already, some restructuring would be helpful here. Second, we currently encode the target architecture twice in the test names since a lot of the test file names contain the target, too. This contributes to the very long output lines when running "make check-functional".
Quoted 5 lines
I agree with the "crowded" aspect of functional tests, and subfolders are definitely welcome.
Concerning the long line, it seems that setup ("thorough" in this example) is repeated 3 times on it, which is a bigger issue than having arch name being repeated.
A simpler solution for the "long line" issue would be to change
mtest2make.pyto generate shorter test target names. This would not benefit for using meson test directly, but from what I understood, this is not recommended nor supported anyway.
I agree that this is a bigger annoyance here, but as far as I understood that that repeated "thorough" term is just a listing of all the test suites that the test is part of. I think this would rather need to be fixed on the meson test runner side - why does meson list all test suites here? The one that applies to the current should be enough, shouldn't it?
Thomas
Quoted 22 lines · Thomas Huth
Quoted 12 lines · Pierrick Bouvier
Quoted 7 lines · Thomas Huth
This patch tackles two issues. First, the tests/functional folder has become quite crowded already, some restructuring would be helpful here. Second, we currently encode the target architecture twice in the test names since a lot of the test file names contain the target, too. This contributes to the very long output lines when running "make check-functional".
I agree with the "crowded" aspect of functional tests, and subfolders are definitely welcome.
Quoted 8 lines
Concerning the long line, it seems that setup ("thorough" in this example) is repeated 3 times on it, which is a bigger issue than having arch name being repeated.
A simpler solution for the "long line" issue would be to change
mtest2make.pyto generate shorter test target names. This would not benefit for using meson test directly, but from what I understood, this is not recommended nor supported anyway.
Quoted 6 lines
I agree that this is a bigger annoyance here, but as far as I understood that that repeated "thorough" term is just a listing of all the test suites that the test is part of. I think this would rather need to be fixed on the meson test runner side - why does meson list all test suites here? The one that applies to the current should be enough, shouldn't it?
Meson is usually explicit (thus sometimes verbose) and unambiguous, which are two very nice virtues, especially for build systems and tests, at least for my personal taste. You don't want to spend time reverse engineering the test infrastructure itself when you try to understand why a fail happened or when writing a new test.
Another additional benefit of listing setup + suite + test in an exhaustive way is that your command line never change to run any specific test, whatever your current setup is.
If I had to choose between a wider terminal output and spending time with grep and find to understand what is running, I would pick the former any time.
Maybe the complexity comes from our usage of test setups here, to differentiate categories that will download, vs the one that will not. We already talked about that in another thread, and I still think that having a single setup (thorough), which could be the default, would make things easier, even if people should accept to connect to Internet from time to time to update their tests assets. They do it to download new versions of QEMU or interact with the mailing list anyway. That said, I'm not trying to open the can of worms again, just pointing that it may be related to this topic.
Quoted 2 lines
Thomas
Regards,
Pierrick