tests/functional: Move tests into architecture specific folders
Subsystems (7)
cover tests/functional: Move tests into architecture specific folders
This patch series 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. 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 wrapper files in the target folders.
Thomas Huth (24):
tests/functional: Rework the migration test to have target-specific
files
tests/functional: Rework the multiprocess test to have target-specific
files
tests/functional/meson.build: Split timeout settings by target tests/functional/meson.build: Allow tests to reside in subfolders tests/functional: Move aarch64 tests into architecture specific folder tests/functional: Move alpha tests into architecture specific folder tests/functional: Move arm tests into architecture specific folder tests/functional: Move avr tests into architecture specific folder tests/functional: Move hppa tests into architecture specific folder tests/functional: Move i386 tests into architecture specific folder tests/functional: Move loongarch64 tests into architecture specific
folder
tests/functional: Move m68k tests into architecture specific folder tests/functional: Move microblaze tests into architecture specific
folder
tests/functional: Move mips tests into target-specific folders tests/functional: Move or1k tests into target-specific folders tests/functional: Move ppc/ppc64 tests into target-specific folders tests/functional: Move riscv32/riscv64 tests into target-specific
folders
tests/functional: Move rx test into target-specific folders tests/functional: Move s390x tests into target-specific folders tests/functional: Move sh4/sh4eb tests into target-specific folders tests/functional: Move sparc/sparc64 tests into target-specific
folders
tests/functional: Move x86_64 tests into target-specific folder tests/functional: Move xtensa tests into target-specific folder tests/functional: Move the generic tests to a subfolder
MAINTAINERS | 189 ++++-----
tests/functional/aarch64/meson.build | 48 +++
.../test_aspeed_ast2700.py} | 0
.../test_aspeed_ast2700fc.py} | 0
.../test_device_passthrough.py} | 0
.../test_hotplug_pci.py} | 0
.../test_imx8mp_evk.py} | 0
.../test_kvm.py} | 0
tests/functional/aarch64/test_migration.py | 26 ++
tests/functional/aarch64/test_multiprocess.py | 31 ++
.../test_raspi3.py} | 0
.../test_raspi4.py} | 0
.../test_replay.py} | 0
.../test_reverse_debug.py} | 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 | 10 +
.../test_clipper.py} | 0
tests/functional/alpha/test_migration.py | 26 ++
.../test_replay.py} | 0
tests/functional/arm/meson.build | 62 +++
.../test_aspeed_ast1030.py} | 0
.../test_aspeed_ast2500.py} | 0
.../test_aspeed_ast2600.py} | 0
.../test_aspeed_bletchley.py} | 0
.../test_aspeed_catalina.py} | 0
.../test_aspeed_gb200nvl_bmc.py} | 0
.../test_aspeed_palmetto.py} | 0
.../test_aspeed_rainier.py} | 0
.../test_aspeed_romulus.py} | 0
.../test_aspeed_witherspoon.py} | 0
.../{test_arm_bflt.py => arm/test_bflt.py} | 0
.../test_bpim2u.py} | 0
.../test_canona1100.py} | 0
.../test_collie.py} | 0
.../test_cubieboard.py} | 0
.../test_emcraft_sf2.py} | 0
.../test_integratorcp.py} | 0
.../test_max78000fthr.py} | 0
.../test_microbit.py} | 0
tests/functional/arm/test_migration.py | 26 ++
.../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 | 6 +
.../test_mega2560.py} | 0
.../{test_avr_uno.py => avr/test_uno.py} | 0
tests/functional/generic/meson.build | 14 +
.../{ => generic}/test_empty_cpu_model.py | 0
.../{ => generic}/test_info_usernet.py | 0
.../functional/{ => generic}/test_version.py | 0
tests/functional/{ => generic}/test_vnc.py | 0
tests/functional/hppa/meson.build | 5 +
.../test_seabios.py} | 0
tests/functional/i386/meson.build | 10 +
tests/functional/i386/test_migration.py | 26 ++
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
tests/functional/loongarch64/meson.build | 5 +
.../test_virt.py} | 0
tests/functional/m68k/meson.build | 9 +
.../test_mcf5208evb.py} | 0
.../test_nextcube.py} | 0
.../{test_m68k_q800.py => m68k/test_q800.py} | 0
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
tests/functional/meson.build | 381 ++----------------
tests/functional/microblaze/meson.build | 6 +
.../test_replay.py} | 0
.../test_s3adsp1800.py} | 0
tests/functional/microblazeel/meson.build | 5 +
.../test_s3adsp1800.py} | 2 +-
.../{test_migration.py => migration.py} | 35 +-
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
.../{test_multiprocess.py => multiprocess.py} | 40 +-
tests/functional/or1k/meson.build | 6 +
.../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 | 26 ++
.../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 | 26 ++
.../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 | 10 +
tests/functional/riscv32/test_migration.py | 26 ++
tests/functional/riscv32/test_opensbi.py | 10 +
.../test_tuxrun.py} | 0
tests/functional/riscv64/meson.build | 14 +
tests/functional/riscv64/test_migration.py | 26 ++
.../test_opensbi.py} | 0
.../test_tuxrun.py} | 0
tests/functional/rx/meson.build | 5 +
.../{test_rx_gdbsim.py => rx/test_gdbsim.py} | 0
tests/functional/s390x/meson.build | 13 +
.../test_ccw_virtio.py} | 0
.../test_pxelinux.py} | 0
.../test_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 | 5 +
.../{test_sh4eb_r2d.py => sh4eb/test_r2d.py} | 0
tests/functional/sparc/meson.build | 10 +
tests/functional/sparc/test_migration.py | 26 ++
.../test_replay.py} | 0
.../test_sun4m.py} | 0
tests/functional/sparc64/meson.build | 10 +
tests/functional/sparc64/test_migration.py | 26 ++
.../test_sun4u.py} | 0
.../test_tuxrun.py} | 0
tests/functional/x86_64/meson.build | 36 ++
.../functional/{ => x86_64}/test_acpi_bits.py | 0
.../test_cpu_model_versions.py} | 0
.../{ => x86_64}/test_cpu_queries.py | 0
.../test_hotplug_blk.py} | 0
.../test_hotplug_cpu.py} | 0
.../{ => x86_64}/test_intel_iommu.py | 0
.../test_kvm_xen.py} | 0
.../{ => x86_64}/test_linux_initrd.py | 0
.../{ => x86_64}/test_mem_addr_space.py | 0
tests/functional/{ => x86_64}/test_memlock.py | 0
tests/functional/x86_64/test_migration.py | 26 ++
tests/functional/x86_64/test_multiprocess.py | 31 ++
.../{ => 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/xtensa/meson.build | 6 +
.../test_lx60.py} | 0
.../test_replay.py} | 0
187 files changed, 910 insertions(+), 508 deletions(-)
create mode 100644 tests/functional/aarch64/meson.build
rename tests/functional/{test_aarch64_aspeed_ast2700.py => aarch64/test_aspeed_ast2700.py} (100%)
rename tests/functional/{test_aarch64_aspeed_ast2700fc.py => aarch64/test_aspeed_ast2700fc.py} (100%)
rename tests/functional/{test_aarch64_device_passthrough.py => aarch64/test_device_passthrough.py} (100%)
rename tests/functional/{test_aarch64_hotplug_pci.py => aarch64/test_hotplug_pci.py} (100%)
rename tests/functional/{test_aarch64_imx8mp_evk.py => aarch64/test_imx8mp_evk.py} (100%)
rename tests/functional/{test_aarch64_kvm.py => aarch64/test_kvm.py} (100%)
create mode 100755 tests/functional/aarch64/test_migration.py
create mode 100755 tests/functional/aarch64/test_multiprocess.py
rename tests/functional/{test_aarch64_raspi3.py => aarch64/test_raspi3.py} (100%)
rename tests/functional/{test_aarch64_raspi4.py => aarch64/test_raspi4.py} (100%)
rename tests/functional/{test_aarch64_replay.py => aarch64/test_replay.py} (100%)
rename tests/functional/{test_aarch64_reverse_debug.py => aarch64/test_reverse_debug.py} (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 100755 tests/functional/alpha/test_migration.py
rename tests/functional/{test_alpha_replay.py => alpha/test_replay.py} (100%)
create mode 100644 tests/functional/arm/meson.build
rename tests/functional/{test_arm_aspeed_ast1030.py => arm/test_aspeed_ast1030.py} (100%)
rename tests/functional/{test_arm_aspeed_ast2500.py => arm/test_aspeed_ast2500.py} (100%)
rename tests/functional/{test_arm_aspeed_ast2600.py => arm/test_aspeed_ast2600.py} (100%)
rename tests/functional/{test_arm_aspeed_bletchley.py => arm/test_aspeed_bletchley.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_aspeed_catalina.py => arm/test_aspeed_catalina.py} (100%)
rename tests/functional/{test_arm_aspeed_gb200nvl_bmc.py => arm/test_aspeed_gb200nvl_bmc.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_aspeed_palmetto.py => arm/test_aspeed_palmetto.py} (100%)
rename tests/functional/{test_arm_aspeed_rainier.py => arm/test_aspeed_rainier.py} (100%)
rename tests/functional/{test_arm_aspeed_romulus.py => arm/test_aspeed_romulus.py} (100%)
rename tests/functional/{test_arm_aspeed_witherspoon.py => arm/test_aspeed_witherspoon.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_bflt.py => arm/test_bflt.py} (100%)
rename tests/functional/{test_arm_bpim2u.py => arm/test_bpim2u.py} (100%)
rename tests/functional/{test_arm_canona1100.py => arm/test_canona1100.py} (100%)
rename tests/functional/{test_arm_collie.py => arm/test_collie.py} (100%)
rename tests/functional/{test_arm_cubieboard.py => arm/test_cubieboard.py} (100%)
rename tests/functional/{test_arm_emcraft_sf2.py => arm/test_emcraft_sf2.py} (100%)
rename tests/functional/{test_arm_integratorcp.py => arm/test_integratorcp.py} (100%)
rename tests/functional/{test_arm_max78000fthr.py => arm/test_max78000fthr.py} (100%)
rename tests/functional/{test_arm_microbit.py => arm/test_microbit.py} (100%)
create mode 100755 tests/functional/arm/test_migration.py
rename tests/functional/{test_arm_orangepi.py => arm/test_orangepi.py} (100%)
rename tests/functional/{test_arm_quanta_gsj.py => arm/test_quanta_gsj.py} (100%)
rename tests/functional/{test_arm_raspi2.py => arm/test_raspi2.py} (100%)
rename tests/functional/{test_arm_realview.py => arm/test_realview.py} (100%)
rename tests/functional/{test_arm_replay.py => arm/test_replay.py} (100%)
rename tests/functional/{test_arm_smdkc210.py => arm/test_smdkc210.py} (100%)
rename tests/functional/{test_arm_stellaris.py => arm/test_stellaris.py} (100%)
rename tests/functional/{test_arm_sx1.py => arm/test_sx1.py} (100%)
rename tests/functional/{test_arm_tuxrun.py => arm/test_tuxrun.py} (100%)
rename tests/functional/{test_arm_vexpress.py => arm/test_vexpress.py} (100%)
rename tests/functional/{test_arm_virt.py => arm/test_virt.py} (100%)
create mode 100644 tests/functional/avr/meson.build
rename tests/functional/{test_avr_mega2560.py => avr/test_mega2560.py} (100%)
rename tests/functional/{test_avr_uno.py => avr/test_uno.py} (100%)
create mode 100644 tests/functional/generic/meson.build
rename tests/functional/{ => generic}/test_empty_cpu_model.py (100%)
rename tests/functional/{ => generic}/test_info_usernet.py (100%)
rename tests/functional/{ => generic}/test_version.py (100%)
rename tests/functional/{ => generic}/test_vnc.py (100%)
create mode 100644 tests/functional/hppa/meson.build
rename tests/functional/{test_hppa_seabios.py => hppa/test_seabios.py} (100%)
create mode 100644 tests/functional/i386/meson.build
create mode 100755 tests/functional/i386/test_migration.py
rename tests/functional/{test_i386_replay.py => i386/test_replay.py} (100%)
rename tests/functional/{test_i386_tuxrun.py => i386/test_tuxrun.py} (100%)
create mode 100644 tests/functional/loongarch64/meson.build
rename tests/functional/{test_loongarch64_virt.py => loongarch64/test_virt.py} (100%)
create mode 100644 tests/functional/m68k/meson.build
rename tests/functional/{test_m68k_mcf5208evb.py => m68k/test_mcf5208evb.py} (100%)
rename tests/functional/{test_m68k_nextcube.py => m68k/test_nextcube.py} (100%)
rename tests/functional/{test_m68k_q800.py => m68k/test_q800.py} (100%)
rename tests/functional/{test_m68k_replay.py => m68k/test_replay.py} (100%)
rename tests/functional/{test_m68k_tuxrun.py => m68k/test_tuxrun.py} (100%)
create mode 100644 tests/functional/microblaze/meson.build
rename tests/functional/{test_microblaze_replay.py => microblaze/test_replay.py} (100%)
rename tests/functional/{test_microblaze_s3adsp1800.py => microblaze/test_s3adsp1800.py} (100%)
create mode 100644 tests/functional/microblazeel/meson.build
rename tests/functional/{test_microblazeel_s3adsp1800.py => microblazeel/test_s3adsp1800.py} (92%)
rename tests/functional/{test_migration.py => migration.py} (74%)
mode change 100755 => 100644
create mode 100644 tests/functional/mips/meson.build
rename tests/functional/{test_mips_malta.py => mips/test_malta.py} (100%)
rename tests/functional/{test_mips_replay.py => mips/test_replay.py} (100%)
rename tests/functional/{test_mips_tuxrun.py => mips/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mips64/meson.build
rename tests/functional/{test_mips64_malta.py => mips64/test_malta.py} (96%)
rename tests/functional/{test_mips64_tuxrun.py => mips64/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mips64el/meson.build
rename tests/functional/{test_mips64el_fuloong2e.py => mips64el/test_fuloong2e.py} (100%)
rename tests/functional/{test_mips64el_loongson3v.py => mips64el/test_loongson3v.py} (100%)
rename tests/functional/{test_mips64el_malta.py => mips64el/test_malta.py} (98%)
rename tests/functional/{test_mips64el_replay.py => mips64el/test_replay.py} (100%)
rename tests/functional/{test_mips64el_tuxrun.py => mips64el/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mipsel/meson.build
rename tests/functional/{test_mipsel_malta.py => mipsel/test_malta.py} (98%)
rename tests/functional/{test_mipsel_replay.py => mipsel/test_replay.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_mipsel_tuxrun.py => mipsel/test_tuxrun.py} (100%)
rename tests/functional/{test_multiprocess.py => multiprocess.py} (58%)
mode change 100755 => 100644
create mode 100644 tests/functional/or1k/meson.build
rename tests/functional/{test_or1k_replay.py => or1k/test_replay.py} (100%)
rename tests/functional/{test_or1k_sim.py => or1k/test_sim.py} (100%)
create mode 100644 tests/functional/ppc/meson.build
rename tests/functional/{test_ppc_40p.py => ppc/test_40p.py} (100%)
rename tests/functional/{test_ppc_74xx.py => ppc/test_74xx.py} (100%)
rename tests/functional/{test_ppc_amiga.py => ppc/test_amiga.py} (100%)
rename tests/functional/{test_ppc_bamboo.py => ppc/test_bamboo.py} (100%)
rename tests/functional/{test_ppc_mac.py => ppc/test_mac.py} (100%)
create mode 100755 tests/functional/ppc/test_migration.py
rename tests/functional/{test_ppc_mpc8544ds.py => ppc/test_mpc8544ds.py} (100%)
rename tests/functional/{test_ppc_replay.py => ppc/test_replay.py} (100%)
rename tests/functional/{test_ppc_sam460ex.py => ppc/test_sam460ex.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_ppc_tuxrun.py => ppc/test_tuxrun.py} (100%)
rename tests/functional/{test_ppc_virtex_ml507.py => ppc/test_virtex_ml507.py} (100%)
create mode 100644 tests/functional/ppc64/meson.build
rename tests/functional/{test_ppc64_e500.py => ppc64/test_e500.py} (100%)
rename tests/functional/{test_ppc64_hv.py => ppc64/test_hv.py} (100%)
rename tests/functional/{test_ppc64_mac99.py => ppc64/test_mac99.py} (100%)
create mode 100755 tests/functional/ppc64/test_migration.py
rename tests/functional/{test_ppc64_powernv.py => ppc64/test_powernv.py} (100%)
rename tests/functional/{test_ppc64_pseries.py => ppc64/test_pseries.py} (100%)
rename tests/functional/{test_ppc64_replay.py => ppc64/test_replay.py} (100%)
rename tests/functional/{test_ppc64_reverse_debug.py => ppc64/test_reverse_debug.py} (100%)
rename tests/functional/{test_ppc64_tuxrun.py => ppc64/test_tuxrun.py} (100%)
create mode 100644 tests/functional/riscv32/meson.build
create mode 100755 tests/functional/riscv32/test_migration.py
create mode 100755 tests/functional/riscv32/test_opensbi.py
rename tests/functional/{test_riscv32_tuxrun.py => riscv32/test_tuxrun.py} (100%)
create mode 100644 tests/functional/riscv64/meson.build
create mode 100755 tests/functional/riscv64/test_migration.py
rename tests/functional/{test_riscv_opensbi.py => riscv64/test_opensbi.py} (100%)
rename tests/functional/{test_riscv64_tuxrun.py => riscv64/test_tuxrun.py} (100%)
create mode 100644 tests/functional/rx/meson.build
rename tests/functional/{test_rx_gdbsim.py => rx/test_gdbsim.py} (100%)
create mode 100644 tests/functional/s390x/meson.build
rename tests/functional/{test_s390x_ccw_virtio.py => s390x/test_ccw_virtio.py} (100%)
rename tests/functional/{test_s390x_pxelinux.py => s390x/test_pxelinux.py} (100%)
rename tests/functional/{test_s390x_replay.py => s390x/test_replay.py} (100%)
rename tests/functional/{test_s390x_topology.py => s390x/test_topology.py} (100%)
rename tests/functional/{test_s390x_tuxrun.py => s390x/test_tuxrun.py} (100%)
create mode 100644 tests/functional/sh4/meson.build
rename tests/functional/{test_sh4_r2d.py => sh4/test_r2d.py} (100%)
rename tests/functional/{test_sh4_tuxrun.py => sh4/test_tuxrun.py} (100%)
create mode 100644 tests/functional/sh4eb/meson.build
rename tests/functional/{test_sh4eb_r2d.py => sh4eb/test_r2d.py} (100%)
create mode 100644 tests/functional/sparc/meson.build
create mode 100755 tests/functional/sparc/test_migration.py
rename tests/functional/{test_sparc_replay.py => sparc/test_replay.py} (100%)
rename tests/functional/{test_sparc_sun4m.py => sparc/test_sun4m.py} (100%)
create mode 100644 tests/functional/sparc64/meson.build
create mode 100755 tests/functional/sparc64/test_migration.py
rename tests/functional/{test_sparc64_sun4u.py => sparc64/test_sun4u.py} (100%)
rename tests/functional/{test_sparc64_tuxrun.py => sparc64/test_tuxrun.py} (100%)
create mode 100644 tests/functional/x86_64/meson.build
rename tests/functional/{ => x86_64}/test_acpi_bits.py (100%)
rename tests/functional/{test_x86_cpu_model_versions.py => x86_64/test_cpu_model_versions.py} (100%)
rename tests/functional/{ => x86_64}/test_cpu_queries.py (100%)
rename tests/functional/{test_x86_64_hotplug_blk.py => x86_64/test_hotplug_blk.py} (100%)
rename tests/functional/{test_x86_64_hotplug_cpu.py => x86_64/test_hotplug_cpu.py} (100%)
rename tests/functional/{ => x86_64}/test_intel_iommu.py (100%)
rename tests/functional/{test_x86_64_kvm_xen.py => x86_64/test_kvm_xen.py} (100%)
rename tests/functional/{ => x86_64}/test_linux_initrd.py (100%)
rename tests/functional/{ => x86_64}/test_mem_addr_space.py (100%)
rename tests/functional/{ => x86_64}/test_memlock.py (100%)
create mode 100755 tests/functional/x86_64/test_migration.py
create mode 100755 tests/functional/x86_64/test_multiprocess.py
rename tests/functional/{ => x86_64}/test_netdev_ethtool.py (100%)
rename tests/functional/{ => x86_64}/test_pc_cpu_hotplug_props.py (100%)
rename tests/functional/{test_x86_64_replay.py => x86_64/test_replay.py} (100%)
rename tests/functional/{test_x86_64_reverse_debug.py => x86_64/test_reverse_debug.py} (100%)
rename tests/functional/{test_x86_64_tuxrun.py => x86_64/test_tuxrun.py} (100%)
rename tests/functional/{ => x86_64}/test_virtio_balloon.py (100%)
rename tests/functional/{ => x86_64}/test_virtio_gpu.py (100%)
rename tests/functional/{ => x86_64}/test_virtio_version.py (100%)
create mode 100644 tests/functional/xtensa/meson.build
rename tests/functional/{test_xtensa_lx60.py => xtensa/test_lx60.py} (100%)
rename tests/functional/{test_xtensa_replay.py => xtensa/test_replay.py} (100%)Signature · 1 line
2.50.1
PATCH 1/24 tests/functional: Rework the migration test to have target-specific files
From: Thomas Huth <[email protected]>
We are going to move the tests for each target into separate subdirectories. The migration test does not fit quite into this scheme, since it works for multiple targets, but not all. Rework the test to have a common test class, and target specific files with a target specific class, so that this will fit better into the new scheme.
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 22 ++++++------
.../{test_migration.py => migration.py} | 35 +++++--------------
tests/functional/test_aarch64_migration.py | 26 ++++++++++++++
tests/functional/test_alpha_migration.py | 26 ++++++++++++++
tests/functional/test_arm_migration.py | 26 ++++++++++++++
tests/functional/test_i386_migration.py | 26 ++++++++++++++
tests/functional/test_ppc64_migration.py | 26 ++++++++++++++
tests/functional/test_ppc_migration.py | 26 ++++++++++++++
tests/functional/test_riscv32_migration.py | 26 ++++++++++++++
tests/functional/test_riscv64_migration.py | 26 ++++++++++++++
tests/functional/test_sparc64_migration.py | 26 ++++++++++++++
tests/functional/test_sparc_migration.py | 26 ++++++++++++++
tests/functional/test_x86_64_migration.py | 26 ++++++++++++++
14 files changed, 306 insertions(+), 39 deletions(-)
rename tests/functional/{test_migration.py => migration.py} (74%)
mode change 100755 => 100644
create mode 100755 tests/functional/test_aarch64_migration.py
create mode 100755 tests/functional/test_alpha_migration.py
create mode 100755 tests/functional/test_arm_migration.py
create mode 100755 tests/functional/test_i386_migration.py
create mode 100755 tests/functional/test_ppc64_migration.py
create mode 100755 tests/functional/test_ppc_migration.py
create mode 100755 tests/functional/test_riscv32_migration.py
create mode 100755 tests/functional/test_riscv64_migration.py
create mode 100755 tests/functional/test_sparc64_migration.py
create mode 100755 tests/functional/test_sparc_migration.py
create mode 100755 tests/functional/test_x86_64_migration.pyMAINTAINERS +1 -1
@@ -3595,7 +3595,7 @@ F: include/migration/ F: include/qemu/userfaultfd.h F: migration/ F: scripts/vmstate-static-checker.py -F: tests/functional/test_migration.py +F: tests/functional/*migration.py F: tests/vmstate-static-checker-data/ F: tests/qtest/migration/ F: tests/qtest/migration-*
tests/functional/meson.build +11 -11
@@ -80,7 +80,7 @@ tests_generic_bsduser = [ ] tests_aarch64_system_quick = [ - 'migration', + 'aarch64_migration', ] tests_aarch64_system_thorough = [
@@ -110,7 +110,7 @@ tests_aarch64_system_thorough = [ ] tests_alpha_system_quick = [ - 'migration', + 'alpha_migration', ] tests_alpha_system_thorough = [
@@ -119,7 +119,7 @@ tests_alpha_system_thorough = [ ] tests_arm_system_quick = [ - 'migration', + 'arm_migration', ] tests_arm_system_thorough = [
@@ -168,7 +168,7 @@ tests_hppa_system_quick = [ ] tests_i386_system_quick = [ - 'migration', + 'i386_migration', ] tests_i386_system_thorough = [
@@ -228,7 +228,7 @@ tests_or1k_system_thorough = [ ] tests_ppc_system_quick = [ - 'migration', + 'ppc_migration', 'ppc_74xx', ]
@@ -245,7 +245,7 @@ tests_ppc_system_thorough = [ ] tests_ppc64_system_quick = [ - 'migration', + 'ppc64_migration', ] tests_ppc64_system_thorough = [
@@ -260,7 +260,7 @@ tests_ppc64_system_thorough = [ ] tests_riscv32_system_quick = [ - 'migration', + 'riscv32_migration', 'riscv_opensbi', ]
@@ -269,7 +269,7 @@ tests_riscv32_system_thorough = [ ] tests_riscv64_system_quick = [ - 'migration', + 'riscv64_migration', 'riscv_opensbi', ]
@@ -299,7 +299,7 @@ tests_sh4eb_system_thorough = [ ] tests_sparc_system_quick = [ - 'migration', + 'sparc_migration', ] tests_sparc_system_thorough = [
@@ -308,7 +308,7 @@ tests_sparc_system_thorough = [ ] tests_sparc64_system_quick = [ - 'migration', + 'sparc64_migration', ] tests_sparc64_system_thorough = [
@@ -319,7 +319,7 @@ tests_sparc64_system_thorough = [ tests_x86_64_system_quick = [ 'cpu_queries', 'mem_addr_space', - 'migration', + 'x86_64_migration', 'pc_cpu_hotplug_props', 'virtio_version', 'x86_cpu_model_versions',
tests/functional/migration.py renamed from tests/functional/test_migration.py +8 -27
@@ -1,6 +1,6 @@ -#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later # -# Migration test +# Migration test base class # # Copyright (c) 2019 Red Hat, Inc. #
@@ -14,7 +14,7 @@ import tempfile import time -from qemu_test import QemuSystemTest, skipIfMissingCommands +from qemu_test import QemuSystemTest, which from qemu_test.ports import Ports
@@ -41,24 +41,7 @@ def assert_migration(self, src_vm, dst_vm): self.assertEqual(dst_vm.cmd('query-status')['status'], 'running') self.assertEqual(src_vm.cmd('query-status')['status'],'postmigrate') - def select_machine(self): - target_machine = { - 'aarch64': 'quanta-gsj', - 'alpha': 'clipper', - 'arm': 'npcm750-evb', - 'i386': 'isapc', - 'ppc': 'sam460ex', - 'ppc64': 'mac99', - 'riscv32': 'spike', - 'riscv64': 'virt', - 'sparc': 'SS-4', - 'sparc64': 'sun4u', - 'x86_64': 'microvm', - } - self.set_machine(target_machine[self.arch]) - def do_migrate(self, dest_uri, src_uri=None): - self.select_machine() dest_vm = self.get_vm('-incoming', dest_uri, name="dest-qemu") dest_vm.add_args('-nodefaults') dest_vm.launch()
@@ -76,23 +59,21 @@ def _get_free_port(self, ports): self.skipTest('Failed to find a free port') return port - def test_migration_with_tcp_localhost(self): + def migration_with_tcp_localhost(self): with Ports() as ports: dest_uri = 'tcp:localhost:%u' % self._get_free_port(ports) self.do_migrate(dest_uri) - def test_migration_with_unix(self): + def migration_with_unix(self): with tempfile.TemporaryDirectory(prefix='socket_') as socket_path: dest_uri = 'unix:%s/qemu-test.sock' % socket_path self.do_migrate(dest_uri) - @skipIfMissingCommands('ncat') - def test_migration_with_exec(self): + def migration_with_exec(self): + if not which('ncat'): + self.skipTest('ncat is not available') with Ports() as ports: free_port = self._get_free_port(ports) dest_uri = 'exec:ncat -l localhost %u' % free_port src_uri = 'exec:ncat localhost %u' % free_port self.do_migrate(dest_uri, src_uri) - -if __name__ == '__main__': - QemuSystemTest.main()
tests/functional/test_aarch64_migration.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# aarch64 migration test + +from migration import MigrationTest + + +class Aarch64MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('quanta-gsj') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('quanta-gsj') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('quanta-gsj') + self.migration_with_exec() + + +if __name__ == '__main__': + MigrationTest.main()
tests/functional/test_alpha_migration.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Alpha migration test + +from migration import MigrationTest + + +class AlphaMigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('clipper') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('clipper') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('clipper') + self.migration_with_exec() + + +if __name__ == '__main__': + MigrationTest.main()
tests/functional/test_arm_migration.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# arm migration test + +from migration import MigrationTest + + +class ArmMigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('npcm750-evb') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('npcm750-evb') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('npcm750-evb') + self.migration_with_exec() + + +if __name__ == '__main__': + MigrationTest.main()
tests/functional/test_i386_migration.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# i386 migration test + +from migration import MigrationTest + + +class I386MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('isapc') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('isapc') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('isapc') + self.migration_with_exec() + + +if __name__ == '__main__': + MigrationTest.main()
tests/functional/test_ppc64_migration.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# ppc migration test + +from migration import MigrationTest + + +class PpcMigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('mac99') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('mac99') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('mac99') + self.migration_with_exec() + + +if __name__ == '__main__': + MigrationTest.main()
tests/functional/test_ppc_migration.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# ppc migration test + +from migration import MigrationTest + + +class PpcMigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('sam460ex') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('sam460ex') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('sam460ex') + self.migration_with_exec() + + +if __name__ == '__main__': + MigrationTest.main()
tests/functional/test_riscv32_migration.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# riscv32 migration test + +from migration import MigrationTest + + +class Rv32MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('spike') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('virt') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('spike') + self.migration_with_exec() + + +if __name__ == '__main__': + MigrationTest.main()
tests/functional/test_riscv64_migration.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# riscv64 migration test + +from migration import MigrationTest + + +class Rv64MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('virt') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('spike') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('virt') + self.migration_with_exec() + + +if __name__ == '__main__': + MigrationTest.main()
tests/functional/test_sparc64_migration.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Sparc64 migration test + +from migration import MigrationTest + + +class Sparc64MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('sun4u') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('sun4u') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('sun4u') + self.migration_with_exec() + + +if __name__ == '__main__': + MigrationTest.main()
tests/functional/test_sparc_migration.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Sparc migration test + +from migration import MigrationTest + + +class SparcMigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('SS-4') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('SS-5') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('SS-4') + self.migration_with_exec() + + +if __name__ == '__main__': + MigrationTest.main()
tests/functional/test_x86_64_migration.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# x86_64 migration test + +from migration import MigrationTest + + +class X8664MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('microvm') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('microvm') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('microvm') + self.migration_with_exec() + + +if __name__ == '__main__': + MigrationTest.main()
Signature · 1 line
2.50.1
PATCH 2/24 tests/functional: Rework the multiprocess test to have target-specific files
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
We are going to move the tests for each target into separate subdirectories. The multiprocess test currently contains code for both, x86 and aarch64, so it does not quite fit into this scheme. Rework the test to have a common test class, and target specific files with a target specific class, so that this will fit better into the new scheme.
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 4 +-
.../{test_multiprocess.py => multiprocess.py} | 40 +------------------
tests/functional/test_aarch64_multiprocess.py | 31 ++++++++++++++
tests/functional/test_x86_64_multiprocess.py | 31 ++++++++++++++
5 files changed, 67 insertions(+), 41 deletions(-)
rename tests/functional/{test_multiprocess.py => multiprocess.py} (58%)
mode change 100755 => 100644
create mode 100755 tests/functional/test_aarch64_multiprocess.py
create mode 100755 tests/functional/test_x86_64_multiprocess.pyMAINTAINERS +1 -1
@@ -4284,7 +4284,7 @@ F: hw/remote/vfio-user-obj.c F: include/hw/remote/vfio-user-obj.h F: hw/remote/iommu.c F: include/hw/remote/iommu.h -F: tests/functional/test_multiprocess.py +F: tests/functional/*multiprocess.py VFIO-USER: M: John Levon <[email protected]>
tests/functional/meson.build +2 -2
@@ -90,6 +90,7 @@ tests_aarch64_system_thorough = [ 'aarch64_hotplug_pci', 'aarch64_imx8mp_evk', 'aarch64_kvm', + 'aarch64_multiprocess', 'aarch64_raspi3', 'aarch64_raspi4', 'aarch64_replay',
@@ -106,7 +107,6 @@ tests_aarch64_system_thorough = [ 'aarch64_virt_gpu', 'aarch64_xen', 'aarch64_xlnx_versal', - 'multiprocess', ] tests_alpha_system_quick = [
@@ -331,7 +331,7 @@ tests_x86_64_system_thorough = [ 'acpi_bits', 'intel_iommu', 'linux_initrd', - 'multiprocess', + 'x86_64_multiprocess', 'netdev_ethtool', 'virtio_balloon', 'virtio_gpu',
tests/functional/multiprocess.py renamed from tests/functional/test_multiprocess.py +2 -38
@@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later # # Test for multiprocess qemu #
@@ -9,33 +9,13 @@ import os import socket -from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern +from qemu_test import QemuSystemTest, wait_for_console_pattern from qemu_test import exec_command, exec_command_and_wait_for_pattern class Multiprocess(QemuSystemTest): KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' - ASSET_KERNEL_X86 = Asset( - ('https://archives.fedoraproject.org/pub/archive/fedora/linux' - '/releases/31/Everything/x86_64/os/images/pxeboot/vmlinuz'), - 'd4738d03dbbe083ca610d0821d0a8f1488bebbdccef54ce33e3adb35fda00129') - - ASSET_INITRD_X86 = Asset( - ('https://archives.fedoraproject.org/pub/archive/fedora/linux' - '/releases/31/Everything/x86_64/os/images/pxeboot/initrd.img'), - '3b6cb5c91a14c42e2f61520f1689264d865e772a1f0069e660a800d31dd61fb9') - - ASSET_KERNEL_AARCH64 = Asset( - ('https://archives.fedoraproject.org/pub/archive/fedora/linux' - '/releases/31/Everything/aarch64/os/images/pxeboot/vmlinuz'), - '3ae07fcafbfc8e4abeb693035a74fe10698faae15e9ccd48882a9167800c1527') - - ASSET_INITRD_AARCH64 = Asset( - ('https://archives.fedoraproject.org/pub/archive/fedora/linux' - '/releases/31/Everything/aarch64/os/images/pxeboot/initrd.img'), - '9fd230cab10b1dafea41cf00150e6669d37051fad133bd618d2130284e16d526') - def do_test(self, kernel_asset, initrd_asset, kernel_command_line, machine_type): """Main test method"""
@@ -85,19 +65,3 @@ def do_test(self, kernel_asset, initrd_asset, proxy_sock.close() remote_sock.close() - - def test_multiprocess(self): - kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE - if self.arch == 'x86_64': - kernel_command_line += 'console=ttyS0 rdinit=/bin/bash' - self.do_test(self.ASSET_KERNEL_X86, self.ASSET_INITRD_X86, - kernel_command_line, 'pc') - elif self.arch == 'aarch64': - kernel_command_line += 'rdinit=/bin/bash console=ttyAMA0' - self.do_test(self.ASSET_KERNEL_AARCH64, self.ASSET_INITRD_AARCH64, - kernel_command_line, 'virt,gic-version=3') - else: - assert False - -if __name__ == '__main__': - QemuSystemTest.main()
tests/functional/test_aarch64_multiprocess.py new file +31 -0
@@ -0,0 +1,31 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Test for multiprocess qemu on aarch64 + +from multiprocess import Multiprocess +from qemu_test import Asset + + +class Aarch64Multiprocess(Multiprocess): + + ASSET_KERNEL_AARCH64 = Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux' + '/releases/31/Everything/aarch64/os/images/pxeboot/vmlinuz'), + '3ae07fcafbfc8e4abeb693035a74fe10698faae15e9ccd48882a9167800c1527') + + ASSET_INITRD_AARCH64 = Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux' + '/releases/31/Everything/aarch64/os/images/pxeboot/initrd.img'), + '9fd230cab10b1dafea41cf00150e6669d37051fad133bd618d2130284e16d526') + + def test_multiprocess(self): + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'rdinit=/bin/bash console=ttyAMA0') + self.do_test(self.ASSET_KERNEL_AARCH64, self.ASSET_INITRD_AARCH64, + kernel_command_line, 'virt,gic-version=3') + + +if __name__ == '__main__': + Multiprocess.main()
tests/functional/test_x86_64_multiprocess.py new file +31 -0
@@ -0,0 +1,31 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Test for multiprocess qemu on x86 + +from multiprocess import Multiprocess +from qemu_test import Asset + + +class X86Multiprocess(Multiprocess): + + ASSET_KERNEL_X86 = Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux' + '/releases/31/Everything/x86_64/os/images/pxeboot/vmlinuz'), + 'd4738d03dbbe083ca610d0821d0a8f1488bebbdccef54ce33e3adb35fda00129') + + ASSET_INITRD_X86 = Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux' + '/releases/31/Everything/x86_64/os/images/pxeboot/initrd.img'), + '3b6cb5c91a14c42e2f61520f1689264d865e772a1f0069e660a800d31dd61fb9') + + def test_multiprocess(self): + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'console=ttyS0 rdinit=/bin/bash') + self.do_test(self.ASSET_KERNEL_X86, self.ASSET_INITRD_X86, + kernel_command_line, 'pc') + + +if __name__ == '__main__': + Multiprocess.main()
Signature · 1 line
2.50.1
PATCH 3/24 tests/functional/meson.build: Split timeout settings by target
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
We are going to move these settings into target-specific subfolders. As a first step, split the big test_timeouts array up into individual ones.
--- tests/functional/meson.build | 50 +++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 6 deletions(-)
tests/functional/meson.build +44 -6
@@ -10,7 +10,7 @@ if get_option('tcg_interpreter') endif # Timeouts for individual tests that can be slow e.g. with debugging enabled -test_timeouts = { +test_aarch64_timeouts = { 'aarch64_aspeed_ast2700' : 600, 'aarch64_aspeed_ast2700fc' : 600, 'aarch64_device_passthrough' : 720,
@@ -25,7 +25,9 @@ test_timeouts = { 'aarch64_tuxrun' : 240, 'aarch64_virt' : 360, 'aarch64_virt_gpu' : 480, - 'acpi_bits' : 420, +} + +test_arm_timeouts = { 'arm_aspeed_palmetto' : 120, 'arm_aspeed_romulus' : 120, 'arm_aspeed_witherspoon' : 120,
@@ -44,24 +46,55 @@ test_timeouts = { 'arm_replay' : 240, 'arm_tuxrun' : 240, 'arm_sx1' : 360, - 'intel_iommu': 300, +} + +test_mips_timeouts = { 'mips_malta' : 480, +} + +test_mipsel_timeouts = { 'mipsel_malta' : 420, 'mipsel_replay' : 480, +} + +test_mips64_timeouts = { 'mips64_malta' : 240, +} + +test_mips64el_timeouts = { 'mips64el_malta' : 420, 'mips64el_replay' : 180, - 'netdev_ethtool' : 180, +} + +test_ppc_timeouts = { 'ppc_40p' : 240, +} + +test_ppc64_timeouts = { 'ppc64_hv' : 1000, 'ppc64_powernv' : 480, 'ppc64_pseries' : 480, 'ppc64_replay' : 210, 'ppc64_tuxrun' : 420, 'ppc64_mac99' : 120, +} + +test_riscv64_timeouts = { 'riscv64_tuxrun' : 120, +} + +test_s390x_timeouts = { 's390x_ccw_virtio' : 420, +} + +test_sh4_timeouts = { 'sh4_tuxrun' : 240, +} + +test_x86_64_timeouts = { + 'acpi_bits' : 420, + 'intel_iommu': 300, + 'netdev_ethtool' : 180, 'virtio_balloon': 120, 'x86_64_kvm_xen' : 180, 'x86_64_replay' : 480,
@@ -403,6 +436,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
@@ -418,8 +456,8 @@ foreach speed : ['quick', 'thorough'] env: test_env, args: [testpath], protocol: 'tap', - timeout: test_timeouts.get(test, 90), - priority: test_timeouts.get(test, 90), + timeout: time_out, + priority: time_out, suite: suites) endforeach endforeach
Signature · 1 line
2.50.1
PATCH 4/24 tests/functional/meson.build: Allow tests to reside in subfolders
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
We are going to move target-specific tests to subfolders that are named after the target (and generic tests will be put into a "generic" folder), so prepare the meson.build file to allow such locations, too.
--- tests/functional/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tests/functional/meson.build +7 -1
@@ -422,7 +422,13 @@ foreach speed : ['quick', 'thorough'] foreach test : target_tests testname = '@0@-@1@'.format(target_base, test) - testfile = 'test_' + test + '.py' + if fs.exists('test_' + test + '.py') + testfile = 'test_' + test + '.py' + elif fs.exists('generic' / 'test_' + test + '.py') + testfile = 'generic' / 'test_' + test + '.py' + else + testfile = target_base / 'test_' + test + '.py' + endif testpath = meson.current_source_dir() / testfile teststamp = testname + '.tstamp' test_precache_env = environment()
Signature · 1 line
2.50.1
PATCH 5/24 tests/functional: Move aarch64 tests into architecture specific folder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded already, some restructuring would be helpful here. Thus move the aarch64 tests into a target-specific subfolder.
---
MAINTAINERS | 23 +++++----
tests/functional/aarch64/meson.build | 48 +++++++++++++++++++
.../test_aspeed_ast2700.py} | 0
.../test_aspeed_ast2700fc.py} | 0
.../test_device_passthrough.py} | 0
.../test_hotplug_pci.py} | 0
.../test_imx8mp_evk.py} | 0
.../test_kvm.py} | 0
.../test_migration.py} | 0
.../test_multiprocess.py} | 0
.../test_raspi3.py} | 0
.../test_raspi4.py} | 0
.../test_replay.py} | 0
.../test_reverse_debug.py} | 0
.../test_rme_sbsaref.py} | 2 +-
.../test_rme_virt.py} | 0
.../test_sbsaref.py} | 0
.../test_sbsaref_alpine.py} | 2 +-
.../test_sbsaref_freebsd.py} | 2 +-
.../test_smmu.py} | 0
.../test_tcg_plugins.py} | 0
.../test_tuxrun.py} | 0
.../test_virt.py} | 0
.../test_virt_gpu.py} | 0
.../test_xen.py} | 0
.../test_xlnx_versal.py} | 0
tests/functional/meson.build | 48 +------------------
27 files changed, 63 insertions(+), 62 deletions(-)
create mode 100644 tests/functional/aarch64/meson.build
rename tests/functional/{test_aarch64_aspeed_ast2700.py => aarch64/test_aspeed_ast2700.py} (100%)
rename tests/functional/{test_aarch64_aspeed_ast2700fc.py => aarch64/test_aspeed_ast2700fc.py} (100%)
rename tests/functional/{test_aarch64_device_passthrough.py => aarch64/test_device_passthrough.py} (100%)
rename tests/functional/{test_aarch64_hotplug_pci.py => aarch64/test_hotplug_pci.py} (100%)
rename tests/functional/{test_aarch64_imx8mp_evk.py => aarch64/test_imx8mp_evk.py} (100%)
rename tests/functional/{test_aarch64_kvm.py => aarch64/test_kvm.py} (100%)
rename tests/functional/{test_aarch64_migration.py => aarch64/test_migration.py} (100%)
rename tests/functional/{test_aarch64_multiprocess.py => aarch64/test_multiprocess.py} (100%)
rename tests/functional/{test_aarch64_raspi3.py => aarch64/test_raspi3.py} (100%)
rename tests/functional/{test_aarch64_raspi4.py => aarch64/test_raspi4.py} (100%)
rename tests/functional/{test_aarch64_replay.py => aarch64/test_replay.py} (100%)
rename tests/functional/{test_aarch64_reverse_debug.py => aarch64/test_reverse_debug.py} (100%)
rename tests/functional/{test_aarch64_rme_sbsaref.py => aarch64/test_rme_sbsaref.py} (98%)
rename tests/functional/{test_aarch64_rme_virt.py => aarch64/test_rme_virt.py} (100%)
rename tests/functional/{test_aarch64_sbsaref.py => aarch64/test_sbsaref.py} (100%)
rename tests/functional/{test_aarch64_sbsaref_alpine.py => aarch64/test_sbsaref_alpine.py} (97%)
rename tests/functional/{test_aarch64_sbsaref_freebsd.py => aarch64/test_sbsaref_freebsd.py} (97%)
rename tests/functional/{test_aarch64_smmu.py => aarch64/test_smmu.py} (100%)
rename tests/functional/{test_aarch64_tcg_plugins.py => aarch64/test_tcg_plugins.py} (100%)
rename tests/functional/{test_aarch64_tuxrun.py => aarch64/test_tuxrun.py} (100%)
rename tests/functional/{test_aarch64_virt.py => aarch64/test_virt.py} (100%)
rename tests/functional/{test_aarch64_virt_gpu.py => aarch64/test_virt_gpu.py} (100%)
rename tests/functional/{test_aarch64_xen.py => aarch64/test_xen.py} (100%)
rename tests/functional/{test_aarch64_xlnx_versal.py => aarch64/test_xlnx_versal.py} (100%)MAINTAINERS +11 -12
@@ -212,7 +212,7 @@ L: [email protected] S: Maintained F: hw/arm/smmu* F: include/hw/arm/smmu* -F: tests/functional/test_aarch64_smmu.py +F: tests/functional/aarch64/test_smmu.py AVR TCG CPUs M: Michael Rolnik <[email protected]>
@@ -874,7 +874,7 @@ F: include/hw/arm/fsl-imx8mp.h F: include/hw/misc/imx8mp_*.h F: include/hw/pci-host/fsl_imx8m_phy.h F: docs/system/arm/imx8mp-evk.rst -F: tests/functional/test_aarch64_imx8mp_evk.py +F: tests/functional/aarch64/test_imx8mp_evk.py F: tests/qtest/rs5c372-test.c MPS2 / MPS3
@@ -952,8 +952,7 @@ F: include/hw/arm/rasp* F: include/hw/*/bcm283* F: docs/system/arm/raspi.rst F: tests/functional/test_arm_raspi2.py -F: tests/functional/test_aarch64_raspi3.py -F: tests/functional/test_aarch64_raspi4.py +F: tests/functional/aarch64/test_raspi*.py Real View M: Peter Maydell <[email protected]>
@@ -993,7 +992,7 @@ F: hw/misc/sbsa_ec.c F: hw/watchdog/sbsa_gwdt.c F: include/hw/watchdog/sbsa_gwdt.h F: docs/system/arm/sbsa.rst -F: tests/functional/test_aarch64_*sbsaref*.py +F: tests/functional/aarch64/test_*sbsaref*.py Sharp SL-5500 (Collie) PDA M: Peter Maydell <[email protected]>
@@ -1063,8 +1062,8 @@ S: Maintained F: hw/arm/virt* F: include/hw/arm/virt.h F: docs/system/arm/virt.rst -F: tests/functional/test_aarch64_*virt*.py -F: tests/functional/test_aarch64_tuxrun.py +F: tests/functional/aarch64/test_*virt*.py +F: tests/functional/aarch64/test_tuxrun.py F: tests/functional/test_arm_tuxrun.py F: tests/functional/test_arm_virt.py
@@ -1096,7 +1095,7 @@ F: hw/display/dpcd.c F: include/hw/display/dpcd.h F: docs/system/arm/xlnx-versal-virt.rst F: docs/system/arm/xlnx-zcu102.rst -F: tests/functional/test_aarch64_xlnx_versal.py +F: tests/functional/aarch64/test_xlnx_versal.py Xilinx Versal OSPI M: Francisco Iglesias <[email protected]>
@@ -2108,7 +2107,7 @@ ARM PCI Hotplug M: Gustavo Romero <[email protected]> L: [email protected] S: Supported -F: tests/functional/test_aarch64_hotplug_pci.py +F: tests/functional/aarch64/test_hotplug_pci.py ACPI/SMBIOS M: Michael S. Tsirkin <[email protected]>
@@ -2636,7 +2635,7 @@ M: Alex Bennée <[email protected]> S: Maintained F: hw/core/guest-loader.c F: docs/system/guest-loader.rst -F: tests/functional/test_aarch64_xen.py +F: tests/functional/aarch64/test_xen.py Intel Hexadecimal Object File Loader M: Su Hang <[email protected]>
@@ -2705,7 +2704,7 @@ F: hw/display/virtio-gpu* F: hw/display/virtio-vga.* F: include/hw/virtio/virtio-gpu.h F: docs/system/devices/virtio-gpu.rst -F: tests/functional/test_aarch64_virt_gpu.py +F: tests/functional/aarch64/test_virt_gpu.py vhost-user-blk M: Raphael Norwitz <[email protected]>
@@ -3931,7 +3930,7 @@ S: Maintained F: docs/devel/tcg-plugins.rst F: plugins/ F: tests/tcg/plugins/ -F: tests/functional/test_aarch64_tcg_plugins.py +F: tests/functional/aarch64/test_tcg_plugins.py F: contrib/plugins/ F: scripts/qemu-plugin-symbols.py
tests/functional/aarch64/meson.build new file +48 -0
48 lines not on this page · raw message
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_kvm.py renamed from tests/functional/test_aarch64_kvm.py +0 -0
tests/functional/aarch64/test_migration.py renamed from tests/functional/test_aarch64_migration.py +0 -0
tests/functional/aarch64/test_multiprocess.py renamed from tests/functional/test_aarch64_multiprocess.py +0 -0
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/meson.build +1 -47
60 lines not on this page · raw message
Signature · 1 line
2.50.1
PATCH 6/24 tests/functional: Move alpha tests into architecture specific folder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded already, some restructuring would be helpful here. Thus move the alpha tests into a target-specific subfolder.
---
MAINTAINERS | 3 ++-
tests/functional/alpha/meson.build | 10 ++++++++++
.../{test_alpha_clipper.py => alpha/test_clipper.py} | 0
.../test_migration.py} | 0
.../{test_alpha_replay.py => alpha/test_replay.py} | 0
tests/functional/meson.build | 10 +---------
6 files changed, 13 insertions(+), 10 deletions(-)
create mode 100644 tests/functional/alpha/meson.build
rename tests/functional/{test_alpha_clipper.py => alpha/test_clipper.py} (100%)
rename tests/functional/{test_alpha_migration.py => alpha/test_migration.py} (100%)
rename tests/functional/{test_alpha_replay.py => alpha/test_replay.py} (100%)MAINTAINERS +2 -1
@@ -189,6 +189,7 @@ M: Richard Henderson <[email protected]> S: Maintained F: target/alpha/ F: tests/tcg/alpha/ +F: tests/functional/alpha/ F: disas/alpha.c ARM TCG CPUs
@@ -656,7 +657,7 @@ S: Maintained F: hw/alpha/ F: hw/isa/smc37c669-superio.c F: tests/tcg/alpha/system/ -F: tests/functional/test_alpha_clipper.py +F: tests/functional/alpha/test_clipper.py ARM Machines ------------
tests/functional/alpha/meson.build new file +10 -0
@@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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 renamed from tests/functional/test_alpha_migration.py +0 -0
tests/functional/alpha/test_replay.py renamed from tests/functional/test_alpha_replay.py +0 -0
tests/functional/meson.build +1 -9
@@ -10,6 +10,7 @@ if get_option('tcg_interpreter') endif subdir('aarch64') +subdir('alpha') test_arm_timeouts = { 'arm_aspeed_palmetto' : 120,
@@ -96,15 +97,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_alpha_system_quick = [ - 'alpha_migration', -] - -tests_alpha_system_thorough = [ - 'alpha_clipper', - 'alpha_replay', -] - tests_arm_system_quick = [ 'arm_migration', ]
Signature · 1 line
2.50.1
Re: [PATCH 06/24] tests/functional: Move alpha tests into architecture specific folder
Quoted 15 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded already, some restructuring would be helpful here. Thus move the alpha tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 3 ++- tests/functional/alpha/meson.build | 10 ++++++++++ .../{test_alpha_clipper.py => alpha/test_clipper.py} | 0 .../test_migration.py} | 0 .../{test_alpha_replay.py => alpha/test_replay.py} | 0 tests/functional/meson.build | 10 +--------- 6 files changed, 13 insertions(+), 10 deletions(-)
Quoted 4 lines
create mode 100644 tests/functional/alpha/meson.build
renametests/functional/{test_alpha_clipper.py=>alpha/test_clipper.py} (100%) renametests/functional/{test_alpha_migration.py=>alpha/test_migration.py} (100%) renametests/functional/{test_alpha_replay.py=>alpha/test_replay.py} (100%)
PATCH 7/24 tests/functional: Move arm tests into architecture specific folder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the arm tests into a target-specific subfolder.
---
MAINTAINERS | 36 +++++------
tests/functional/arm/meson.build | 62 +++++++++++++++++++
.../test_aspeed_ast1030.py} | 0
.../test_aspeed_ast2500.py} | 0
.../test_aspeed_ast2600.py} | 0
.../test_aspeed_bletchley.py} | 0
.../test_aspeed_catalina.py} | 0
.../test_aspeed_gb200nvl_bmc.py} | 0
.../test_aspeed_palmetto.py} | 0
.../test_aspeed_rainier.py} | 0
.../test_aspeed_romulus.py} | 0
.../test_aspeed_witherspoon.py} | 0
.../{test_arm_bflt.py => arm/test_bflt.py} | 0
.../test_bpim2u.py} | 0
.../test_canona1100.py} | 0
.../test_collie.py} | 0
.../test_cubieboard.py} | 0
.../test_emcraft_sf2.py} | 0
.../test_integratorcp.py} | 0
.../test_max78000fthr.py} | 0
.../test_microbit.py} | 0
.../test_migration.py} | 0
.../test_orangepi.py} | 0
.../test_quanta_gsj.py} | 0
.../test_raspi2.py} | 0
.../test_realview.py} | 0
.../test_replay.py} | 0
.../test_smdkc210.py} | 0
.../test_stellaris.py} | 0
.../{test_arm_sx1.py => arm/test_sx1.py} | 0
.../test_tuxrun.py} | 0
.../test_vexpress.py} | 0
.../{test_arm_virt.py => arm/test_virt.py} | 0
tests/functional/meson.build | 62 +------------------
34 files changed, 81 insertions(+), 79 deletions(-)
create mode 100644 tests/functional/arm/meson.build
rename tests/functional/{test_arm_aspeed_ast1030.py => arm/test_aspeed_ast1030.py} (100%)
rename tests/functional/{test_arm_aspeed_ast2500.py => arm/test_aspeed_ast2500.py} (100%)
rename tests/functional/{test_arm_aspeed_ast2600.py => arm/test_aspeed_ast2600.py} (100%)
rename tests/functional/{test_arm_aspeed_bletchley.py => arm/test_aspeed_bletchley.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_aspeed_catalina.py => arm/test_aspeed_catalina.py} (100%)
rename tests/functional/{test_arm_aspeed_gb200nvl_bmc.py => arm/test_aspeed_gb200nvl_bmc.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_aspeed_palmetto.py => arm/test_aspeed_palmetto.py} (100%)
rename tests/functional/{test_arm_aspeed_rainier.py => arm/test_aspeed_rainier.py} (100%)
rename tests/functional/{test_arm_aspeed_romulus.py => arm/test_aspeed_romulus.py} (100%)
rename tests/functional/{test_arm_aspeed_witherspoon.py => arm/test_aspeed_witherspoon.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_arm_bflt.py => arm/test_bflt.py} (100%)
rename tests/functional/{test_arm_bpim2u.py => arm/test_bpim2u.py} (100%)
rename tests/functional/{test_arm_canona1100.py => arm/test_canona1100.py} (100%)
rename tests/functional/{test_arm_collie.py => arm/test_collie.py} (100%)
rename tests/functional/{test_arm_cubieboard.py => arm/test_cubieboard.py} (100%)
rename tests/functional/{test_arm_emcraft_sf2.py => arm/test_emcraft_sf2.py} (100%)
rename tests/functional/{test_arm_integratorcp.py => arm/test_integratorcp.py} (100%)
rename tests/functional/{test_arm_max78000fthr.py => arm/test_max78000fthr.py} (100%)
rename tests/functional/{test_arm_microbit.py => arm/test_microbit.py} (100%)
rename tests/functional/{test_arm_migration.py => arm/test_migration.py} (100%)
rename tests/functional/{test_arm_orangepi.py => arm/test_orangepi.py} (100%)
rename tests/functional/{test_arm_quanta_gsj.py => arm/test_quanta_gsj.py} (100%)
rename tests/functional/{test_arm_raspi2.py => arm/test_raspi2.py} (100%)
rename tests/functional/{test_arm_realview.py => arm/test_realview.py} (100%)
rename tests/functional/{test_arm_replay.py => arm/test_replay.py} (100%)
rename tests/functional/{test_arm_smdkc210.py => arm/test_smdkc210.py} (100%)
rename tests/functional/{test_arm_stellaris.py => arm/test_stellaris.py} (100%)
rename tests/functional/{test_arm_sx1.py => arm/test_sx1.py} (100%)
rename tests/functional/{test_arm_tuxrun.py => arm/test_tuxrun.py} (100%)
rename tests/functional/{test_arm_vexpress.py => arm/test_vexpress.py} (100%)
rename tests/functional/{test_arm_virt.py => arm/test_virt.py} (100%)MAINTAINERS +18 -18
@@ -673,7 +673,7 @@ F: include/hw/*/allwinner* F: hw/arm/cubieboard.c F: docs/system/arm/cubieboard.rst F: hw/misc/axp209.c -F: tests/functional/test_arm_cubieboard.py +F: tests/functional/arm/test_cubieboard.py Allwinner-h3 M: Niek Linnenbank <[email protected]>
@@ -683,7 +683,7 @@ F: hw/*/allwinner-h3* F: include/hw/*/allwinner-h3* F: hw/arm/orangepi.c F: docs/system/arm/orangepi.rst -F: tests/functional/test_arm_orangepi.py +F: tests/functional/arm/test_orangepi.py ARM PrimeCell and CMSDK devices M: Peter Maydell <[email protected]>
@@ -753,7 +753,7 @@ F: docs/system/arm/bananapi_m2u.rst F: hw/*/allwinner-r40*.c F: hw/arm/bananapi_m2u.c F: include/hw/*/allwinner-r40*.h -F: tests/functional/test_arm_bpim2u.py +F: tests/functional/arm/test_bpim2u.py B-L475E-IOT01A IoT Node M: Samuel Tardieu <[email protected]>
@@ -771,7 +771,7 @@ S: Odd Fixes F: hw/*/exynos* F: include/hw/*/exynos* F: docs/system/arm/exynos.rst -F: tests/functional/test_arm_smdkc210.py +F: tests/functional/arm/test_smdkc210.py Calxeda Highbank M: Rob Herring <[email protected]>
@@ -790,7 +790,7 @@ S: Odd Fixes F: include/hw/arm/digic.h F: hw/*/digic* F: include/hw/*/digic* -F: tests/functional/test_arm_canona1100.py +F: tests/functional/arm/test_canona1100.py F: docs/system/arm/digic.rst Goldfish RTC
@@ -833,7 +833,7 @@ S: Odd Fixes F: hw/arm/integratorcp.c F: hw/misc/arm_integrator_debug.c F: include/hw/misc/arm_integrator_debug.h -F: tests/functional/test_arm_integratorcp.py +F: tests/functional/arm/test_integratorcp.py F: docs/system/arm/integratorcp.rst MCIMX6UL EVK / i.MX6ul
@@ -939,7 +939,7 @@ F: pc-bios/npcm7xx_bootrom.bin F: pc-bios/npcm8xx_bootrom.bin F: roms/vbootrom F: docs/system/arm/nuvoton.rst -F: tests/functional/test_arm_quanta_gsj.py +F: tests/functional/arm/test_quanta_gsj.py Raspberry Pi M: Peter Maydell <[email protected]>
@@ -952,7 +952,7 @@ F: hw/*/bcm283* F: include/hw/arm/rasp* F: include/hw/*/bcm283* F: docs/system/arm/raspi.rst -F: tests/functional/test_arm_raspi2.py +F: tests/functional/arm/test_raspi2.py F: tests/functional/aarch64/test_raspi*.py Real View
@@ -964,7 +964,7 @@ F: hw/cpu/realview_mpcore.c F: hw/intc/realview_gic.c F: include/hw/intc/realview_gic.h F: docs/system/arm/realview.rst -F: tests/functional/test_arm_realview.py +F: tests/functional/arm/test_realview.py SABRELITE / i.MX6 M: Peter Maydell <[email protected]>
@@ -1004,7 +1004,7 @@ F: hw/arm/strongarm* F: hw/gpio/zaurus.c F: include/hw/arm/sharpsl.h F: docs/system/arm/collie.rst -F: tests/functional/test_arm_collie.py +F: tests/functional/arm/test_collie.py Stellaris M: Peter Maydell <[email protected]>
@@ -1015,7 +1015,7 @@ F: hw/display/ssd03* F: include/hw/input/stellaris_gamepad.h F: include/hw/timer/stellaris-gptm.h F: docs/system/arm/stellaris.rst -F: tests/functional/test_arm_stellaris.py +F: tests/functional/arm/test_stellaris.py STM32L4x5 SoC Family M: Samuel Tardieu <[email protected]>
@@ -1044,7 +1044,7 @@ S: Odd Fixes F: hw/arm/vexpress.c F: hw/display/sii9022.c F: docs/system/arm/vexpress.rst -F: tests/functional/test_arm_vexpress.py +F: tests/functional/arm/test_vexpress.py Versatile PB M: Peter Maydell <[email protected]>
@@ -1065,8 +1065,8 @@ F: include/hw/arm/virt.h F: docs/system/arm/virt.rst F: tests/functional/aarch64/test_*virt*.py F: tests/functional/aarch64/test_tuxrun.py -F: tests/functional/test_arm_tuxrun.py -F: tests/functional/test_arm_virt.py +F: tests/functional/arm/test_tuxrun.py +F: tests/functional/arm/test_virt.py Xilinx Zynq M: Edgar E. Iglesias <[email protected]>
@@ -1187,7 +1187,7 @@ L: [email protected] S: Maintained F: hw/arm/msf2-som.c F: docs/system/arm/emcraft-sf2.rst -F: tests/functional/test_arm_emcraft_sf2.py +F: tests/functional/arm/test_emcraft_sf2.py ASPEED BMCs M: Cédric Le Goater <[email protected]>
@@ -1220,7 +1220,7 @@ F: hw/*/microbit*.c F: include/hw/*/nrf51*.h F: include/hw/*/microbit*.h F: tests/qtest/microbit-test.c -F: tests/functional/test_arm_microbit.py +F: tests/functional/arm/test_microbit.py F: docs/system/arm/nrf.rst ARM PL011 Rust device
@@ -2076,7 +2076,7 @@ S: Odd Fixes F: hw/*/omap* F: include/hw/arm/omap.h F: docs/system/arm/sx1.rst -F: tests/functional/test_arm_sx1.py +F: tests/functional/arm/test_sx1.py IPack M: Alberto Garcia <[email protected]>
@@ -3911,7 +3911,7 @@ F: configs/targets/*linux-user.mak F: scripts/qemu-binfmt-conf.sh F: scripts/update-syscalltbl.sh F: scripts/update-mips-syscall-args.sh -F: tests/functional/test_arm_bflt.py +F: tests/functional/arm/test_bflt.py Tiny Code Generator (TCG) -------------------------
tests/functional/arm/meson.build new file +62 -0
62 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_max78000fthr.py renamed from tests/functional/test_arm_max78000fthr.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 renamed from tests/functional/test_arm_migration.py +0 -0
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/meson.build +1 -61
74 lines not on this page · raw message
Signature · 1 line
2.50.1
Re: [PATCH 07/24] tests/functional: Move arm tests into architecture specific folder
Hello Thomas,
MAINTAINERS L: [email protected] · line 1193
Quoted 9 lines
MAINTAINERS +1
-1@@ -1187,7 +1187,7 @@ L: [email protected] S: Maintained F: hw/arm/msf2-som.c F: docs/system/arm/emcraft-sf2.rst -F: tests/functional/test_arm_emcraft_sf2.py +F: tests/functional/arm/test_emcraft_sf2.py ASPEED BMCs M: Cédric Le Goater <[email protected]>
Currently the functional tests are matched with :
F: tests/*/*aspeed*
This needs a fix and I think we should be a little more explicit. How about :
F: tests/functional/*/*aspeed*
F: tests/qtest/*ast2700*
F: tests/qtest/*aspeed*
?
Thanks,
C.
Re: [PATCH 07/24] tests/functional: Move arm tests into architecture specific folder
Quoted 15 lines · Cédric Le Goater
Hello Thomas,
Quoted 8 lines
(quoted diff) +0
-0@@ -1187,7 +1187,7 @@ L: [email protected]S: Maintained
F:hw/arm/msf2-som.c
F:docs/system/arm/emcraft-sf2.rstMAINTAINERS +1
-1-F: tests/functional/test_arm_emcraft_sf2.py +F: tests/functional/arm/test_emcraft_sf2.pyASPEED BMCs
M: Cédric Le Goater <[email protected]>Currently the functional tests are matched with :
F: tests/*/*aspeed*
Quoted 8 lines
This needs a fix and I think we should be a little more explicit. How about :
F: tests/functional/*/*aspeed*
F: tests/qtest/*ast2700*
F: tests/qtest/*aspeed*?
Yes, sounds good, I'll change it in v2.
Thomas
PATCH 8/24 tests/functional: Move avr tests into architecture specific folder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the avr tests into a target-specific subfolder.
---
MAINTAINERS | 4 ++--
tests/functional/avr/meson.build | 6 ++++++
.../{test_avr_mega2560.py => avr/test_mega2560.py} | 0
tests/functional/{test_avr_uno.py => avr/test_uno.py} | 0
tests/functional/meson.build | 6 +-----
5 files changed, 9 insertions(+), 7 deletions(-)
create mode 100644 tests/functional/avr/meson.build
rename tests/functional/{test_avr_mega2560.py => avr/test_mega2560.py} (100%)
rename tests/functional/{test_avr_uno.py => avr/test_uno.py} (100%)MAINTAINERS +2 -2
@@ -221,7 +221,7 @@ S: Maintained F: docs/system/target-avr.rst F: gdb-xml/avr-cpu.xml F: target/avr/ -F: tests/functional/test_avr_*.py +F: tests/functional/avr/ Hexagon TCG CPUs M: Brian Cain <[email protected]>
@@ -1247,7 +1247,7 @@ Arduino M: Philippe Mathieu-Daudé <[email protected]> S: Maintained F: hw/avr/arduino.c -F: tests/functional/test_avr_uno.py +F: tests/functional/avr/test_uno.py HP-PARISC Machines ------------------
tests/functional/avr/meson.build new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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/meson.build +1 -5
@@ -12,6 +12,7 @@ endif subdir('aarch64') subdir('alpha') subdir('arm') +subdir('avr') test_mips_timeouts = { 'mips_malta' : 480,
@@ -77,11 +78,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_avr_system_thorough = [ - 'avr_mega2560', - 'avr_uno', -] - tests_hppa_system_quick = [ 'hppa_seabios', ]
Signature · 1 line
2.50.1
Re: [PATCH 08/24] tests/functional: Move avr tests into architecture specific folder
Quoted 13 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the avr tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 4 ++-- tests/functional/avr/meson.build | 6 ++++++ .../{test_avr_mega2560.py => avr/test_mega2560.py} | 0 tests/functional/{test_avr_uno.py => avr/test_uno.py} | 0 tests/functional/meson.build | 6 +----- 5 files changed, 9 insertions(+), 7 deletions(-)
Quoted 3 lines
create mode 100644 tests/functional/avr/meson.build
renametests/functional/{test_avr_mega2560.py=>avr/test_mega2560.py} (100%) renametests/functional/{test_avr_uno.py=>avr/test_uno.py} (100%)
PATCH 9/24 tests/functional: Move hppa tests into architecture specific folder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the avr tests into a target-specific subfolder.
---
MAINTAINERS | 2 +-
tests/functional/hppa/meson.build | 5 +++++
.../{test_hppa_seabios.py => hppa/test_seabios.py} | 0
tests/functional/meson.build | 5 +----
4 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 tests/functional/hppa/meson.build
rename tests/functional/{test_hppa_seabios.py => hppa/test_seabios.py} (100%)MAINTAINERS +1 -1
@@ -1271,7 +1271,7 @@ F: include/hw/pci-host/astro.h F: include/hw/pci-host/dino.h F: pc-bios/hppa-firmware.img F: roms/seabios-hppa/ -F: tests/functional/test_hppa_seabios.py +F: tests/functional/hppa/test_seabios.py LoongArch Machines ------------------
tests/functional/hppa/meson.build new file +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_hppa_system_quick = [ + 'seabios', +]
tests/functional/hppa/test_seabios.py renamed from tests/functional/test_hppa_seabios.py +0 -0
tests/functional/meson.build +1 -4
@@ -13,6 +13,7 @@ subdir('aarch64') subdir('alpha') subdir('arm') subdir('avr') +subdir('hppa') test_mips_timeouts = { 'mips_malta' : 480,
@@ -78,10 +79,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_hppa_system_quick = [ - 'hppa_seabios', -] - tests_i386_system_quick = [ 'i386_migration', ]
Signature · 1 line
2.50.1
Re: [PATCH 09/24] tests/functional: Move hppa tests into architecture specific folder
Quoted 6 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the avr tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>
Quoted 8 lines
--- MAINTAINERS | 2 +- tests/functional/hppa/meson.build | 5 +++++ .../{test_hppa_seabios.py => hppa/test_seabios.py} | 0 tests/functional/meson.build | 5 +---- 4 files changed, 7 insertions(+), 5 deletions(-)create mode 100644 tests/functional/hppa/meson.build
renametests/functional/{test_hppa_seabios.py=>hppa/test_seabios.py} (100%)
PATCH 10/24 tests/functional: Move i386 tests into architecture specific folder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the i386 tests into a target-specific subfolder.
---
MAINTAINERS | 2 +-
tests/functional/i386/meson.build | 10 ++++++++++
.../{test_i386_migration.py => i386/test_migration.py} | 0
.../{test_i386_replay.py => i386/test_replay.py} | 0
.../{test_i386_tuxrun.py => i386/test_tuxrun.py} | 0
tests/functional/meson.build | 10 +---------
6 files changed, 12 insertions(+), 10 deletions(-)
create mode 100644 tests/functional/i386/meson.build
rename tests/functional/{test_i386_migration.py => i386/test_migration.py} (100%)
rename tests/functional/{test_i386_replay.py => i386/test_replay.py} (100%)
rename tests/functional/{test_i386_tuxrun.py => i386/test_tuxrun.py} (100%)MAINTAINERS +1 -1
@@ -1888,7 +1888,7 @@ F: hw/isa/apm.c F: include/hw/isa/apm.h F: tests/unit/test-x86-topo.c F: tests/qtest/test-x86-cpuid-compat.c -F: tests/functional/test_i386_tuxrun.py +F: tests/functional/i386/test_tuxrun.py F: tests/functional/test_linux_initrd.py F: tests/functional/test_mem_addr_space.py F: tests/functional/test_pc_cpu_hotplug_props.py
tests/functional/i386/meson.build new file +10 -0
@@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_i386_system_quick = [ + 'migration', +] + +tests_i386_system_thorough = [ + 'replay', + 'tuxrun', +]
tests/functional/i386/test_migration.py renamed from tests/functional/test_i386_migration.py +0 -0
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/meson.build +1 -9
@@ -14,6 +14,7 @@ subdir('alpha') subdir('arm') subdir('avr') subdir('hppa') +subdir('i386') test_mips_timeouts = { 'mips_malta' : 480,
@@ -79,15 +80,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_i386_system_quick = [ - 'i386_migration', -] - -tests_i386_system_thorough = [ - 'i386_replay', - 'i386_tuxrun', -] - tests_loongarch64_system_thorough = [ 'loongarch64_virt', ]
Signature · 1 line
2.50.1
PATCH 11/24 tests/functional: Move loongarch64 tests into architecture specific folder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the loongarch64 tests into a target-specific subfolder.
---
MAINTAINERS | 2 +-
tests/functional/loongarch64/meson.build | 5 +++++
.../{test_loongarch64_virt.py => loongarch64/test_virt.py} | 0
tests/functional/meson.build | 5 +----
4 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 tests/functional/loongarch64/meson.build
rename tests/functional/{test_loongarch64_virt.py => loongarch64/test_virt.py} (100%)MAINTAINERS +1 -1
@@ -257,7 +257,7 @@ M: Song Gao <[email protected]> S: Maintained F: target/loongarch/ F: tests/tcg/loongarch64/ -F: tests/functional/test_loongarch64_virt.py +F: tests/functional/loongarch64/test_virt.py M68K TCG CPUs M: Laurent Vivier <[email protected]>
tests/functional/loongarch64/meson.build new file +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_loongarch64_system_thorough = [ + 'virt', +]
tests/functional/loongarch64/test_virt.py renamed from tests/functional/test_loongarch64_virt.py +0 -0
tests/functional/meson.build +1 -4
@@ -15,6 +15,7 @@ subdir('arm') subdir('avr') subdir('hppa') subdir('i386') +subdir('loongarch64') test_mips_timeouts = { 'mips_malta' : 480,
@@ -80,10 +81,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_loongarch64_system_thorough = [ - 'loongarch64_virt', -] - tests_m68k_system_thorough = [ 'm68k_mcf5208evb', 'm68k_nextcube',
Signature · 1 line
2.50.1
Re: [PATCH 11/24] tests/functional: Move loongarch64 tests into architecture specific folder
Quoted 25 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the loongarch64 tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 2 +- tests/functional/loongarch64/meson.build | 5 +++++ .../{test_loongarch64_virt.py => loongarch64/test_virt.py} | 0 tests/functional/meson.build | 5 +---- 4 files changed, 7 insertions(+), 5 deletions(-)create mode 100644 tests/functional/loongarch64/meson.build
renametests/functional/{test_loongarch64_virt.py=>loongarch64/test_virt.py} (100%)tests/functional/loongarch64/test_virt.py renamed from tests/functional/test_loongarch64_virt.py +0
-0tests/functional/meson.build +0
-0
tests/functional/meson.build subdir('arm') · line 18
Quoted 4 lines
tests/functional/meson.build +1
-0@@ -15,6 +15,7 @@ subdir('arm') subdir('avr') subdir('hppa') subdir('i386') +subdir('loongarch64')
I'd just go with generic 'loongarch'. Regardless:
PATCH 12/24 tests/functional: Move m68k tests into architecture specific folder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the m68k tests into a target-specific subfolder.
---
MAINTAINERS | 8 ++++----
tests/functional/m68k/meson.build | 9 +++++++++
.../{test_m68k_mcf5208evb.py => m68k/test_mcf5208evb.py} | 0
.../{test_m68k_nextcube.py => m68k/test_nextcube.py} | 0
.../functional/{test_m68k_q800.py => m68k/test_q800.py} | 0
.../{test_m68k_replay.py => m68k/test_replay.py} | 0
.../{test_m68k_tuxrun.py => m68k/test_tuxrun.py} | 0
tests/functional/meson.build | 9 +--------
8 files changed, 14 insertions(+), 12 deletions(-)
create mode 100644 tests/functional/m68k/meson.build
rename tests/functional/{test_m68k_mcf5208evb.py => m68k/test_mcf5208evb.py} (100%)
rename tests/functional/{test_m68k_nextcube.py => m68k/test_nextcube.py} (100%)
rename tests/functional/{test_m68k_q800.py => m68k/test_q800.py} (100%)
rename tests/functional/{test_m68k_replay.py => m68k/test_replay.py} (100%)
rename tests/functional/{test_m68k_tuxrun.py => m68k/test_tuxrun.py} (100%)MAINTAINERS +4 -4
@@ -1309,7 +1309,7 @@ F: hw/m68k/mcf_intc.c F: hw/char/mcf_uart.c F: hw/net/mcf_fec.c F: include/hw/m68k/mcf*.h -F: tests/functional/test_m68k_mcf5208evb.py +F: tests/functional/m68k/test_mcf5208evb.py NeXTcube M: Thomas Huth <[email protected]>
@@ -1317,7 +1317,7 @@ S: Odd Fixes F: hw/m68k/next-*.c F: hw/display/next-fb.c F: include/hw/m68k/next-cube.h -F: tests/functional/test_m68k_nextcube.py +F: tests/functional/m68k/test_nextcube.py q800 M: Laurent Vivier <[email protected]>
@@ -1343,7 +1343,7 @@ F: include/hw/m68k/q800-glue.h F: include/hw/misc/djmemc.h F: include/hw/misc/iosb.h F: include/hw/audio/asc.h -F: tests/functional/test_m68k_q800.py +F: tests/functional/m68k/test_q800.py virt M: Laurent Vivier <[email protected]>
@@ -1358,7 +1358,7 @@ F: include/hw/intc/goldfish_pic.h F: include/hw/intc/m68k_irqc.h F: include/hw/misc/virt_ctrl.h F: docs/specs/virt-ctlr.rst -F: tests/functional/test_m68k_tuxrun.py +F: tests/functional/m68k/test_tuxrun.py MicroBlaze Machines -------------------
tests/functional/m68k/meson.build new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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 +1 -8
@@ -16,6 +16,7 @@ subdir('avr') subdir('hppa') subdir('i386') subdir('loongarch64') +subdir('m68k') test_mips_timeouts = { 'mips_malta' : 480,
@@ -81,14 +82,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_m68k_system_thorough = [ - 'm68k_mcf5208evb', - 'm68k_nextcube', - 'm68k_replay', - 'm68k_q800', - 'm68k_tuxrun', -] - tests_microblaze_system_thorough = [ 'microblaze_replay', 'microblaze_s3adsp1800'
Signature · 1 line
2.50.1
Re: [PATCH 12/24] tests/functional: Move m68k tests into architecture specific folder
Quoted 16 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the m68k tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 8 ++++---- tests/functional/m68k/meson.build | 9 +++++++++ .../{test_m68k_mcf5208evb.py => m68k/test_mcf5208evb.py} | 0 .../{test_m68k_nextcube.py => m68k/test_nextcube.py} | 0 .../functional/{test_m68k_q800.py => m68k/test_q800.py} | 0 .../{test_m68k_replay.py => m68k/test_replay.py} | 0 .../{test_m68k_tuxrun.py => m68k/test_tuxrun.py} | 0 tests/functional/meson.build | 9 +-------- 8 files changed, 14 insertions(+), 12 deletions(-)
Quoted 6 lines
create mode 100644 tests/functional/m68k/meson.build
renametests/functional/{test_m68k_mcf5208evb.py=>m68k/test_mcf5208evb.py} (100%) renametests/functional/{test_m68k_nextcube.py=>m68k/test_nextcube.py} (100%) renametests/functional/{test_m68k_q800.py=>m68k/test_q800.py} (100%) renametests/functional/{test_m68k_replay.py=>m68k/test_replay.py} (100%) renametests/functional/{test_m68k_tuxrun.py=>m68k/test_tuxrun.py} (100%)
PATCH 13/24 tests/functional: Move microblaze tests into architecture specific folder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the microblaze tests into a target-specific subfolder.
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 11 ++---------
tests/functional/microblaze/meson.build | 6 ++++++
.../test_replay.py} | 0
.../test_s3adsp1800.py} | 0
tests/functional/microblazeel/meson.build | 5 +++++
.../test_s3adsp1800.py} | 2 +-
7 files changed, 15 insertions(+), 11 deletions(-)
create mode 100644 tests/functional/microblaze/meson.build
rename tests/functional/{test_microblaze_replay.py => microblaze/test_replay.py} (100%)
rename tests/functional/{test_microblaze_s3adsp1800.py => microblaze/test_s3adsp1800.py} (100%)
create mode 100644 tests/functional/microblazeel/meson.build
rename tests/functional/{test_microblazeel_s3adsp1800.py => microblazeel/test_s3adsp1800.py} (92%)MAINTAINERS +1 -1
@@ -1367,7 +1367,7 @@ M: Edgar E. Iglesias <[email protected]> S: Maintained F: hw/microblaze/petalogix_s3adsp1800_mmu.c F: include/hw/char/xilinx_uartlite.h -F: tests/functional/test_microblaze*.py +F: tests/functional/microblaze*/test_s3adsp1800.py petalogix_ml605 M: Edgar E. Iglesias <[email protected]>
tests/functional/meson.build +2 -9
@@ -17,6 +17,8 @@ subdir('hppa') subdir('i386') subdir('loongarch64') subdir('m68k') +subdir('microblaze') +subdir('microblazeel') test_mips_timeouts = { 'mips_malta' : 480,
@@ -82,15 +84,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_microblaze_system_thorough = [ - 'microblaze_replay', - 'microblaze_s3adsp1800' -] - -tests_microblazeel_system_thorough = [ - 'microblazeel_s3adsp1800' -] - tests_mips_system_thorough = [ 'mips_malta', 'mips_replay',
tests/functional/microblaze/meson.build new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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 +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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):
Signature · 1 line
2.50.1
Re: [PATCH 13/24] tests/functional: Move microblaze tests into architecture specific folder
Quoted 15 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the microblaze tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 2 +- tests/functional/meson.build | 11 ++--------- tests/functional/microblaze/meson.build | 6 ++++++ .../test_replay.py} | 0 .../test_s3adsp1800.py} | 0 tests/functional/microblazeel/meson.build | 5 +++++ .../test_s3adsp1800.py} | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-)
Quoted 5 lines
create mode 100644 tests/functional/microblaze/meson.build
renametests/functional/{test_microblaze_replay.py=>microblaze/test_replay.py} (100%) renametests/functional/{test_microblaze_s3adsp1800.py=>microblaze/test_s3adsp1800.py} (100%) create mode 100644 tests/functional/microblazeel/meson.build
renametests/functional/{test_microblazeel_s3adsp1800.py=>microblazeel/test_s3adsp1800.py} (92%)
PATCH 14/24 tests/functional: Move mips tests into target-specific folders
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the mips tests into a target-specific subfolder.
---
MAINTAINERS | 8 ++--
tests/functional/meson.build | 47 ++-----------------
tests/functional/mips/meson.build | 11 +++++
.../test_malta.py} | 0
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
tests/functional/mips64/meson.build | 10 ++++
.../test_malta.py} | 2 +-
.../test_tuxrun.py} | 0
tests/functional/mips64el/meson.build | 14 ++++++
.../test_fuloong2e.py} | 0
.../test_loongson3v.py} | 0
.../test_malta.py} | 4 +-
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
tests/functional/mipsel/meson.build | 12 +++++
.../test_malta.py} | 2 +-
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
19 files changed, 59 insertions(+), 51 deletions(-)
create mode 100644 tests/functional/mips/meson.build
rename tests/functional/{test_mips_malta.py => mips/test_malta.py} (100%)
rename tests/functional/{test_mips_replay.py => mips/test_replay.py} (100%)
rename tests/functional/{test_mips_tuxrun.py => mips/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mips64/meson.build
rename tests/functional/{test_mips64_malta.py => mips64/test_malta.py} (96%)
rename tests/functional/{test_mips64_tuxrun.py => mips64/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mips64el/meson.build
rename tests/functional/{test_mips64el_fuloong2e.py => mips64el/test_fuloong2e.py} (100%)
rename tests/functional/{test_mips64el_loongson3v.py => mips64el/test_loongson3v.py} (100%)
rename tests/functional/{test_mips64el_malta.py => mips64el/test_malta.py} (98%)
rename tests/functional/{test_mips64el_replay.py => mips64el/test_replay.py} (100%)
rename tests/functional/{test_mips64el_tuxrun.py => mips64el/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mipsel/meson.build
rename tests/functional/{test_mipsel_malta.py => mipsel/test_malta.py} (98%)
rename tests/functional/{test_mipsel_replay.py => mipsel/test_replay.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_mipsel_tuxrun.py => mipsel/test_tuxrun.py} (100%)MAINTAINERS +4 -4
@@ -1403,8 +1403,8 @@ F: hw/acpi/piix4.c F: hw/mips/malta.c F: hw/pci-host/gt64120.c F: include/hw/southbridge/piix.h -F: tests/functional/test_mips*_malta.py -F: tests/functional/test_mips*_tuxrun.py +F: tests/functional/mips*/test_malta.py +F: tests/functional/mips*/test_tuxrun.py Mipssim R: Aleksandar Rikalo <[email protected]>
@@ -1420,7 +1420,7 @@ S: Odd Fixes F: hw/mips/fuloong2e.c F: hw/pci-host/bonito.c F: include/hw/pci-host/bonito.h -F: tests/functional/test_mips64el_fuloong2e.py +F: tests/functional/mips64el/test_fuloong2e.py Loongson-3 virtual platforms M: Huacai Chen <[email protected]>
@@ -1435,7 +1435,7 @@ F: hw/mips/loongson3_virt.c F: include/hw/intc/loongson_ipi_common.h F: include/hw/intc/loongson_ipi.h F: include/hw/intc/loongson_liointc.h -F: tests/functional/test_mips64el_loongson3v.py +F: tests/functional/mips64el/test_loongson3v.py Boston M: Paul Burton <[email protected]>
tests/functional/meson.build +4 -43
59 lines not on this page · raw message
tests/functional/mips/meson.build new file +11 -0
@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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
Signature · 1 line
2.50.1
Re: [PATCH 14/24] tests/functional: Move mips tests into target-specific folders
Hi Thomas,
Quoted 47 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the mips tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 8 ++-- tests/functional/meson.build | 47 ++----------------- tests/functional/mips/meson.build | 11 +++++ .../test_malta.py} | 0 .../test_replay.py} | 0 .../test_tuxrun.py} | 0 tests/functional/mips64/meson.build | 10 ++++ .../test_malta.py} | 2 +- .../test_tuxrun.py} | 0 tests/functional/mips64el/meson.build | 14 ++++++ .../test_fuloong2e.py} | 0 .../test_loongson3v.py} | 0 .../test_malta.py} | 4 +- .../test_replay.py} | 0 .../test_tuxrun.py} | 0 tests/functional/mipsel/meson.build | 12 +++++ .../test_malta.py} | 2 +- .../test_replay.py} | 0 .../test_tuxrun.py} | 0 19 files changed, 59 insertions(+), 51 deletions(-)create mode 100644 tests/functional/mips/meson.build
renametests/functional/{test_mips_malta.py=>mips/test_malta.py} (100%) renametests/functional/{test_mips_replay.py=>mips/test_replay.py} (100%) renametests/functional/{test_mips_tuxrun.py=>mips/test_tuxrun.py} (100%) create mode 100644 tests/functional/mips64/meson.build
renametests/functional/{test_mips64_malta.py=>mips64/test_malta.py} (96%) renametests/functional/{test_mips64_tuxrun.py=>mips64/test_tuxrun.py} (100%) create mode 100644 tests/functional/mips64el/meson.build
renametests/functional/{test_mips64el_fuloong2e.py=>mips64el/test_fuloong2e.py} (100%) renametests/functional/{test_mips64el_loongson3v.py=>mips64el/test_loongson3v.py} (100%) renametests/functional/{test_mips64el_malta.py=>mips64el/test_malta.py} (98%) renametests/functional/{test_mips64el_replay.py=>mips64el/test_replay.py} (100%) renametests/functional/{test_mips64el_tuxrun.py=>mips64el/test_tuxrun.py} (100%) create mode 100644 tests/functional/mipsel/meson.build
renametests/functional/{test_mipsel_malta.py=>mipsel/test_malta.py} (98%) renametests/functional/{test_mipsel_replay.py=>mipsel/test_replay.py} (100%) mode change 100644 => 100755
renametests/functional/{test_mipsel_tuxrun.py=>mipsel/test_tuxrun.py} (100%)
tests/functional/meson.build subdir('loongarch64') · line 25
Quoted 4 lines
tests/functional/meson.build +4
-0+subdir('mips') +subdir('mipsel') +subdir('mips64') +subdir('mips64el')
Just one single comment here. I'd rather have a single mips/ directory and keep the variants inside it, i.e.:
tests/functional/mips/test_mips64el_malta.py
Anyhow:
Re: [PATCH 14/24] tests/functional: Move mips tests into target-specific folders
Quoted 58 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 47 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the mips tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>---
MAINTAINERS | 8 ++-- tests/functional/meson.build | 47 ++----------------- tests/functional/mips/meson.build | 11 +++++ .../test_malta.py} | 0 .../test_replay.py} | 0 .../test_tuxrun.py} | 0 tests/functional/mips64/meson.build | 10 ++++ .../test_malta.py} | 2 +- .../test_tuxrun.py} | 0 tests/functional/mips64el/meson.build | 14 ++++++ .../test_fuloong2e.py} | 0 .../test_loongson3v.py} | 0 .../test_malta.py} | 4 +- .../test_replay.py} | 0 .../test_tuxrun.py} | 0 tests/functional/mipsel/meson.build | 12 +++++ .../test_malta.py} | 2 +- .../test_replay.py} | 0 .../test_tuxrun.py} | 019 files changed, 59 insertions(+), 51 deletions(-)create mode 100644 tests/functional/mips/meson.build
renametests/functional/{test_mips_malta.py=>mips/test_malta.py} (100%) renametests/functional/{test_mips_replay.py=>mips/test_replay.py} (100%) renametests/functional/{test_mips_tuxrun.py=>mips/test_tuxrun.py} (100%) create mode 100644 tests/functional/mips64/meson.build
renametests/functional/{test_mips64_malta.py=>mips64/test_malta.py} (96%) renametests/functional/{test_mips64_tuxrun.py=>mips64/test_tuxrun.py} (100%) create mode 100644 tests/functional/mips64el/meson.build
renametests/functional/{test_mips64el_fuloong2e.py=> mips64el/test_fuloong2e.py} (100%) renametests/functional/{test_mips64el_loongson3v.py=> mips64el/test_loongson3v.py} (100%) renametests/functional/{test_mips64el_malta.py=> mips64el/test_malta.py} (98%) renametests/functional/{test_mips64el_replay.py=> mips64el/test_replay.py} (100%) renametests/functional/{test_mips64el_tuxrun.py=> mips64el/test_tuxrun.py} (100%) create mode 100644 tests/functional/mipsel/meson.build
renametests/functional/{test_mipsel_malta.py=>mipsel/test_malta.py} (98%) renametests/functional/{test_mipsel_replay.py=>mipsel/test_replay.py} (100%) mode change 100644 => 100755
renametests/functional/{test_mipsel_tuxrun.py=>mipsel/test_tuxrun.py} (100%)tests/functional/meson.build subdir('loongarch64') · line 25
Quoted 4 lines
tests/functional/meson.build +4
-0+subdir('mips') +subdir('mipsel') +subdir('mips64') +subdir('mips64el')Just one single comment here. I'd rather have a single mips/ directory and keep the variants inside it, i.e.:
Quoted 1 line
tests/functional/mips/test_mips64el_malta.py
That would make it very cumbersome to determine which qemu-system-mips* binary we'd need for those tests. Currently the tests for each qemu-system-xyz are simply looked up in the xyz subfolder. If we put all mips targets into one folder, we'd need to add some special case logic which I'd really like to avoid. And in case the mips targets get unified later, we still can simply move the tests to one folder again, there is no hurry to do this right now already.
Thomas
Philippe Mathieu-Daudé
Reviewed-byRe: [PATCH 14/24] tests/functional: Move mips tests into target-specific folders
Quoted 59 lines · Thomas Huth
Quoted 58 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 47 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the mips tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>---
MAINTAINERS | 8 ++-- tests/functional/meson.build | 47 ++----------------- tests/functional/mips/meson.build | 11 +++++ .../test_malta.py} | 0 .../test_replay.py} | 0 .../test_tuxrun.py} | 0 tests/functional/mips64/meson.build | 10 ++++ .../test_malta.py} | 2 +- .../test_tuxrun.py} | 0 tests/functional/mips64el/meson.build | 14 ++++++ .../test_fuloong2e.py} | 0 .../test_loongson3v.py} | 0 .../test_malta.py} | 4 +- .../test_replay.py} | 0 .../test_tuxrun.py} | 0 tests/functional/mipsel/meson.build | 12 +++++ .../test_malta.py} | 2 +- .../test_replay.py} | 0 .../test_tuxrun.py} | 019 files changed, 59 insertions(+), 51 deletions(-)create mode 100644 tests/functional/mips/meson.build
renametests/functional/{test_mips_malta.py=>mips/test_malta.py} (100%) renametests/functional/{test_mips_replay.py=> mips/test_replay.py} (100%) renametests/functional/{test_mips_tuxrun.py=> mips/test_tuxrun.py} (100%) create mode 100644 tests/functional/mips64/meson.build
renametests/functional/{test_mips64_malta.py=> mips64/test_malta.py} (96%) renametests/functional/{test_mips64_tuxrun.py=> mips64/test_tuxrun.py} (100%) create mode 100644 tests/functional/mips64el/meson.build
renametests/functional/{test_mips64el_fuloong2e.py=> mips64el/test_fuloong2e.py} (100%) renametests/functional/{test_mips64el_loongson3v.py=> mips64el/test_loongson3v.py} (100%) renametests/functional/{test_mips64el_malta.py=> mips64el/test_malta.py} (98%) renametests/functional/{test_mips64el_replay.py=> mips64el/test_replay.py} (100%) renametests/functional/{test_mips64el_tuxrun.py=> mips64el/test_tuxrun.py} (100%) create mode 100644 tests/functional/mipsel/meson.build
renametests/functional/{test_mipsel_malta.py=> mipsel/test_malta.py} (98%) renametests/functional/{test_mipsel_replay.py=> mipsel/test_replay.py} (100%) mode change 100644 => 100755
renametests/functional/{test_mipsel_tuxrun.py=> mipsel/test_tuxrun.py} (100%)tests/functional/meson.build subdir('loongarch64') · line 25
Quoted 4 lines
tests/functional/meson.build +4
-0+subdir('mips') +subdir('mipsel') +subdir('mips64') +subdir('mips64el')Just one single comment here. I'd rather have a single mips/ directory and keep the variants inside it, i.e.:
Quoted 4 lines
Quoted 1 line
tests/functional/mips/test_mips64el_malta.pyThat would make it very cumbersome to determine which qemu-system-mips* binary we'd need for those tests. Currently the tests for each qemu- system-xyz are simply looked up in the xyz subfolder. If we put all mips targets into one folder, we'd need to add some special case logic which I'd really like to avoid. And in case the mips targets get unified later, we still can simply move the tests to one folder again, there is no hurry to do this right now already.
Alright, fine then.
PATCH 15/24 tests/functional: Move or1k tests into target-specific folders
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the openrisc tests into a target-specific subfolder.
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 6 +-----
tests/functional/or1k/meson.build | 6 ++++++
.../functional/{test_or1k_replay.py => or1k/test_replay.py} | 0
tests/functional/{test_or1k_sim.py => or1k/test_sim.py} | 0
5 files changed, 8 insertions(+), 6 deletions(-)
create mode 100644 tests/functional/or1k/meson.build
rename tests/functional/{test_or1k_replay.py => or1k/test_replay.py} (100%)
rename tests/functional/{test_or1k_sim.py => or1k/test_sim.py} (100%)MAINTAINERS +1 -1
@@ -1454,7 +1454,7 @@ S: Maintained F: docs/system/openrisc/or1k-sim.rst F: hw/intc/ompic.c F: hw/openrisc/openrisc_sim.c -F: tests/functional/test_or1k_sim.py +F: tests/functional/or1k/test_sim.py PowerPC Machines ----------------
tests/functional/meson.build +1 -5
@@ -23,6 +23,7 @@ subdir('mips') subdir('mipsel') subdir('mips64') subdir('mips64el') +subdir('or1k') test_ppc_timeouts = { 'ppc_40p' : 240,
@@ -70,11 +71,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_or1k_system_thorough = [ - 'or1k_replay', - 'or1k_sim', -] - tests_ppc_system_quick = [ 'ppc_migration', 'ppc_74xx',
tests/functional/or1k/meson.build new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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
Signature · 1 line
2.50.1
Re: [PATCH 15/24] tests/functional: Move or1k tests into target-specific folders
Quoted 13 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the openrisc tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 2 +- tests/functional/meson.build | 6 +----- tests/functional/or1k/meson.build | 6 ++++++ .../functional/{test_or1k_replay.py => or1k/test_replay.py} | 0 tests/functional/{test_or1k_sim.py => or1k/test_sim.py} | 0 5 files changed, 8 insertions(+), 6 deletions(-)
Quoted 3 lines
create mode 100644 tests/functional/or1k/meson.build
renametests/functional/{test_or1k_replay.py=>or1k/test_replay.py} (100%) renametests/functional/{test_or1k_sim.py=>or1k/test_sim.py} (100%)
PATCH 16/24 tests/functional: Move ppc/ppc64 tests into target-specific folders
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the ppc and ppc64 tests into a target-specific subfolder.
---
MAINTAINERS | 32 ++++++-------
tests/functional/meson.build | 47 +------------------
tests/functional/ppc/meson.build | 22 +++++++++
.../{test_ppc_40p.py => ppc/test_40p.py} | 0
.../{test_ppc_74xx.py => ppc/test_74xx.py} | 0
.../{test_ppc_amiga.py => ppc/test_amiga.py} | 0
.../test_bamboo.py} | 0
.../{test_ppc_mac.py => ppc/test_mac.py} | 0
.../test_migration.py} | 0
.../test_mpc8544ds.py} | 0
.../test_replay.py} | 0
.../test_sam460ex.py} | 0
.../test_tuxrun.py} | 0
.../test_virtex_ml507.py} | 0
tests/functional/ppc64/meson.build | 25 ++++++++++
.../test_e500.py} | 0
.../{test_ppc64_hv.py => ppc64/test_hv.py} | 0
.../test_mac99.py} | 0
.../test_migration.py} | 0
.../test_powernv.py} | 0
.../test_pseries.py} | 0
.../test_replay.py} | 0
.../test_reverse_debug.py} | 0
.../test_tuxrun.py} | 0
24 files changed, 65 insertions(+), 61 deletions(-)
create mode 100644 tests/functional/ppc/meson.build
rename tests/functional/{test_ppc_40p.py => ppc/test_40p.py} (100%)
rename tests/functional/{test_ppc_74xx.py => ppc/test_74xx.py} (100%)
rename tests/functional/{test_ppc_amiga.py => ppc/test_amiga.py} (100%)
rename tests/functional/{test_ppc_bamboo.py => ppc/test_bamboo.py} (100%)
rename tests/functional/{test_ppc_mac.py => ppc/test_mac.py} (100%)
rename tests/functional/{test_ppc_migration.py => ppc/test_migration.py} (100%)
rename tests/functional/{test_ppc_mpc8544ds.py => ppc/test_mpc8544ds.py} (100%)
rename tests/functional/{test_ppc_replay.py => ppc/test_replay.py} (100%)
rename tests/functional/{test_ppc_sam460ex.py => ppc/test_sam460ex.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_ppc_tuxrun.py => ppc/test_tuxrun.py} (100%)
rename tests/functional/{test_ppc_virtex_ml507.py => ppc/test_virtex_ml507.py} (100%)
create mode 100644 tests/functional/ppc64/meson.build
rename tests/functional/{test_ppc64_e500.py => ppc64/test_e500.py} (100%)
rename tests/functional/{test_ppc64_hv.py => ppc64/test_hv.py} (100%)
rename tests/functional/{test_ppc64_mac99.py => ppc64/test_mac99.py} (100%)
rename tests/functional/{test_ppc64_migration.py => ppc64/test_migration.py} (100%)
rename tests/functional/{test_ppc64_powernv.py => ppc64/test_powernv.py} (100%)
rename tests/functional/{test_ppc64_pseries.py => ppc64/test_pseries.py} (100%)
rename tests/functional/{test_ppc64_replay.py => ppc64/test_replay.py} (100%)
rename tests/functional/{test_ppc64_reverse_debug.py => ppc64/test_reverse_debug.py} (100%)
rename tests/functional/{test_ppc64_tuxrun.py => ppc64/test_tuxrun.py} (100%)MAINTAINERS +16 -16
@@ -309,7 +309,7 @@ F: configs/devices/ppc* F: docs/system/ppc/embedded.rst F: docs/system/target-ppc.rst F: tests/tcg/ppc*/* -F: tests/functional/test_ppc_74xx.py +F: tests/functional/ppc/test_74xx.py RISC-V TCG CPUs M: Palmer Dabbelt <[email protected]>
@@ -1463,7 +1463,7 @@ L: [email protected] S: Orphan F: hw/ppc/ppc440_bamboo.c F: hw/pci-host/ppc4xx_pci.c -F: tests/functional/test_ppc_bamboo.py +F: tests/functional/ppc/test_bamboo.py e500 M: Bernhard Beschow <[email protected]>
@@ -1481,8 +1481,8 @@ F: pc-bios/u-boot.e500 F: hw/intc/openpic_kvm.c F: include/hw/ppc/openpic_kvm.h F: docs/system/ppc/ppce500.rst -F: tests/functional/test_ppc64_e500.py -F: tests/functional/test_ppc_tuxrun.py +F: tests/functional/ppc64/test_e500.py +F: tests/functional/ppc/test_tuxrun.py mpc8544ds M: Bernhard Beschow <[email protected]>
@@ -1490,7 +1490,7 @@ L: [email protected] S: Odd Fixes F: hw/ppc/mpc8544ds.c F: hw/ppc/mpc8544_guts.c -F: tests/functional/test_ppc_mpc8544ds.py +F: tests/functional/ppc/test_mpc8544ds.py New World (mac99) M: Mark Cave-Ayland <[email protected]>
@@ -1512,8 +1512,8 @@ F: include/hw/ppc/mac_dbdma.h F: include/hw/pci-host/uninorth.h F: include/hw/input/adb* F: pc-bios/qemu_vga.ndrv -F: tests/functional/test_ppc_mac.py -F: tests/functional/test_ppc64_mac99.py +F: tests/functional/ppc/test_mac.py +F: tests/functional/ppc64/test_mac99.py Old World (g3beige) M: Mark Cave-Ayland <[email protected]>
@@ -1529,7 +1529,7 @@ F: include/hw/intc/heathrow_pic.h F: include/hw/input/adb* F: include/hw/pci-host/grackle.h F: pc-bios/qemu_vga.ndrv -F: tests/functional/test_ppc_mac.py +F: tests/functional/ppc/test_mac.py PReP M: Hervé Poussineau <[email protected]>
@@ -1546,7 +1546,7 @@ F: hw/dma/i82374.c F: hw/rtc/m48t59-isa.c F: include/hw/isa/pc87312.h F: include/hw/rtc/m48t59.h -F: tests/functional/test_ppc_40p.py +F: tests/functional/ppc/test_40p.py sPAPR (pseries) M: Nicholas Piggin <[email protected]>
@@ -1569,9 +1569,9 @@ F: tests/qtest/spapr* F: tests/qtest/libqos/*spapr* F: tests/qtest/rtas* F: tests/qtest/libqos/rtas* -F: tests/functional/test_ppc64_pseries.py -F: tests/functional/test_ppc64_hv.py -F: tests/functional/test_ppc64_tuxrun.py +F: tests/functional/ppc64/test_pseries.py +F: tests/functional/ppc64/test_hv.py +F: tests/functional/ppc64/test_tuxrun.py PowerNV (Non-Virtualized) M: Nicholas Piggin <[email protected]>
@@ -1590,7 +1590,7 @@ F: include/hw/ssi/pnv_spi* F: pc-bios/skiboot.lid F: pc-bios/pnv-pnor.bin F: tests/qtest/pnv* -F: tests/functional/test_ppc64_powernv.py +F: tests/functional/ppc64/test_powernv.py pca955x M: Glenn Miles <[email protected]>
@@ -1605,7 +1605,7 @@ M: Edgar E. Iglesias <[email protected]> L: [email protected] S: Odd Fixes F: hw/ppc/virtex_ml507.c -F: tests/functional/test_ppc_virtex_ml507.py +F: tests/functional/ppc/test_virtex_ml507.py sam460ex M: BALATON Zoltan <[email protected]>
@@ -1621,7 +1621,7 @@ F: pc-bios/dtb/canyonlands.dt[sb] F: pc-bios/u-boot-sam460ex-20100605.bin F: roms/u-boot-sam460ex F: docs/system/ppc/amigang.rst -F: tests/functional/test_ppc_sam460ex.py +F: tests/functional/ppc/test_sam460ex.py pegasos2 M: BALATON Zoltan <[email protected]>
@@ -1639,7 +1639,7 @@ S: Maintained F: hw/ppc/amigaone.c F: hw/pci-host/articia.c F: include/hw/pci-host/articia.h -F: tests/functional/test_ppc_amiga.py +F: tests/functional/ppc/test_amiga.py Virtual Open Firmware (VOF) M: Alexey Kardashevskiy <[email protected]>
tests/functional/meson.build +2 -45
59 lines not on this page · raw message
tests/functional/ppc/meson.build new file +22 -0
@@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_ppc_timeouts = { + '40p' : 240, +} + +tests_ppc_system_quick = [ + 'migration', + '74xx', +] + +tests_ppc_system_thorough = [ + '40p', + 'amiga', + 'bamboo', + 'mac', + 'mpc8544ds', + 'replay', + 'sam460ex', + 'tuxrun', + 'virtex_ml507', +]
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 renamed from tests/functional/test_ppc_migration.py +0 -0
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 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_ppc64_timeouts = { + 'hv' : 1000, + 'mac99' : 120, + 'powernv' : 480, + 'pseries' : 480, + 'replay' : 210, + 'tuxrun' : 420, +} + +tests_ppc64_system_quick = [ + 'migration', +] + +tests_ppc64_system_thorough = [ + 'e500', + 'hv', + 'mac99', + 'powernv', + 'pseries', + 'replay', + 'reverse_debug', + 'tuxrun', +]
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 renamed from tests/functional/test_ppc64_migration.py +0 -0
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
Signature · 1 line
2.50.1
PATCH 17/24 tests/functional: Move riscv32/riscv64 tests into target-specific folders
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The opensbi test is used for both, riscv32 and riscv64. Copy the main test to the riscv64 folder and add a simple wrapper to the riscv32 folder to be able to run it for that target, too.
---
MAINTAINERS | 3 ++-
tests/functional/meson.build | 24 ++-----------------
tests/functional/riscv32/meson.build | 10 ++++++++
.../test_migration.py} | 0
tests/functional/riscv32/test_opensbi.py | 10 ++++++++
.../test_tuxrun.py} | 0
tests/functional/riscv64/meson.build | 14 +++++++++++
.../test_migration.py} | 0
.../test_opensbi.py} | 0
.../test_tuxrun.py} | 0
10 files changed, 38 insertions(+), 23 deletions(-)
create mode 100644 tests/functional/riscv32/meson.build
rename tests/functional/{test_riscv32_migration.py => riscv32/test_migration.py} (100%)
create mode 100755 tests/functional/riscv32/test_opensbi.py
rename tests/functional/{test_riscv32_tuxrun.py => riscv32/test_tuxrun.py} (100%)
create mode 100644 tests/functional/riscv64/meson.build
rename tests/functional/{test_riscv64_migration.py => riscv64/test_migration.py} (100%)
rename tests/functional/{test_riscv_opensbi.py => riscv64/test_opensbi.py} (100%)
rename tests/functional/{test_riscv64_tuxrun.py => riscv64/test_tuxrun.py} (100%)MAINTAINERS +2 -1
@@ -331,7 +331,8 @@ F: include/hw/riscv/ F: linux-user/host/riscv32/ F: linux-user/host/riscv64/ F: common-user/host/riscv* -F: tests/functional/test_riscv* +F: tests/functional/riscv32 +F: tests/functional/riscv64 F: tests/tcg/riscv64/ RISC-V XThead* extensions
tests/functional/meson.build +2 -22
@@ -26,10 +26,8 @@ subdir('mips64el') subdir('or1k') subdir('ppc') subdir('ppc64') - -test_riscv64_timeouts = { - 'riscv64_tuxrun' : 120, -} +subdir('riscv32') +subdir('riscv64') test_s390x_timeouts = { 's390x_ccw_virtio' : 420,
@@ -60,24 +58,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_riscv32_system_quick = [ - 'riscv32_migration', - 'riscv_opensbi', -] - -tests_riscv32_system_thorough = [ - 'riscv32_tuxrun', -] - -tests_riscv64_system_quick = [ - 'riscv64_migration', - 'riscv_opensbi', -] - -tests_riscv64_system_thorough = [ - 'riscv64_tuxrun', -] - tests_rx_system_thorough = [ 'rx_gdbsim', ]
tests/functional/riscv32/meson.build new file +10 -0
@@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_riscv32_system_quick = [ + 'migration', + 'opensbi', +] + +tests_riscv32_system_thorough = [ + 'tuxrun', +]
tests/functional/riscv32/test_migration.py renamed from tests/functional/test_riscv32_migration.py +0 -0
tests/functional/riscv32/test_opensbi.py new file +10 -0
@@ -0,0 +1,10 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Reuse the 64-bit OpenSBI test for RISC-V 32-bit machines + +from riscv64.test_opensbi import RiscvOpenSBI + +if __name__ == '__main__': + RiscvOpenSBI.main()
tests/functional/riscv32/test_tuxrun.py renamed from tests/functional/test_riscv32_tuxrun.py +0 -0
tests/functional/riscv64/meson.build new file +14 -0
@@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_riscv64_timeouts = { + 'tuxrun' : 120, +} + +tests_riscv64_system_quick = [ + 'migration', + 'opensbi', +] + +tests_riscv64_system_thorough = [ + 'tuxrun', +]
tests/functional/riscv64/test_migration.py renamed from tests/functional/test_riscv64_migration.py +0 -0
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
Signature · 1 line
2.50.1
Re: [PATCH 17/24] tests/functional: Move riscv32/riscv64 tests into target-specific folders
Quoted 34 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The opensbi test is used for both, riscv32 and riscv64. Copy the main test to the riscv64 folder and add a simple wrapper to the riscv32 folder to be able to run it for that target, too.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 3 ++- tests/functional/meson.build | 24 ++----------------- tests/functional/riscv32/meson.build | 10 ++++++++ .../test_migration.py} | 0 tests/functional/riscv32/test_opensbi.py | 10 ++++++++ .../test_tuxrun.py} | 0 tests/functional/riscv64/meson.build | 14 +++++++++++ .../test_migration.py} | 0 .../test_opensbi.py} | 0 .../test_tuxrun.py} | 0 10 files changed, 38 insertions(+), 23 deletions(-)create mode 100644 tests/functional/riscv32/meson.build
renametests/functional/{test_riscv32_migration.py=>riscv32/test_migration.py} (100%) create mode 100755tests/functional/riscv32/test_opensbi.py
renametests/functional/{test_riscv32_tuxrun.py=>riscv32/test_tuxrun.py} (100%) create mode 100644 tests/functional/riscv64/meson.build
renametests/functional/{test_riscv64_migration.py=>riscv64/test_migration.py} (100%) renametests/functional/{test_riscv_opensbi.py=>riscv64/test_opensbi.py} (100%) renametests/functional/{test_riscv64_tuxrun.py=>riscv64/test_tuxrun.py} (100%)tests/functional/meson.build +0
-0
tests/functional/meson.build subdir('mips64el') · line 30
Quoted 9 lines
tests/functional/meson.build +2
-4@@ -26,10 +26,8 @@ subdir('mips64el') subdir('or1k') subdir('ppc') subdir('ppc64') - -test_riscv64_timeouts = { - 'riscv64_tuxrun' : 120, -} +subdir('riscv32') +subdir('riscv64')
Here again I'd merge in a single 'riscv/' directory. Anyhow,
PATCH 18/24 tests/functional: Move rx test into target-specific folders
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
Move the architecture specific test into an architecture specific subdirectory.
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 5 +----
tests/functional/rx/meson.build | 5 +++++
tests/functional/{test_rx_gdbsim.py => rx/test_gdbsim.py} | 0
4 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 tests/functional/rx/meson.build
rename tests/functional/{test_rx_gdbsim.py => rx/test_gdbsim.py} (100%)MAINTAINERS +1 -1
@@ -1717,7 +1717,7 @@ R: Yoshinori Sato <[email protected]> S: Orphan F: docs/system/target-rx.rst F: hw/rx/rx-gdbsim.c -F: tests/functional/test_rx_gdbsim.py +F: tests/functional/rx/test_gdbsim.py SH4 Machines ------------
tests/functional/meson.build +1 -4
@@ -28,6 +28,7 @@ subdir('ppc') subdir('ppc64') subdir('riscv32') subdir('riscv64') +subdir('rx') test_s390x_timeouts = { 's390x_ccw_virtio' : 420,
@@ -58,10 +59,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_rx_system_thorough = [ - 'rx_gdbsim', -] - tests_s390x_system_thorough = [ 's390x_ccw_virtio', 's390x_pxelinux',
tests/functional/rx/meson.build new file +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_rx_system_thorough = [ + 'gdbsim', +]
tests/functional/rx/test_gdbsim.py renamed from tests/functional/test_rx_gdbsim.py +0 -0
Signature · 1 line
2.50.1
Re: [PATCH 18/24] tests/functional: Move rx test into target-specific folders
Quoted 6 lines · Thomas Huth
From: Thomas Huth <[email protected]>
Move the architecture specific test into an architecture specific subdirectory.
Signed-off-by Thomas Huth <[email protected]>
Quoted 8 lines
--- MAINTAINERS | 2 +- tests/functional/meson.build | 5 +---- tests/functional/rx/meson.build | 5 +++++ tests/functional/{test_rx_gdbsim.py => rx/test_gdbsim.py} | 0 4 files changed, 7 insertions(+), 5 deletions(-)create mode 100644 tests/functional/rx/meson.build
renametests/functional/{test_rx_gdbsim.py=>rx/test_gdbsim.py} (100%)
PATCH 19/24 tests/functional: Move s390x tests into target-specific folders
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the s390x tests into a target-specific subfolder.
---
MAINTAINERS | 6 +++---
tests/functional/meson.build | 13 +------------
tests/functional/s390x/meson.build | 13 +++++++++++++
.../test_ccw_virtio.py} | 0
.../test_pxelinux.py} | 0
.../{test_s390x_replay.py => s390x/test_replay.py} | 0
.../test_topology.py} | 0
.../{test_s390x_tuxrun.py => s390x/test_tuxrun.py} | 0
8 files changed, 17 insertions(+), 15 deletions(-)
create mode 100644 tests/functional/s390x/meson.build
rename tests/functional/{test_s390x_ccw_virtio.py => s390x/test_ccw_virtio.py} (100%)
rename tests/functional/{test_s390x_pxelinux.py => s390x/test_pxelinux.py} (100%)
rename tests/functional/{test_s390x_replay.py => s390x/test_replay.py} (100%)
rename tests/functional/{test_s390x_topology.py => s390x/test_topology.py} (100%)
rename tests/functional/{test_s390x_tuxrun.py => s390x/test_tuxrun.py} (100%)MAINTAINERS +3 -3
@@ -1793,7 +1793,7 @@ S: Supported F: hw/s390x/ F: include/hw/s390x/ F: configs/devices/s390x-softmmu/default.mak -F: tests/functional/test_s390x_* +F: tests/functional/s390x T: git https://github.com/borntraeger/qemu.git s390-next L: [email protected]
@@ -1807,7 +1807,7 @@ F: hw/s390x/ipl.* F: pc-bios/s390-ccw/ F: pc-bios/s390-ccw.img F: docs/devel/s390-dasd-ipl.rst -F: tests/functional/test_s390x_pxelinux.py +F: tests/functional/s390x/test_pxelinux.py T: git https://github.com/borntraeger/qemu.git s390-next L: [email protected]
@@ -1861,7 +1861,7 @@ F: hw/s390x/cpu-topology.c F: target/s390x/kvm/stsi-topology.c F: docs/devel/s390-cpu-topology.rst F: docs/system/s390x/cpu-topology.rst -F: tests/functional/test_s390x_topology.py +F: tests/functional/s390x/test_topology.py X86 Machines ------------
tests/functional/meson.build +1 -12
@@ -29,10 +29,7 @@ subdir('ppc64') subdir('riscv32') subdir('riscv64') subdir('rx') - -test_s390x_timeouts = { - 's390x_ccw_virtio' : 420, -} +subdir('s390x') test_sh4_timeouts = { 'sh4_tuxrun' : 240,
@@ -59,14 +56,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_s390x_system_thorough = [ - 's390x_ccw_virtio', - 's390x_pxelinux', - 's390x_replay', - 's390x_topology', - 's390x_tuxrun', -] - tests_sh4_system_thorough = [ 'sh4_r2d', 'sh4_tuxrun',
tests/functional/s390x/meson.build new file +13 -0
@@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_s390x_timeouts = { + 'ccw_virtio' : 420, +} + +tests_s390x_system_thorough = [ + 'ccw_virtio', + 'pxelinux', + 'replay', + 'topology', + 'tuxrun', +]
tests/functional/s390x/test_ccw_virtio.py renamed from tests/functional/test_s390x_ccw_virtio.py +0 -0
tests/functional/s390x/test_pxelinux.py renamed from tests/functional/test_s390x_pxelinux.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
Signature · 1 line
2.50.1
Re: [PATCH 19/24] tests/functional: Move s390x tests into target-specific folders
Quoted 16 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the s390x tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 6 +++--- tests/functional/meson.build | 13 +------------ tests/functional/s390x/meson.build | 13 +++++++++++++ .../test_ccw_virtio.py} | 0 .../test_pxelinux.py} | 0 .../{test_s390x_replay.py => s390x/test_replay.py} | 0 .../test_topology.py} | 0 .../{test_s390x_tuxrun.py => s390x/test_tuxrun.py} | 0 8 files changed, 17 insertions(+), 15 deletions(-)
Quoted 6 lines
create mode 100644 tests/functional/s390x/meson.build
renametests/functional/{test_s390x_ccw_virtio.py=>s390x/test_ccw_virtio.py} (100%) renametests/functional/{test_s390x_pxelinux.py=>s390x/test_pxelinux.py} (100%) renametests/functional/{test_s390x_replay.py=>s390x/test_replay.py} (100%) renametests/functional/{test_s390x_topology.py=>s390x/test_topology.py} (100%) renametests/functional/{test_s390x_tuxrun.py=>s390x/test_tuxrun.py} (100%)
PATCH 20/24 tests/functional: Move sh4/sh4eb tests into target-specific folders
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the sh4 tests into a target-specific subfolder.
---
MAINTAINERS | 4 ++--
tests/functional/meson.build | 15 ++-------------
tests/functional/sh4/meson.build | 10 ++++++++++
.../{test_sh4_r2d.py => sh4/test_r2d.py} | 0
.../{test_sh4_tuxrun.py => sh4/test_tuxrun.py} | 0
tests/functional/sh4eb/meson.build | 5 +++++
.../{test_sh4eb_r2d.py => sh4eb/test_r2d.py} | 0
7 files changed, 19 insertions(+), 15 deletions(-)
create mode 100644 tests/functional/sh4/meson.build
rename tests/functional/{test_sh4_r2d.py => sh4/test_r2d.py} (100%)
rename tests/functional/{test_sh4_tuxrun.py => sh4/test_tuxrun.py} (100%)
create mode 100644 tests/functional/sh4eb/meson.build
rename tests/functional/{test_sh4eb_r2d.py => sh4eb/test_r2d.py} (100%)MAINTAINERS +2 -2
@@ -1732,8 +1732,8 @@ F: hw/pci-host/sh_pci.c F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h F: include/hw/timer/tmu012.h -F: tests/functional/test_sh4*_r2d.py -F: tests/functional/test_sh4_tuxrun.py +F: tests/functional/sh4*/test_r2d.py +F: tests/functional/sh4/test_tuxrun.py SPARC Machines --------------
tests/functional/meson.build +2 -13
@@ -30,10 +30,8 @@ subdir('riscv32') subdir('riscv64') subdir('rx') subdir('s390x') - -test_sh4_timeouts = { - 'sh4_tuxrun' : 240, -} +subdir('sh4') +subdir('sh4eb') test_x86_64_timeouts = { 'acpi_bits' : 420,
@@ -56,15 +54,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_sh4_system_thorough = [ - 'sh4_r2d', - 'sh4_tuxrun', -] - -tests_sh4eb_system_thorough = [ - 'sh4eb_r2d', -] - tests_sparc_system_quick = [ 'sparc_migration', ]
tests/functional/sh4/meson.build new file +10 -0
@@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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 +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_sh4eb_system_thorough = [ + 'r2d', +]
tests/functional/sh4eb/test_r2d.py renamed from tests/functional/test_sh4eb_r2d.py +0 -0
Signature · 1 line
2.50.1
Re: [PATCH 20/24] tests/functional: Move sh4/sh4eb tests into target-specific folders
Quoted 41 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the sh4 tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 4 ++-- tests/functional/meson.build | 15 ++------------- tests/functional/sh4/meson.build | 10 ++++++++++ .../{test_sh4_r2d.py => sh4/test_r2d.py} | 0 .../{test_sh4_tuxrun.py => sh4/test_tuxrun.py} | 0 tests/functional/sh4eb/meson.build | 5 +++++ .../{test_sh4eb_r2d.py => sh4eb/test_r2d.py} | 0 7 files changed, 19 insertions(+), 15 deletions(-)create mode 100644 tests/functional/sh4/meson.build
renametests/functional/{test_sh4_r2d.py=>sh4/test_r2d.py} (100%) renametests/functional/{test_sh4_tuxrun.py=>sh4/test_tuxrun.py} (100%) create mode 100644 tests/functional/sh4eb/meson.build
renametests/functional/{test_sh4eb_r2d.py=>sh4eb/test_r2d.py} (100%)MAINTAINERS +2
-2@@ -1732,8 +1732,8 @@ F: hw/pci-host/sh_pci.c F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h F: include/hw/timer/tmu012.h -F: tests/functional/test_sh4*_r2d.py -F: tests/functional/test_sh4_tuxrun.py +F: tests/functional/sh4*/test_r2d.py +F: tests/functional/sh4/test_tuxrun.py SPARC Machines --------------tests/functional/meson.build +0
-0
tests/functional/meson.build subdir('riscv32') · line 34
Quoted 9 lines
tests/functional/meson.build +2
-4@@ -30,10 +30,8 @@ subdir('riscv32') subdir('riscv64') subdir('rx') subdir('s390x') - -test_sh4_timeouts = { - 'sh4_tuxrun' : 240, -} +subdir('sh4') +subdir('sh4eb')
Here also I'd keep a single sh4/ directory (it is the same architecture with an endianness variant we're going to remove).
PATCH 21/24 tests/functional: Move sparc/sparc64 tests into target-specific folders
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the sparc tests into a target-specific subfolder.
---
MAINTAINERS | 6 +++---
tests/functional/meson.build | 20 ++-----------------
tests/functional/sparc/meson.build | 10 ++++++++++
.../test_migration.py} | 0
.../test_replay.py} | 0
.../test_sun4m.py} | 0
tests/functional/sparc64/meson.build | 10 ++++++++++
.../test_migration.py} | 0
.../test_sun4u.py} | 0
.../test_tuxrun.py} | 0
10 files changed, 25 insertions(+), 21 deletions(-)
create mode 100644 tests/functional/sparc/meson.build
rename tests/functional/{test_sparc_migration.py => sparc/test_migration.py} (100%)
rename tests/functional/{test_sparc_replay.py => sparc/test_replay.py} (100%)
rename tests/functional/{test_sparc_sun4m.py => sparc/test_sun4m.py} (100%)
create mode 100644 tests/functional/sparc64/meson.build
rename tests/functional/{test_sparc64_migration.py => sparc64/test_migration.py} (100%)
rename tests/functional/{test_sparc64_sun4u.py => sparc64/test_sun4u.py} (100%)
rename tests/functional/{test_sparc64_tuxrun.py => sparc64/test_tuxrun.py} (100%)MAINTAINERS +3 -3
@@ -1751,7 +1751,7 @@ F: include/hw/nvram/sun_nvram.h F: include/hw/sparc/sparc32_dma.h F: include/hw/sparc/sun4m_iommu.h F: pc-bios/openbios-sparc32 -F: tests/functional/test_sparc_sun4m.py +F: tests/functional/sparc/test_sun4m.py Sun4u M: Mark Cave-Ayland <[email protected]>
@@ -1764,8 +1764,8 @@ F: include/hw/pci-host/sabre.h F: hw/pci-bridge/simba.c F: include/hw/pci-bridge/simba.h F: pc-bios/openbios-sparc64 -F: tests/functional/test_sparc64_sun4u.py -F: tests/functional/test_sparc64_tuxrun.py +F: tests/functional/sparc64/test_sun4u.py +F: tests/functional/sparc64/test_tuxrun.py Sun4v M: Artyom Tarasenko <[email protected]>
tests/functional/meson.build +2 -18
@@ -32,6 +32,8 @@ subdir('rx') subdir('s390x') subdir('sh4') subdir('sh4eb') +subdir('sparc') +subdir('sparc64') test_x86_64_timeouts = { 'acpi_bits' : 420,
@@ -54,24 +56,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_sparc_system_quick = [ - 'sparc_migration', -] - -tests_sparc_system_thorough = [ - 'sparc_replay', - 'sparc_sun4m', -] - -tests_sparc64_system_quick = [ - 'sparc64_migration', -] - -tests_sparc64_system_thorough = [ - 'sparc64_sun4u', - 'sparc64_tuxrun', -] - tests_x86_64_system_quick = [ 'cpu_queries', 'mem_addr_space',
tests/functional/sparc/meson.build new file +10 -0
@@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_sparc_system_quick = [ + 'migration', +] + +tests_sparc_system_thorough = [ + 'replay', + 'sun4m', +]
tests/functional/sparc/test_migration.py renamed from tests/functional/test_sparc_migration.py +0 -0
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 +10 -0
@@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_sparc64_system_quick = [ + 'migration', +] + +tests_sparc64_system_thorough = [ + 'sun4u', + 'tuxrun', +]
tests/functional/sparc64/test_migration.py renamed from tests/functional/test_sparc64_migration.py +0 -0
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
Signature · 1 line
2.50.1
Re: [PATCH 21/24] tests/functional: Move sparc/sparc64 tests into target-specific folders
Quoted 18 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the sparc tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 6 +++--- tests/functional/meson.build | 20 ++----------------- tests/functional/sparc/meson.build | 10 ++++++++++ .../test_migration.py} | 0 .../test_replay.py} | 0 .../test_sun4m.py} | 0 tests/functional/sparc64/meson.build | 10 ++++++++++ .../test_migration.py} | 0 .../test_sun4u.py} | 0 .../test_tuxrun.py} | 0 10 files changed, 25 insertions(+), 21 deletions(-)
Quoted 8 lines
create mode 100644 tests/functional/sparc/meson.build
renametests/functional/{test_sparc_migration.py=>sparc/test_migration.py} (100%) renametests/functional/{test_sparc_replay.py=>sparc/test_replay.py} (100%) renametests/functional/{test_sparc_sun4m.py=>sparc/test_sun4m.py} (100%) create mode 100644 tests/functional/sparc64/meson.build
renametests/functional/{test_sparc64_migration.py=>sparc64/test_migration.py} (100%) renametests/functional/{test_sparc64_sun4u.py=>sparc64/test_sun4u.py} (100%) renametests/functional/{test_sparc64_tuxrun.py=>sparc64/test_tuxrun.py} (100%)
PATCH 22/24 tests/functional: Move x86_64 tests into target-specific folder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the x86_64 tests into a target-specific subfolder.
---
MAINTAINERS | 30 +++++++--------
tests/functional/meson.build | 37 +------------------
tests/functional/x86_64/meson.build | 37 +++++++++++++++++++
.../functional/{ => x86_64}/test_acpi_bits.py | 0
.../test_cpu_model_versions.py} | 0
.../{ => x86_64}/test_cpu_queries.py | 0
.../test_hotplug_blk.py} | 0
.../test_hotplug_cpu.py} | 0
.../{ => x86_64}/test_intel_iommu.py | 0
.../test_kvm_xen.py} | 0
.../{ => x86_64}/test_linux_initrd.py | 0
.../{ => x86_64}/test_mem_addr_space.py | 0
tests/functional/{ => x86_64}/test_memlock.py | 0
.../test_migration.py} | 0
.../test_multiprocess.py} | 0
.../{ => x86_64}/test_netdev_ethtool.py | 0
.../{ => x86_64}/test_pc_cpu_hotplug_props.py | 0
.../test_replay.py} | 0
.../test_reverse_debug.py} | 0
.../test_tuxrun.py} | 0
.../{ => x86_64}/test_virtio_balloon.py | 0
.../{ => x86_64}/test_virtio_gpu.py | 0
.../{ => x86_64}/test_virtio_version.py | 0
23 files changed, 53 insertions(+), 51 deletions(-)
create mode 100644 tests/functional/x86_64/meson.build
rename tests/functional/{ => x86_64}/test_acpi_bits.py (100%)
rename tests/functional/{test_x86_cpu_model_versions.py => x86_64/test_cpu_model_versions.py} (100%)
rename tests/functional/{ => x86_64}/test_cpu_queries.py (100%)
rename tests/functional/{test_x86_64_hotplug_blk.py => x86_64/test_hotplug_blk.py} (100%)
rename tests/functional/{test_x86_64_hotplug_cpu.py => x86_64/test_hotplug_cpu.py} (100%)
rename tests/functional/{ => x86_64}/test_intel_iommu.py (100%)
rename tests/functional/{test_x86_64_kvm_xen.py => x86_64/test_kvm_xen.py} (100%)
rename tests/functional/{ => x86_64}/test_linux_initrd.py (100%)
rename tests/functional/{ => x86_64}/test_mem_addr_space.py (100%)
rename tests/functional/{ => x86_64}/test_memlock.py (100%)
rename tests/functional/{test_x86_64_migration.py => x86_64/test_migration.py} (100%)
rename tests/functional/{test_x86_64_multiprocess.py => x86_64/test_multiprocess.py} (100%)
rename tests/functional/{ => x86_64}/test_netdev_ethtool.py (100%)
rename tests/functional/{ => x86_64}/test_pc_cpu_hotplug_props.py (100%)
rename tests/functional/{test_x86_64_replay.py => x86_64/test_replay.py} (100%)
rename tests/functional/{test_x86_64_reverse_debug.py => x86_64/test_reverse_debug.py} (100%)
rename tests/functional/{test_x86_64_tuxrun.py => x86_64/test_tuxrun.py} (100%)
rename tests/functional/{ => x86_64}/test_virtio_balloon.py (100%)
rename tests/functional/{ => x86_64}/test_virtio_gpu.py (100%)
rename tests/functional/{ => x86_64}/test_virtio_version.py (100%)MAINTAINERS +15 -15
@@ -481,7 +481,7 @@ F: docs/system/i386/sgx.rst F: target/i386/kvm/ F: target/i386/sev* F: scripts/kvm/vmxcap -F: tests/functional/test_x86_64_hotplug_cpu.py +F: tests/functional/x86_64/test_hotplug_cpu.py Xen emulation on X86 KVM CPUs M: David Woodhouse <[email protected]>
@@ -490,7 +490,7 @@ S: Supported F: include/system/kvm_xen.h F: target/i386/kvm/xen* F: hw/i386/kvm/xen* -F: tests/functional/test_x86_64_kvm_xen.py +F: tests/functional/x86_64/test_kvm_xen.py Guest CPU Cores (other accelerators) ------------------------------------
@@ -1890,11 +1890,11 @@ F: include/hw/isa/apm.h F: tests/unit/test-x86-topo.c F: tests/qtest/test-x86-cpuid-compat.c F: tests/functional/i386/test_tuxrun.py -F: tests/functional/test_linux_initrd.py -F: tests/functional/test_mem_addr_space.py -F: tests/functional/test_pc_cpu_hotplug_props.py -F: tests/functional/test_x86_64_tuxrun.py -F: tests/functional/test_x86_cpu_model_versions.py +F: tests/functional/x86_64/test_linux_initrd.py +F: tests/functional/x86_64/test_mem_addr_space.py +F: tests/functional/x86_64/test_pc_cpu_hotplug_props.py +F: tests/functional/x86_64/test_tuxrun.py +F: tests/functional/x86_64/test_cpu_model_versions.py PC Chipset M: Michael S. Tsirkin <[email protected]>
@@ -1970,7 +1970,7 @@ F: include/hw/boards.h F: include/hw/core/cpu.h F: include/hw/cpu/cluster.h F: include/system/numa.h -F: tests/functional/test_cpu_queries.py +F: tests/functional/x86_64/test_cpu_queries.py F: tests/functional/test_empty_cpu_model.py F: tests/unit/test-smp-parse.c T: git https://gitlab.com/ehabkost/qemu.git machine-next
@@ -2155,7 +2155,7 @@ M: Ani Sinha <[email protected]> M: Michael S. Tsirkin <[email protected]> S: Supported F: tests/functional/acpi-bits/* -F: tests/functional/test_acpi_bits.py +F: tests/functional/x86_64/test_acpi_bits.py F: docs/devel/testing/acpi-bits.rst ACPI/HEST/GHES
@@ -2339,7 +2339,7 @@ F: net/vhost-user.c F: include/hw/virtio/ F: docs/devel/virtio* F: docs/devel/migration/virtio.rst -F: tests/functional/test_virtio_version.py +F: tests/functional/x86_64/test_virtio_version.py virtio-balloon M: Michael S. Tsirkin <[email protected]>
@@ -2351,7 +2351,7 @@ F: include/hw/virtio/virtio-balloon.h F: system/balloon.c F: include/system/balloon.h F: tests/qtest/virtio-balloon-test.c -F: tests/functional/test_virtio_balloon.py +F: tests/functional/x86_64/test_virtio_balloon.py virtio-9p M: Christian Schoenebeck <[email protected]>
@@ -2374,7 +2374,7 @@ F: hw/block/virtio-blk.c F: hw/block/dataplane/* F: include/hw/virtio/virtio-blk-common.h F: tests/qtest/virtio-blk-test.c -F: tests/functional/test_x86_64_hotplug_blk.py +F: tests/functional/x86_64/test_hotplug_blk.py T: git https://github.com/stefanha/qemu.git block virtio-ccw
@@ -2598,7 +2598,7 @@ R: Sriram Yagnaraman <[email protected]> S: Odd Fixes F: docs/system/devices/igb.rst F: hw/net/igb* -F: tests/functional/test_netdev_ethtool.py +F: tests/functional/x86_64/test_netdev_ethtool.py F: tests/qtest/igb-test.c F: tests/qtest/libqos/igb.c
@@ -3850,7 +3850,7 @@ S: Supported F: hw/i386/intel_iommu.c F: hw/i386/intel_iommu_internal.h F: include/hw/i386/intel_iommu.h -F: tests/functional/test_intel_iommu.py +F: tests/functional/x86_64/test_intel_iommu.py F: tests/qtest/intel-iommu-test.c AMD-Vi Emulation
@@ -4324,7 +4324,7 @@ F: scripts/ci/ F: tests/docker/ F: tests/vm/ F: tests/lcitool/ -F: tests/functional/test_*_tuxrun.py +F: tests/functional/*/test_tuxrun.py F: scripts/archive-source.sh F: docs/devel/testing/ci* F: docs/devel/testing/main.rst
tests/functional/meson.build +1 -36
@@ -34,15 +34,7 @@ subdir('sh4') subdir('sh4eb') subdir('sparc') subdir('sparc64') - -test_x86_64_timeouts = { - 'acpi_bits' : 420, - 'intel_iommu': 300, - 'netdev_ethtool' : 180, - 'virtio_balloon': 120, - 'x86_64_kvm_xen' : 180, - 'x86_64_replay' : 480, -} +subdir('x86_64') tests_generic_system = [ 'empty_cpu_model',
@@ -56,33 +48,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_x86_64_system_quick = [ - 'cpu_queries', - 'mem_addr_space', - 'x86_64_migration', - 'pc_cpu_hotplug_props', - 'virtio_version', - 'x86_cpu_model_versions', - 'vnc', - 'memlock', -] - -tests_x86_64_system_thorough = [ - 'acpi_bits', - 'intel_iommu', - 'linux_initrd', - 'x86_64_multiprocess', - 'netdev_ethtool', - 'virtio_balloon', - 'virtio_gpu', - 'x86_64_hotplug_blk', - 'x86_64_hotplug_cpu', - 'x86_64_kvm_xen', - 'x86_64_replay', - 'x86_64_reverse_debug', - 'x86_64_tuxrun', -] - tests_xtensa_system_thorough = [ 'xtensa_lx60', 'xtensa_replay',
tests/functional/x86_64/meson.build new file +37 -0
@@ -0,0 +1,37 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_x86_64_timeouts = { + 'acpi_bits' : 420, + 'intel_iommu': 300, + 'kvm_xen' : 180, + 'netdev_ethtool' : 180, + 'replay' : 480, + 'virtio_balloon': 120, +} + +tests_x86_64_system_quick = [ + 'cpu_model_versions', + 'cpu_queries', + 'mem_addr_space', + 'migration', + 'pc_cpu_hotplug_props', + 'virtio_version', + 'vnc', + 'memlock', +] + +tests_x86_64_system_thorough = [ + 'acpi_bits', + 'hotplug_blk', + 'hotplug_cpu', + 'intel_iommu', + 'kvm_xen', + 'linux_initrd', + 'multiprocess', + 'netdev_ethtool', + 'replay', + 'reverse_debug', + 'tuxrun', + 'virtio_balloon', + 'virtio_gpu', +]
tests/functional/x86_64/test_acpi_bits.py renamed from tests/functional/test_acpi_bits.py +0 -0
tests/functional/x86_64/test_cpu_model_versions.py renamed from tests/functional/test_x86_cpu_model_versions.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 renamed from tests/functional/test_x86_64_migration.py +0 -0
tests/functional/x86_64/test_multiprocess.py renamed from tests/functional/test_x86_64_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
Signature · 1 line
2.50.1
PATCH 23/24 tests/functional: Move xtensa tests into target-specific folder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the xtensa tests into a target-specific subfolder.
---
MAINTAINERS | 2 +-
tests/functional/meson.build | 6 +-----
tests/functional/xtensa/meson.build | 6 ++++++
.../functional/{test_xtensa_lx60.py => xtensa/test_lx60.py} | 0
.../{test_xtensa_replay.py => xtensa/test_replay.py} | 0
5 files changed, 8 insertions(+), 6 deletions(-)
create mode 100644 tests/functional/xtensa/meson.build
rename tests/functional/{test_xtensa_lx60.py => xtensa/test_lx60.py} (100%)
rename tests/functional/{test_xtensa_replay.py => xtensa/test_replay.py} (100%)MAINTAINERS +1 -1
@@ -2000,7 +2000,7 @@ S: Maintained F: hw/xtensa/xtfpga.c F: hw/net/opencores_eth.c F: include/hw/xtensa/mx_pic.h -F: tests/functional/test_xtensa_lx60.py +F: tests/functional/xtensa/test_lx60.py Devices -------
tests/functional/meson.build +1 -5
@@ -35,6 +35,7 @@ subdir('sh4eb') subdir('sparc') subdir('sparc64') subdir('x86_64') +subdir('xtensa') tests_generic_system = [ 'empty_cpu_model',
@@ -48,11 +49,6 @@ tests_generic_linuxuser = [ tests_generic_bsduser = [ ] -tests_xtensa_system_thorough = [ - 'xtensa_lx60', - 'xtensa_replay', -] - precache_all = [] foreach speed : ['quick', 'thorough'] foreach dir : target_dirs
tests/functional/xtensa/meson.build new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +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.1
Re: [PATCH 23/24] tests/functional: Move xtensa tests into target-specific folder
Quoted 13 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The tests/functional folder has become quite crowded, thus move the xtensa tests into a target-specific subfolder.
Signed-off-by Thomas Huth <[email protected]>--- MAINTAINERS | 2 +- tests/functional/meson.build | 6 +----- tests/functional/xtensa/meson.build | 6 ++++++ .../functional/{test_xtensa_lx60.py => xtensa/test_lx60.py} | 0 .../{test_xtensa_replay.py => xtensa/test_replay.py} | 0 5 files changed, 8 insertions(+), 6 deletions(-)
Quoted 3 lines
create mode 100644 tests/functional/xtensa/meson.build
renametests/functional/{test_xtensa_lx60.py=>xtensa/test_lx60.py} (100%) renametests/functional/{test_xtensa_replay.py=>xtensa/test_replay.py} (100%)
PATCH 24/24 tests/functional: Move the generic tests to a subfolder
In reply to Thomas HuthFrom: Thomas Huth <[email protected]>
This also removes the line for using tests from the main folder since we do not have any tests left here. And while we're at it, also mark the vnc test as generic now since it is not specific to x86.
---
MAINTAINERS | 8 ++++----
tests/functional/generic/meson.build | 14 ++++++++++++++
.../{ => generic}/test_empty_cpu_model.py | 0
.../{ => generic}/test_info_usernet.py | 0
tests/functional/{ => generic}/test_version.py | 0
tests/functional/{ => generic}/test_vnc.py | 0
tests/functional/meson.build | 17 ++---------------
tests/functional/x86_64/meson.build | 1 -
8 files changed, 20 insertions(+), 20 deletions(-)
create mode 100644 tests/functional/generic/meson.build
rename tests/functional/{ => generic}/test_empty_cpu_model.py (100%)
rename tests/functional/{ => generic}/test_info_usernet.py (100%)
rename tests/functional/{ => generic}/test_version.py (100%)
rename tests/functional/{ => generic}/test_vnc.py (100%)MAINTAINERS +4 -4
@@ -1971,7 +1971,7 @@ F: include/hw/core/cpu.h F: include/hw/cpu/cluster.h F: include/system/numa.h F: tests/functional/x86_64/test_cpu_queries.py -F: tests/functional/test_empty_cpu_model.py +F: tests/functional/generic/test_empty_cpu_model.py F: tests/unit/test-smp-parse.c T: git https://gitlab.com/ehabkost/qemu.git machine-next
@@ -2192,7 +2192,7 @@ S: Odd Fixes F: hw/net/ F: include/hw/net/ F: tests/qtest/virtio-net-test.c -F: tests/functional/test_info_usernet.py +F: tests/functional/generic/test_info_usernet.py F: docs/system/virtio-net-failover.rst T: git https://github.com/jasowang/qemu.git net
@@ -3126,7 +3126,7 @@ S: Supported F: include/qemu/option.h F: tests/unit/test-keyval.c F: tests/unit/test-qemu-opts.c -F: tests/functional/test_version.py +F: tests/functional/generic/test_version.py F: util/keyval.c F: util/qemu-option.c
@@ -3244,7 +3244,7 @@ F: include/ui/ F: qapi/ui.json F: util/drm.c F: docs/devel/ui.rst -F: tests/functional/test_vnc.py +F: tests/functional/generic/test_vnc.py Cocoa graphics M: Peter Maydell <[email protected]>
tests/functional/generic/meson.build new file +14 -0
@@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_generic_system = [ + 'empty_cpu_model', + 'info_usernet', + 'version', + 'vnc', +] + +tests_generic_linuxuser = [ +] + +tests_generic_bsduser = [ +]
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_version.py renamed from tests/functional/test_version.py +0 -0
tests/functional/generic/test_vnc.py renamed from tests/functional/test_vnc.py +0 -0
tests/functional/meson.build +2 -15
@@ -36,18 +36,7 @@ subdir('sparc') subdir('sparc64') subdir('x86_64') subdir('xtensa') - -tests_generic_system = [ - 'empty_cpu_model', - 'info_usernet', - 'version', -] - -tests_generic_linuxuser = [ -] - -tests_generic_bsduser = [ -] +subdir('generic') precache_all = [] foreach speed : ['quick', 'thorough']
@@ -90,9 +79,7 @@ foreach speed : ['quick', 'thorough'] foreach test : target_tests testname = '@0@-@1@'.format(target_base, test) - if fs.exists('test_' + test + '.py') - testfile = 'test_' + test + '.py' - elif fs.exists('generic' / 'test_' + test + '.py') + if fs.exists('generic' / 'test_' + test + '.py') testfile = 'generic' / 'test_' + test + '.py' else testfile = target_base / 'test_' + test + '.py'
tests/functional/x86_64/meson.build +0 -1
@@ -16,7 +16,6 @@ tests_x86_64_system_quick = [ 'migration', 'pc_cpu_hotplug_props', 'virtio_version', - 'vnc', 'memlock', ]
Signature · 1 line
2.50.1
Quoted 9 lines · Thomas Huth
This patch series 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. Then we can drop the target from the file name (and thus from the test name).
I don't have have specific comments as it's mostly moving files. Looks like a good and clean structure for expanding our tests set in the future.
For the whole series: