tests/acceptance: rename tests acceptance to tests avocado
In the discussion about renaming the `tests/acceptance` [1], the conclusion was that the folders inside `tests` are related to the framework running the tests and not directly related to the type of the tests. This changes the folder to `tests/avocado` and adjusts the MAKEFILE, the CI related files and the documentation. [1] https://lists.gnu.org/archive/html/qemu-devel/2021-05/msg06553.html Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Willian Rampazzo <willianr@redhat.com> Message-Id: <20211105155354.154864-3-willianr@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>staging
parent
333d7036ef
commit
bbbd9b6ec6
|
@ -37,7 +37,7 @@
|
||||||
# Avoid recompiling by hiding ninja with NINJA=":"
|
# Avoid recompiling by hiding ninja with NINJA=":"
|
||||||
- make NINJA=":" $MAKE_CHECK_ARGS
|
- make NINJA=":" $MAKE_CHECK_ARGS
|
||||||
|
|
||||||
.acceptance_test_job_template:
|
.avocado_test_job_template:
|
||||||
extends: .native_test_job_template
|
extends: .native_test_job_template
|
||||||
cache:
|
cache:
|
||||||
key: "${CI_JOB_NAME}-cache"
|
key: "${CI_JOB_NAME}-cache"
|
||||||
|
|
|
@ -26,14 +26,14 @@ check-system-alpine:
|
||||||
IMAGE: alpine
|
IMAGE: alpine
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-alpine:
|
avocado-system-alpine:
|
||||||
extends: .acceptance_test_job_template
|
extends: .avocado_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-alpine
|
- job: build-system-alpine
|
||||||
artifacts: true
|
artifacts: true
|
||||||
variables:
|
variables:
|
||||||
IMAGE: alpine
|
IMAGE: alpine
|
||||||
MAKE_CHECK_ARGS: check-acceptance
|
MAKE_CHECK_ARGS: check-avocado
|
||||||
|
|
||||||
build-system-ubuntu:
|
build-system-ubuntu:
|
||||||
extends: .native_build_job_template
|
extends: .native_build_job_template
|
||||||
|
@ -59,14 +59,14 @@ check-system-ubuntu:
|
||||||
IMAGE: ubuntu2004
|
IMAGE: ubuntu2004
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-ubuntu:
|
avocado-system-ubuntu:
|
||||||
extends: .acceptance_test_job_template
|
extends: .avocado_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-ubuntu
|
- job: build-system-ubuntu
|
||||||
artifacts: true
|
artifacts: true
|
||||||
variables:
|
variables:
|
||||||
IMAGE: ubuntu2004
|
IMAGE: ubuntu2004
|
||||||
MAKE_CHECK_ARGS: check-acceptance
|
MAKE_CHECK_ARGS: check-avocado
|
||||||
|
|
||||||
build-system-debian:
|
build-system-debian:
|
||||||
extends: .native_build_job_template
|
extends: .native_build_job_template
|
||||||
|
@ -91,14 +91,14 @@ check-system-debian:
|
||||||
IMAGE: debian-amd64
|
IMAGE: debian-amd64
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-debian:
|
avocado-system-debian:
|
||||||
extends: .acceptance_test_job_template
|
extends: .avocado_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-debian
|
- job: build-system-debian
|
||||||
artifacts: true
|
artifacts: true
|
||||||
variables:
|
variables:
|
||||||
IMAGE: debian-amd64
|
IMAGE: debian-amd64
|
||||||
MAKE_CHECK_ARGS: check-acceptance
|
MAKE_CHECK_ARGS: check-avocado
|
||||||
|
|
||||||
build-system-fedora:
|
build-system-fedora:
|
||||||
extends: .native_build_job_template
|
extends: .native_build_job_template
|
||||||
|
@ -125,14 +125,14 @@ check-system-fedora:
|
||||||
IMAGE: fedora
|
IMAGE: fedora
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-fedora:
|
avocado-system-fedora:
|
||||||
extends: .acceptance_test_job_template
|
extends: .avocado_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-fedora
|
- job: build-system-fedora
|
||||||
artifacts: true
|
artifacts: true
|
||||||
variables:
|
variables:
|
||||||
IMAGE: fedora
|
IMAGE: fedora
|
||||||
MAKE_CHECK_ARGS: check-acceptance
|
MAKE_CHECK_ARGS: check-avocado
|
||||||
|
|
||||||
build-system-centos:
|
build-system-centos:
|
||||||
extends: .native_build_job_template
|
extends: .native_build_job_template
|
||||||
|
@ -159,14 +159,14 @@ check-system-centos:
|
||||||
IMAGE: centos8
|
IMAGE: centos8
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-centos:
|
avocado-system-centos:
|
||||||
extends: .acceptance_test_job_template
|
extends: .avocado_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-centos
|
- job: build-system-centos
|
||||||
artifacts: true
|
artifacts: true
|
||||||
variables:
|
variables:
|
||||||
IMAGE: centos8
|
IMAGE: centos8
|
||||||
MAKE_CHECK_ARGS: check-acceptance
|
MAKE_CHECK_ARGS: check-avocado
|
||||||
|
|
||||||
build-system-opensuse:
|
build-system-opensuse:
|
||||||
extends: .native_build_job_template
|
extends: .native_build_job_template
|
||||||
|
@ -191,14 +191,14 @@ check-system-opensuse:
|
||||||
IMAGE: opensuse-leap
|
IMAGE: opensuse-leap
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-system-opensuse:
|
avocado-system-opensuse:
|
||||||
extends: .acceptance_test_job_template
|
extends: .avocado_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-system-opensuse
|
- job: build-system-opensuse
|
||||||
artifacts: true
|
artifacts: true
|
||||||
variables:
|
variables:
|
||||||
IMAGE: opensuse-leap
|
IMAGE: opensuse-leap
|
||||||
MAKE_CHECK_ARGS: check-acceptance
|
MAKE_CHECK_ARGS: check-avocado
|
||||||
|
|
||||||
|
|
||||||
# This jobs explicitly disable TCG (--disable-tcg), KVM is detected by
|
# This jobs explicitly disable TCG (--disable-tcg), KVM is detected by
|
||||||
|
@ -317,7 +317,7 @@ clang-user:
|
||||||
# This can be accomplished by using -enable-slirp=git, which avoids the use of
|
# This can be accomplished by using -enable-slirp=git, which avoids the use of
|
||||||
# a system-wide version of the library
|
# a system-wide version of the library
|
||||||
#
|
#
|
||||||
# Split in three sets of build/check/acceptance to limit the execution time of each
|
# Split in three sets of build/check/avocado to limit the execution time of each
|
||||||
# job
|
# job
|
||||||
build-cfi-aarch64:
|
build-cfi-aarch64:
|
||||||
extends: .native_build_job_template
|
extends: .native_build_job_template
|
||||||
|
@ -352,14 +352,14 @@ check-cfi-aarch64:
|
||||||
IMAGE: fedora
|
IMAGE: fedora
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-cfi-aarch64:
|
avocado-cfi-aarch64:
|
||||||
extends: .acceptance_test_job_template
|
extends: .avocado_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-cfi-aarch64
|
- job: build-cfi-aarch64
|
||||||
artifacts: true
|
artifacts: true
|
||||||
variables:
|
variables:
|
||||||
IMAGE: fedora
|
IMAGE: fedora
|
||||||
MAKE_CHECK_ARGS: check-acceptance
|
MAKE_CHECK_ARGS: check-avocado
|
||||||
|
|
||||||
build-cfi-ppc64-s390x:
|
build-cfi-ppc64-s390x:
|
||||||
extends: .native_build_job_template
|
extends: .native_build_job_template
|
||||||
|
@ -394,14 +394,14 @@ check-cfi-ppc64-s390x:
|
||||||
IMAGE: fedora
|
IMAGE: fedora
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-cfi-ppc64-s390x:
|
avocado-cfi-ppc64-s390x:
|
||||||
extends: .acceptance_test_job_template
|
extends: .avocado_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-cfi-ppc64-s390x
|
- job: build-cfi-ppc64-s390x
|
||||||
artifacts: true
|
artifacts: true
|
||||||
variables:
|
variables:
|
||||||
IMAGE: fedora
|
IMAGE: fedora
|
||||||
MAKE_CHECK_ARGS: check-acceptance
|
MAKE_CHECK_ARGS: check-avocado
|
||||||
|
|
||||||
build-cfi-x86_64:
|
build-cfi-x86_64:
|
||||||
extends: .native_build_job_template
|
extends: .native_build_job_template
|
||||||
|
@ -430,14 +430,14 @@ check-cfi-x86_64:
|
||||||
IMAGE: fedora
|
IMAGE: fedora
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
acceptance-cfi-x86_64:
|
avocado-cfi-x86_64:
|
||||||
extends: .acceptance_test_job_template
|
extends: .avocado_test_job_template
|
||||||
needs:
|
needs:
|
||||||
- job: build-cfi-x86_64
|
- job: build-cfi-x86_64
|
||||||
artifacts: true
|
artifacts: true
|
||||||
variables:
|
variables:
|
||||||
IMAGE: fedora
|
IMAGE: fedora
|
||||||
MAKE_CHECK_ARGS: check-acceptance
|
MAKE_CHECK_ARGS: check-avocado
|
||||||
|
|
||||||
tsan-build:
|
tsan-build:
|
||||||
extends: .native_build_job_template
|
extends: .native_build_job_template
|
||||||
|
|
52
MAINTAINERS
52
MAINTAINERS
|
@ -177,7 +177,7 @@ L: qemu-arm@nongnu.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: hw/arm/smmu*
|
F: hw/arm/smmu*
|
||||||
F: include/hw/arm/smmu*
|
F: include/hw/arm/smmu*
|
||||||
F: tests/acceptance/smmu.py
|
F: tests/avocado/smmu.py
|
||||||
|
|
||||||
AVR TCG CPUs
|
AVR TCG CPUs
|
||||||
M: Michael Rolnik <mrolnik@gmail.com>
|
M: Michael Rolnik <mrolnik@gmail.com>
|
||||||
|
@ -185,7 +185,7 @@ S: Maintained
|
||||||
F: docs/system/target-avr.rst
|
F: docs/system/target-avr.rst
|
||||||
F: gdb-xml/avr-cpu.xml
|
F: gdb-xml/avr-cpu.xml
|
||||||
F: target/avr/
|
F: target/avr/
|
||||||
F: tests/acceptance/machine_avr6.py
|
F: tests/avocado/machine_avr6.py
|
||||||
|
|
||||||
CRIS TCG CPUs
|
CRIS TCG CPUs
|
||||||
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
|
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
|
||||||
|
@ -657,7 +657,7 @@ S: Odd Fixes
|
||||||
F: include/hw/arm/digic.h
|
F: include/hw/arm/digic.h
|
||||||
F: hw/*/digic*
|
F: hw/*/digic*
|
||||||
F: include/hw/*/digic*
|
F: include/hw/*/digic*
|
||||||
F: tests/acceptance/machine_arm_canona1100.py
|
F: tests/avocado/machine_arm_canona1100.py
|
||||||
F: docs/system/arm/digic.rst
|
F: docs/system/arm/digic.rst
|
||||||
|
|
||||||
Goldfish RTC
|
Goldfish RTC
|
||||||
|
@ -708,7 +708,7 @@ S: Maintained
|
||||||
F: hw/arm/integratorcp.c
|
F: hw/arm/integratorcp.c
|
||||||
F: hw/misc/arm_integrator_debug.c
|
F: hw/misc/arm_integrator_debug.c
|
||||||
F: include/hw/misc/arm_integrator_debug.h
|
F: include/hw/misc/arm_integrator_debug.h
|
||||||
F: tests/acceptance/machine_arm_integratorcp.py
|
F: tests/avocado/machine_arm_integratorcp.py
|
||||||
F: docs/system/arm/integratorcp.rst
|
F: docs/system/arm/integratorcp.rst
|
||||||
|
|
||||||
MCIMX6UL EVK / i.MX6ul
|
MCIMX6UL EVK / i.MX6ul
|
||||||
|
@ -805,7 +805,7 @@ F: include/hw/display/blizzard.h
|
||||||
F: include/hw/input/lm832x.h
|
F: include/hw/input/lm832x.h
|
||||||
F: include/hw/input/tsc2xxx.h
|
F: include/hw/input/tsc2xxx.h
|
||||||
F: include/hw/misc/cbus.h
|
F: include/hw/misc/cbus.h
|
||||||
F: tests/acceptance/machine_arm_n8x0.py
|
F: tests/avocado/machine_arm_n8x0.py
|
||||||
F: docs/system/arm/nseries.rst
|
F: docs/system/arm/nseries.rst
|
||||||
|
|
||||||
Palm
|
Palm
|
||||||
|
@ -1159,7 +1159,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: hw/microblaze/petalogix_s3adsp1800_mmu.c
|
F: hw/microblaze/petalogix_s3adsp1800_mmu.c
|
||||||
F: include/hw/char/xilinx_uartlite.h
|
F: include/hw/char/xilinx_uartlite.h
|
||||||
F: tests/acceptance/machine_microblaze.py
|
F: tests/avocado/machine_microblaze.py
|
||||||
|
|
||||||
petalogix_ml605
|
petalogix_ml605
|
||||||
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
|
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
|
||||||
|
@ -1192,8 +1192,8 @@ F: hw/acpi/piix4.c
|
||||||
F: hw/mips/malta.c
|
F: hw/mips/malta.c
|
||||||
F: hw/mips/gt64xxx_pci.c
|
F: hw/mips/gt64xxx_pci.c
|
||||||
F: include/hw/southbridge/piix.h
|
F: include/hw/southbridge/piix.h
|
||||||
F: tests/acceptance/linux_ssh_mips_malta.py
|
F: tests/avocado/linux_ssh_mips_malta.py
|
||||||
F: tests/acceptance/machine_mips_malta.py
|
F: tests/avocado/machine_mips_malta.py
|
||||||
|
|
||||||
Mipssim
|
Mipssim
|
||||||
R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
|
R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
|
||||||
|
@ -1211,7 +1211,7 @@ F: hw/isa/vt82c686.c
|
||||||
F: hw/pci-host/bonito.c
|
F: hw/pci-host/bonito.c
|
||||||
F: hw/usb/vt82c686-uhci-pci.c
|
F: hw/usb/vt82c686-uhci-pci.c
|
||||||
F: include/hw/isa/vt82c686.h
|
F: include/hw/isa/vt82c686.h
|
||||||
F: tests/acceptance/machine_mips_fuloong2e.py
|
F: tests/avocado/machine_mips_fuloong2e.py
|
||||||
|
|
||||||
Loongson-3 virtual platforms
|
Loongson-3 virtual platforms
|
||||||
M: Huacai Chen <chenhuacai@kernel.org>
|
M: Huacai Chen <chenhuacai@kernel.org>
|
||||||
|
@ -1221,7 +1221,7 @@ F: hw/intc/loongson_liointc.c
|
||||||
F: hw/mips/loongson3_bootp.c
|
F: hw/mips/loongson3_bootp.c
|
||||||
F: hw/mips/loongson3_bootp.h
|
F: hw/mips/loongson3_bootp.h
|
||||||
F: hw/mips/loongson3_virt.c
|
F: hw/mips/loongson3_virt.c
|
||||||
F: tests/acceptance/machine_mips_loongson3v.py
|
F: tests/avocado/machine_mips_loongson3v.py
|
||||||
|
|
||||||
Boston
|
Boston
|
||||||
M: Paul Burton <paulburton@kernel.org>
|
M: Paul Burton <paulburton@kernel.org>
|
||||||
|
@ -1250,7 +1250,7 @@ Bamboo
|
||||||
L: qemu-ppc@nongnu.org
|
L: qemu-ppc@nongnu.org
|
||||||
S: Orphan
|
S: Orphan
|
||||||
F: hw/ppc/ppc440_bamboo.c
|
F: hw/ppc/ppc440_bamboo.c
|
||||||
F: tests/acceptance/ppc_bamboo.py
|
F: tests/avocado/ppc_bamboo.py
|
||||||
|
|
||||||
e500
|
e500
|
||||||
L: qemu-ppc@nongnu.org
|
L: qemu-ppc@nongnu.org
|
||||||
|
@ -1271,7 +1271,7 @@ L: qemu-ppc@nongnu.org
|
||||||
S: Orphan
|
S: Orphan
|
||||||
F: hw/ppc/mpc8544ds.c
|
F: hw/ppc/mpc8544ds.c
|
||||||
F: hw/ppc/mpc8544_guts.c
|
F: hw/ppc/mpc8544_guts.c
|
||||||
F: tests/acceptance/ppc_mpc8544ds.py
|
F: tests/avocado/ppc_mpc8544ds.py
|
||||||
|
|
||||||
New World (mac99)
|
New World (mac99)
|
||||||
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
|
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
|
||||||
|
@ -1318,7 +1318,7 @@ F: hw/dma/i82374.c
|
||||||
F: hw/rtc/m48t59-isa.c
|
F: hw/rtc/m48t59-isa.c
|
||||||
F: include/hw/isa/pc87312.h
|
F: include/hw/isa/pc87312.h
|
||||||
F: include/hw/rtc/m48t59.h
|
F: include/hw/rtc/m48t59.h
|
||||||
F: tests/acceptance/ppc_prep_40p.py
|
F: tests/avocado/ppc_prep_40p.py
|
||||||
|
|
||||||
sPAPR
|
sPAPR
|
||||||
M: David Gibson <david@gibson.dropbear.id.au>
|
M: David Gibson <david@gibson.dropbear.id.au>
|
||||||
|
@ -1336,7 +1336,7 @@ F: tests/qtest/spapr*
|
||||||
F: tests/qtest/libqos/*spapr*
|
F: tests/qtest/libqos/*spapr*
|
||||||
F: tests/qtest/rtas*
|
F: tests/qtest/rtas*
|
||||||
F: tests/qtest/libqos/rtas*
|
F: tests/qtest/libqos/rtas*
|
||||||
F: tests/acceptance/ppc_pseries.py
|
F: tests/avocado/ppc_pseries.py
|
||||||
|
|
||||||
PowerNV (Non-Virtualized)
|
PowerNV (Non-Virtualized)
|
||||||
M: Cédric Le Goater <clg@kaod.org>
|
M: Cédric Le Goater <clg@kaod.org>
|
||||||
|
@ -1356,7 +1356,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
|
||||||
L: qemu-ppc@nongnu.org
|
L: qemu-ppc@nongnu.org
|
||||||
S: Odd Fixes
|
S: Odd Fixes
|
||||||
F: hw/ppc/virtex_ml507.c
|
F: hw/ppc/virtex_ml507.c
|
||||||
F: tests/acceptance/ppc_virtex_ml507.py
|
F: tests/avocado/ppc_virtex_ml507.py
|
||||||
|
|
||||||
sam460ex
|
sam460ex
|
||||||
M: BALATON Zoltan <balaton@eik.bme.hu>
|
M: BALATON Zoltan <balaton@eik.bme.hu>
|
||||||
|
@ -1443,7 +1443,7 @@ R: Yoshinori Sato <ysato@users.sourceforge.jp>
|
||||||
S: Orphan
|
S: Orphan
|
||||||
F: docs/system/target-rx.rst
|
F: docs/system/target-rx.rst
|
||||||
F: hw/rx/rx-gdbsim.c
|
F: hw/rx/rx-gdbsim.c
|
||||||
F: tests/acceptance/machine_rx_gdbsim.py
|
F: tests/avocado/machine_rx_gdbsim.py
|
||||||
|
|
||||||
SH4 Machines
|
SH4 Machines
|
||||||
------------
|
------------
|
||||||
|
@ -1497,7 +1497,7 @@ F: include/hw/pci-host/sabre.h
|
||||||
F: hw/pci-bridge/simba.c
|
F: hw/pci-bridge/simba.c
|
||||||
F: include/hw/pci-bridge/simba.h
|
F: include/hw/pci-bridge/simba.h
|
||||||
F: pc-bios/openbios-sparc64
|
F: pc-bios/openbios-sparc64
|
||||||
F: tests/acceptance/machine_sparc64_sun4u.py
|
F: tests/avocado/machine_sparc64_sun4u.py
|
||||||
|
|
||||||
Sun4v
|
Sun4v
|
||||||
M: Artyom Tarasenko <atar4qemu@gmail.com>
|
M: Artyom Tarasenko <atar4qemu@gmail.com>
|
||||||
|
@ -1513,7 +1513,7 @@ S: Maintained
|
||||||
F: hw/sparc/leon3.c
|
F: hw/sparc/leon3.c
|
||||||
F: hw/*/grlib*
|
F: hw/*/grlib*
|
||||||
F: include/hw/*/grlib*
|
F: include/hw/*/grlib*
|
||||||
F: tests/acceptance/machine_sparc_leon3.py
|
F: tests/avocado/machine_sparc_leon3.py
|
||||||
|
|
||||||
S390 Machines
|
S390 Machines
|
||||||
-------------
|
-------------
|
||||||
|
@ -1528,7 +1528,7 @@ F: include/hw/s390x/
|
||||||
F: hw/watchdog/wdt_diag288.c
|
F: hw/watchdog/wdt_diag288.c
|
||||||
F: include/hw/watchdog/wdt_diag288.h
|
F: include/hw/watchdog/wdt_diag288.h
|
||||||
F: configs/devices/s390x-softmmu/default.mak
|
F: configs/devices/s390x-softmmu/default.mak
|
||||||
F: tests/acceptance/machine_s390_ccw_virtio.py
|
F: tests/avocado/machine_s390_ccw_virtio.py
|
||||||
T: git https://github.com/borntraeger/qemu.git s390-next
|
T: git https://github.com/borntraeger/qemu.git s390-next
|
||||||
L: qemu-s390x@nongnu.org
|
L: qemu-s390x@nongnu.org
|
||||||
|
|
||||||
|
@ -2112,7 +2112,7 @@ M: Alex Bennée <alex.bennee@linaro.org>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: hw/core/guest-loader.c
|
F: hw/core/guest-loader.c
|
||||||
F: docs/system/guest-loader.rst
|
F: docs/system/guest-loader.rst
|
||||||
F: tests/acceptance/boot_xen.py
|
F: tests/avocado/boot_xen.py
|
||||||
|
|
||||||
Intel Hexadecimal Object File Loader
|
Intel Hexadecimal Object File Loader
|
||||||
M: Su Hang <suhang16@mails.ucas.ac.cn>
|
M: Su Hang <suhang16@mails.ucas.ac.cn>
|
||||||
|
@ -2986,9 +2986,9 @@ F: net/filter-replay.c
|
||||||
F: include/sysemu/replay.h
|
F: include/sysemu/replay.h
|
||||||
F: docs/replay.txt
|
F: docs/replay.txt
|
||||||
F: stubs/replay.c
|
F: stubs/replay.c
|
||||||
F: tests/acceptance/replay_kernel.py
|
F: tests/avocado/replay_kernel.py
|
||||||
F: tests/acceptance/replay_linux.py
|
F: tests/avocado/replay_linux.py
|
||||||
F: tests/acceptance/reverse_debugging.py
|
F: tests/avocado/reverse_debugging.py
|
||||||
F: qapi/replay.json
|
F: qapi/replay.json
|
||||||
|
|
||||||
IOVA Tree
|
IOVA Tree
|
||||||
|
@ -3105,7 +3105,7 @@ S: Maintained
|
||||||
F: docs/devel/tcg-plugins.rst
|
F: docs/devel/tcg-plugins.rst
|
||||||
F: plugins/
|
F: plugins/
|
||||||
F: tests/plugin/
|
F: tests/plugin/
|
||||||
F: tests/acceptance/tcg_plugins.py
|
F: tests/avocado/tcg_plugins.py
|
||||||
F: contrib/plugins/
|
F: contrib/plugins/
|
||||||
|
|
||||||
AArch64 TCG target
|
AArch64 TCG target
|
||||||
|
@ -3494,14 +3494,14 @@ S: Maintained
|
||||||
F: tests/tcg/Makefile
|
F: tests/tcg/Makefile
|
||||||
F: tests/tcg/Makefile.include
|
F: tests/tcg/Makefile.include
|
||||||
|
|
||||||
Acceptance (Integration) Testing with the Avocado framework
|
Integration Testing with the Avocado framework
|
||||||
W: https://trello.com/b/6Qi1pxVn/avocado-qemu
|
W: https://trello.com/b/6Qi1pxVn/avocado-qemu
|
||||||
R: Cleber Rosa <crosa@redhat.com>
|
R: Cleber Rosa <crosa@redhat.com>
|
||||||
R: Philippe Mathieu-Daudé <philmd@redhat.com>
|
R: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||||
R: Wainer dos Santos Moschetta <wainersm@redhat.com>
|
R: Wainer dos Santos Moschetta <wainersm@redhat.com>
|
||||||
R: Willian Rampazzo <willianr@redhat.com>
|
R: Willian Rampazzo <willianr@redhat.com>
|
||||||
S: Odd Fixes
|
S: Odd Fixes
|
||||||
F: tests/acceptance/
|
F: tests/avocado/
|
||||||
|
|
||||||
Documentation
|
Documentation
|
||||||
-------------
|
-------------
|
||||||
|
|
|
@ -3832,7 +3832,7 @@ LINKS="$LINKS pc-bios/s390-ccw/Makefile"
|
||||||
LINKS="$LINKS roms/seabios/Makefile"
|
LINKS="$LINKS roms/seabios/Makefile"
|
||||||
LINKS="$LINKS pc-bios/qemu-icon.bmp"
|
LINKS="$LINKS pc-bios/qemu-icon.bmp"
|
||||||
LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
|
LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
|
||||||
LINKS="$LINKS tests/acceptance tests/data"
|
LINKS="$LINKS tests/avocado tests/data"
|
||||||
LINKS="$LINKS tests/qemu-iotests/check"
|
LINKS="$LINKS tests/qemu-iotests/check"
|
||||||
LINKS="$LINKS python"
|
LINKS="$LINKS python"
|
||||||
LINKS="$LINKS contrib/plugins/Makefile "
|
LINKS="$LINKS contrib/plugins/Makefile "
|
||||||
|
|
|
@ -416,7 +416,7 @@ number of dynamically created files listed later.
|
||||||
|
|
||||||
``tests/Makefile.include``
|
``tests/Makefile.include``
|
||||||
Rules for external test harnesses. These include the TCG tests,
|
Rules for external test harnesses. These include the TCG tests,
|
||||||
``qemu-iotests`` and the Avocado-based acceptance tests.
|
``qemu-iotests`` and the Avocado-based integration tests.
|
||||||
|
|
||||||
``tests/docker/Makefile.include``
|
``tests/docker/Makefile.include``
|
||||||
Rules for Docker tests. Like tests/Makefile, this file is included
|
Rules for Docker tests. Like tests/Makefile, this file is included
|
||||||
|
|
|
@ -59,7 +59,7 @@ to system testing [5]_. Note that, in some cases, system testing may require
|
||||||
interaction with third-party software, like operating system images, databases,
|
interaction with third-party software, like operating system images, databases,
|
||||||
networks, and so on.
|
networks, and so on.
|
||||||
|
|
||||||
On QEMU, system testing is represented by the 'check-acceptance' target from
|
On QEMU, system testing is represented by the 'check-avocado' target from
|
||||||
'make'.
|
'make'.
|
||||||
|
|
||||||
Flaky tests
|
Flaky tests
|
||||||
|
|
|
@ -653,17 +653,16 @@ supported. To start the fuzzer, run
|
||||||
Alternatively, some command different from "qemu-img info" can be tested, by
|
Alternatively, some command different from "qemu-img info" can be tested, by
|
||||||
changing the ``-c`` option.
|
changing the ``-c`` option.
|
||||||
|
|
||||||
Acceptance tests using the Avocado Framework
|
Integration tests using the Avocado Framework
|
||||||
--------------------------------------------
|
---------------------------------------------
|
||||||
|
|
||||||
The ``tests/acceptance`` directory hosts functional tests, also known
|
The ``tests/avocado`` directory hosts integration tests. They're usually
|
||||||
as acceptance level tests. They're usually higher level tests, and
|
higher level tests, and may interact with external resources and with
|
||||||
may interact with external resources and with various guest operating
|
various guest operating systems.
|
||||||
systems.
|
|
||||||
|
|
||||||
These tests are written using the Avocado Testing Framework (which must
|
These tests are written using the Avocado Testing Framework (which must
|
||||||
be installed separately) in conjunction with a the ``avocado_qemu.Test``
|
be installed separately) in conjunction with a the ``avocado_qemu.Test``
|
||||||
class, implemented at ``tests/acceptance/avocado_qemu``.
|
class, implemented at ``tests/avocado/avocado_qemu``.
|
||||||
|
|
||||||
Tests based on ``avocado_qemu.Test`` can easily:
|
Tests based on ``avocado_qemu.Test`` can easily:
|
||||||
|
|
||||||
|
@ -695,11 +694,11 @@ Tests based on ``avocado_qemu.Test`` can easily:
|
||||||
Running tests
|
Running tests
|
||||||
~~~~~~~~~~~~~
|
~~~~~~~~~~~~~
|
||||||
|
|
||||||
You can run the acceptance tests simply by executing:
|
You can run the avocado tests simply by executing:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
make check-acceptance
|
make check-avocado
|
||||||
|
|
||||||
This involves the automatic creation of Python virtual environment
|
This involves the automatic creation of Python virtual environment
|
||||||
within the build tree (at ``tests/venv``) which will have all the
|
within the build tree (at ``tests/venv``) which will have all the
|
||||||
|
@ -714,12 +713,12 @@ specific version, they may be on packages named ``python3-venv`` and
|
||||||
``python3-pip``.
|
``python3-pip``.
|
||||||
|
|
||||||
It is also possible to run tests based on tags using the
|
It is also possible to run tests based on tags using the
|
||||||
``make check-acceptance`` command and the ``AVOCADO_TAGS`` environment
|
``make check-avocado`` command and the ``AVOCADO_TAGS`` environment
|
||||||
variable:
|
variable:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
make check-acceptance AVOCADO_TAGS=quick
|
make check-avocado AVOCADO_TAGS=quick
|
||||||
|
|
||||||
Note that tags separated with commas have an AND behavior, while tags
|
Note that tags separated with commas have an AND behavior, while tags
|
||||||
separated by spaces have an OR behavior. For more information on Avocado
|
separated by spaces have an OR behavior. For more information on Avocado
|
||||||
|
@ -728,31 +727,31 @@ tags, see:
|
||||||
https://avocado-framework.readthedocs.io/en/latest/guides/user/chapters/tags.html
|
https://avocado-framework.readthedocs.io/en/latest/guides/user/chapters/tags.html
|
||||||
|
|
||||||
To run a single test file, a couple of them, or a test within a file
|
To run a single test file, a couple of them, or a test within a file
|
||||||
using the ``make check-acceptance`` command, set the ``AVOCADO_TESTS``
|
using the ``make check-avocado`` command, set the ``AVOCADO_TESTS``
|
||||||
environment variable with the test files or test names. To run all
|
environment variable with the test files or test names. To run all
|
||||||
tests from a single file, use:
|
tests from a single file, use:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
make check-acceptance AVOCADO_TESTS=$FILEPATH
|
make check-avocado AVOCADO_TESTS=$FILEPATH
|
||||||
|
|
||||||
The same is valid to run tests from multiple test files:
|
The same is valid to run tests from multiple test files:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
make check-acceptance AVOCADO_TESTS='$FILEPATH1 $FILEPATH2'
|
make check-avocado AVOCADO_TESTS='$FILEPATH1 $FILEPATH2'
|
||||||
|
|
||||||
To run a single test within a file, use:
|
To run a single test within a file, use:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
make check-acceptance AVOCADO_TESTS=$FILEPATH:$TESTCLASS.$TESTNAME
|
make check-avocado AVOCADO_TESTS=$FILEPATH:$TESTCLASS.$TESTNAME
|
||||||
|
|
||||||
The same is valid to run single tests from multiple test files:
|
The same is valid to run single tests from multiple test files:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
make check-acceptance AVOCADO_TESTS='$FILEPATH1:$TESTCLASS1.$TESTNAME1 $FILEPATH2:$TESTCLASS2.$TESTNAME2'
|
make check-avocado AVOCADO_TESTS='$FILEPATH1:$TESTCLASS1.$TESTNAME1 $FILEPATH2:$TESTCLASS2.$TESTNAME2'
|
||||||
|
|
||||||
The scripts installed inside the virtual environment may be used
|
The scripts installed inside the virtual environment may be used
|
||||||
without an "activation". For instance, the Avocado test runner
|
without an "activation". For instance, the Avocado test runner
|
||||||
|
@ -760,9 +759,9 @@ may be invoked by running:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
tests/venv/bin/avocado run $OPTION1 $OPTION2 tests/acceptance/
|
tests/venv/bin/avocado run $OPTION1 $OPTION2 tests/avocado/
|
||||||
|
|
||||||
Note that if ``make check-acceptance`` was not executed before, it is
|
Note that if ``make check-avocado`` was not executed before, it is
|
||||||
possible to create the Python virtual environment with the dependencies
|
possible to create the Python virtual environment with the dependencies
|
||||||
needed running:
|
needed running:
|
||||||
|
|
||||||
|
@ -775,20 +774,20 @@ a test file. To run tests from a single file within the build tree, use:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
tests/venv/bin/avocado run tests/acceptance/$TESTFILE
|
tests/venv/bin/avocado run tests/avocado/$TESTFILE
|
||||||
|
|
||||||
To run a single test within a test file, use:
|
To run a single test within a test file, use:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
tests/venv/bin/avocado run tests/acceptance/$TESTFILE:$TESTCLASS.$TESTNAME
|
tests/venv/bin/avocado run tests/avocado/$TESTFILE:$TESTCLASS.$TESTNAME
|
||||||
|
|
||||||
Valid test names are visible in the output from any previous execution
|
Valid test names are visible in the output from any previous execution
|
||||||
of Avocado or ``make check-acceptance``, and can also be queried using:
|
of Avocado or ``make check-avocado``, and can also be queried using:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
tests/venv/bin/avocado list tests/acceptance
|
tests/venv/bin/avocado list tests/avocado
|
||||||
|
|
||||||
Manual Installation
|
Manual Installation
|
||||||
~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~
|
||||||
|
@ -806,7 +805,7 @@ Alternatively, follow the instructions on this link:
|
||||||
Overview
|
Overview
|
||||||
~~~~~~~~
|
~~~~~~~~
|
||||||
|
|
||||||
The ``tests/acceptance/avocado_qemu`` directory provides the
|
The ``tests/avocado/avocado_qemu`` directory provides the
|
||||||
``avocado_qemu`` Python module, containing the ``avocado_qemu.Test``
|
``avocado_qemu`` Python module, containing the ``avocado_qemu.Test``
|
||||||
class. Here's a simple usage example:
|
class. Here's a simple usage example:
|
||||||
|
|
||||||
|
@ -913,7 +912,7 @@ like this:
|
||||||
self.ssh_command('some_command_to_be_run_in_the_guest')
|
self.ssh_command('some_command_to_be_run_in_the_guest')
|
||||||
|
|
||||||
Please refer to tests that use ``avocado_qemu.LinuxTest`` under
|
Please refer to tests that use ``avocado_qemu.LinuxTest`` under
|
||||||
``tests/acceptance`` for more examples.
|
``tests/avocado`` for more examples.
|
||||||
|
|
||||||
QEMUMachine
|
QEMUMachine
|
||||||
~~~~~~~~~~~
|
~~~~~~~~~~~
|
||||||
|
@ -1204,7 +1203,7 @@ And remove any package you want with::
|
||||||
|
|
||||||
pip uninstall <package_name>
|
pip uninstall <package_name>
|
||||||
|
|
||||||
If you've used ``make check-acceptance``, the Python virtual environment where
|
If you've used ``make check-avocado``, the Python virtual environment where
|
||||||
Avocado is installed will be cleaned up as part of ``make check-clean``.
|
Avocado is installed will be cleaned up as part of ``make check-clean``.
|
||||||
|
|
||||||
.. _checktcg-ref:
|
.. _checktcg-ref:
|
||||||
|
|
|
@ -250,14 +250,14 @@ and set the following environment variables before booting:
|
||||||
Optionally you may save the environment variables to SD card with 'saveenv'.
|
Optionally you may save the environment variables to SD card with 'saveenv'.
|
||||||
To continue booting simply give the 'boot' command and NetBSD boots.
|
To continue booting simply give the 'boot' command and NetBSD boots.
|
||||||
|
|
||||||
Orange Pi PC acceptance tests
|
Orange Pi PC integration tests
|
||||||
"""""""""""""""""""""""""""""
|
""""""""""""""""""""""""""""""
|
||||||
|
|
||||||
The Orange Pi PC machine has several acceptance tests included.
|
The Orange Pi PC machine has several integration tests included.
|
||||||
To run the whole set of tests, build QEMU from source and simply
|
To run the whole set of tests, build QEMU from source and simply
|
||||||
provide the following command:
|
provide the following command:
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
$ AVOCADO_ALLOW_LARGE_STORAGE=yes avocado --show=app,console run \
|
$ AVOCADO_ALLOW_LARGE_STORAGE=yes avocado --show=app,console run \
|
||||||
-t machine:orangepi-pc tests/acceptance/boot_linux_console.py
|
-t machine:orangepi-pc tests/avocado/boot_linux_console.py
|
||||||
|
|
|
@ -2,7 +2,7 @@ qemu.machine package
|
||||||
====================
|
====================
|
||||||
|
|
||||||
This package provides core utilities used for testing and debugging
|
This package provides core utilities used for testing and debugging
|
||||||
QEMU. It is used by the iotests, vm tests, acceptance tests, and several
|
QEMU. It is used by the iotests, vm tests, avocado tests, and several
|
||||||
other utilities in the ./scripts directory. It is not a fully-fledged
|
other utilities in the ./scripts directory. It is not a fully-fledged
|
||||||
SDK and it is subject to change at any time.
|
SDK and it is subject to change at any time.
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ qemu.qmp package
|
||||||
|
|
||||||
This package provides a library used for connecting to and communicating
|
This package provides a library used for connecting to and communicating
|
||||||
with QMP servers. It is used extensively by iotests, vm tests,
|
with QMP servers. It is used extensively by iotests, vm tests,
|
||||||
acceptance tests, and other utilities in the ./scripts directory. It is
|
avocado tests, and other utilities in the ./scripts directory. It is
|
||||||
not a fully-fledged SDK and is subject to change at any time.
|
not a fully-fledged SDK and is subject to change at any time.
|
||||||
|
|
||||||
See the documentation in ``__init__.py`` for more information.
|
See the documentation in ``__init__.py`` for more information.
|
||||||
|
|
|
@ -2,6 +2,6 @@ qemu.utils package
|
||||||
==================
|
==================
|
||||||
|
|
||||||
This package provides miscellaneous utilities used for testing and
|
This package provides miscellaneous utilities used for testing and
|
||||||
debugging QEMU. It is used primarily by the vm and acceptance tests.
|
debugging QEMU. It is used primarily by the vm and avocado tests.
|
||||||
|
|
||||||
See the documentation in ``__init__.py`` for more information.
|
See the documentation in ``__init__.py`` for more information.
|
||||||
|
|
|
@ -89,7 +89,7 @@ TESTS_VENV_DIR=$(BUILD_DIR)/tests/venv
|
||||||
TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
|
TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
|
||||||
TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
|
TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
|
||||||
ifndef AVOCADO_TESTS
|
ifndef AVOCADO_TESTS
|
||||||
AVOCADO_TESTS=tests/acceptance
|
AVOCADO_TESTS=tests/avocado
|
||||||
endif
|
endif
|
||||||
# Controls the output generated by Avocado when running tests.
|
# Controls the output generated by Avocado when running tests.
|
||||||
# Any number of command separated loggers are accepted. For more
|
# Any number of command separated loggers are accepted. For more
|
||||||
|
@ -140,7 +140,7 @@ check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images
|
||||||
--filter-by-tags-include-empty-key) \
|
--filter-by-tags-include-empty-key) \
|
||||||
$(AVOCADO_CMDLINE_TAGS) \
|
$(AVOCADO_CMDLINE_TAGS) \
|
||||||
$(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \
|
$(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \
|
||||||
"AVOCADO", "tests/acceptance")
|
"AVOCADO", "tests/avocado")
|
||||||
|
|
||||||
check-acceptance-deprecated-warning:
|
check-acceptance-deprecated-warning:
|
||||||
@echo
|
@echo
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
============================================
|
|
||||||
Acceptance tests using the Avocado Framework
|
|
||||||
============================================
|
|
||||||
|
|
||||||
This directory contains functional tests, also known as acceptance
|
|
||||||
level tests. They're usually higher level, and may interact with
|
|
||||||
external resources and with various guest operating systems.
|
|
||||||
|
|
||||||
For more information, please refer to ``docs/devel/testing.rst``,
|
|
||||||
section "Acceptance tests using the Avocado Framework".
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
=============================================
|
||||||
|
Integration tests using the Avocado Framework
|
||||||
|
=============================================
|
||||||
|
|
||||||
|
This directory contains integration tests. They're usually higher
|
||||||
|
level, and may interact with external resources and with various
|
||||||
|
guest operating systems.
|
||||||
|
|
||||||
|
For more information, please refer to ``docs/devel/testing.rst``,
|
||||||
|
section "Integration tests using the Avocado Framework".
|
|
@ -27,7 +27,7 @@ from avocado.utils.path import find_command
|
||||||
BUILD_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
|
BUILD_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
|
||||||
|
|
||||||
if os.path.islink(os.path.dirname(os.path.dirname(__file__))):
|
if os.path.islink(os.path.dirname(os.path.dirname(__file__))):
|
||||||
# The link to the acceptance tests dir in the source code directory
|
# The link to the avocado tests dir in the source code directory
|
||||||
lnk = os.path.dirname(os.path.dirname(__file__))
|
lnk = os.path.dirname(os.path.dirname(__file__))
|
||||||
#: The QEMU root source directory
|
#: The QEMU root source directory
|
||||||
SOURCE_DIR = os.path.dirname(os.path.dirname(os.readlink(lnk)))
|
SOURCE_DIR = os.path.dirname(os.path.dirname(os.readlink(lnk)))
|
|
@ -1,4 +1,4 @@
|
||||||
# Linux initrd acceptance test.
|
# Linux initrd integration test.
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018 Red Hat, Inc.
|
# Copyright (c) 2018 Red Hat, Inc.
|
||||||
#
|
#
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# QEMU AVR acceptance tests
|
# QEMU AVR integration tests
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019-2020 Michael Rolnik <mrolnik@gmail.com>
|
# Copyright (c) 2019-2020 Michael Rolnik <mrolnik@gmail.com>
|
||||||
#
|
#
|
Loading…
Reference in New Issue