Acceptance testing patches

- More ARM tests
 - Documentation update
 
 CI jobs results:
 . https://cirrus-ci.com/build/5754555684093952
 . https://gitlab.com/philmd/qemu/-/pipelines/207807648
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAl+XHkwACgkQ4+MsLN6t
 wN4WJBAAxfsfZV3DjoKP/mAjVKJCHkA82MzzoN+YH5WQs4QG1Hytod7OyWC101xj
 wPuL85NR+bo+he12Uylmbm35TCyKxH3kOk2GAqiHvS16mxNZtAssehVt5a1hoUlw
 N9R37dtccGbURX3WzEgJralaZaST96ZbP+y76A95ygriXLnZRisVJG0t/FKBb22m
 8B8+lgHpb11hFop/COY93Aa/BPx9S7cPpBQX4p8e/gXhdJTtqzbhWYSkLO60FqJh
 l1D8KAB7dUtVPoW1ZPSL0YsSGVlxKslOQ8T2Ikrhu8whDZNpYWaoXP0nK3aFK5Th
 jSYObXj/fXtj+APJZILoYAzEtlFsX0FFPfPZy2ffvX6+P1S4COsU2mkN9jJSu42C
 i8Ii5r1WAN6OPFbgPVQ2tQP9jq+scwBUT50GIzgLvja2dWPBM7drxB/hAByItgRt
 ARaDupnC6ShXPLMPm14fSfThyQQw+wiTHo9sZaks5NuoOz9WAh6XUK3JLR5S5zEG
 OxYunho2zSoqYAmnYtymNQ3L0ABW679EbbB2uZJX9m4iFGSxnNJoFFZyAXsZm/tM
 sRQBfTdBH1OCsVdy9/uYrNdZmj0QMBU5mJmv8Qsv722PLV8GuBF8O64C4F4Y42BP
 ApADllyRIONxXm95iBXISuZAF7qAMfGcvI9ldpUyetUT59oz4YI=
 =5Xi7
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/acceptance-testing-20201026' into staging

Acceptance testing patches

- More ARM tests
- Documentation update

CI jobs results:
. https://cirrus-ci.com/build/5754555684093952
. https://gitlab.com/philmd/qemu/-/pipelines/207807648

# gpg: Signature made Mon 26 Oct 2020 19:06:52 GMT
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd-gitlab/tags/acceptance-testing-20201026:
  docs/devel/testing.rst: Update outdated Avocado URLs
  tests/acceptance: Allow running Orange Pi test using cached artifacts
  tests/acceptance: Add a 'virt_kvm' test using the GICv3
  tests/boot_linux_console: Boot Trusted Firmware-A on the Raspberry Pi 3

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-10-27 16:58:39 +00:00
commit cfc1105649
3 changed files with 42 additions and 3 deletions

View File

@ -654,7 +654,7 @@ To manually install Avocado and its dependencies, run:
Alternatively, follow the instructions on this link: Alternatively, follow the instructions on this link:
http://avocado-framework.readthedocs.io/en/latest/GetStartedGuide.html#installing-avocado https://avocado-framework.readthedocs.io/en/latest/guides/user/chapters/installing.html
Overview Overview
-------- --------
@ -837,7 +837,7 @@ Parameter reference
To understand how Avocado parameters are accessed by tests, and how To understand how Avocado parameters are accessed by tests, and how
they can be passed to tests, please refer to:: they can be passed to tests, please refer to::
http://avocado-framework.readthedocs.io/en/latest/WritingTests.html#accessing-test-parameters https://avocado-framework.readthedocs.io/en/latest/guides/writer/chapters/writing.html#accessing-test-parameters
Parameter values can be easily seen in the log files, and will look Parameter values can be easily seen in the log files, and will look
like the following: like the following:

View File

@ -183,10 +183,11 @@ class BootLinuxAarch64(BootLinux):
self.add_common_args() self.add_common_args()
self.launch_and_wait() self.launch_and_wait()
def test_virt_kvm(self): def test_virt_kvm_gicv2(self):
""" """
:avocado: tags=accel:kvm :avocado: tags=accel:kvm
:avocado: tags=cpu:host :avocado: tags=cpu:host
:avocado: tags=device:gicv2
""" """
if not kvm_available(self.arch, self.qemu_bin): if not kvm_available(self.arch, self.qemu_bin):
self.cancel(KVM_NOT_AVAILABLE) self.cancel(KVM_NOT_AVAILABLE)
@ -196,6 +197,20 @@ class BootLinuxAarch64(BootLinux):
self.add_common_args() self.add_common_args()
self.launch_and_wait() self.launch_and_wait()
def test_virt_kvm_gicv3(self):
"""
:avocado: tags=accel:kvm
:avocado: tags=cpu:host
:avocado: tags=device:gicv3
"""
if not kvm_available(self.arch, self.qemu_bin):
self.cancel(KVM_NOT_AVAILABLE)
self.vm.add_args("-accel", "kvm")
self.vm.add_args("-cpu", "host")
self.vm.add_args("-machine", "virt,gic-version=3")
self.add_common_args()
self.launch_and_wait()
class BootLinuxPPC64(BootLinux): class BootLinuxPPC64(BootLinux):
""" """

View File

@ -780,6 +780,8 @@ class BootLinuxConsole(LinuxKernelTest):
# Wait for VM to shut down gracefully # Wait for VM to shut down gracefully
self.vm.wait() self.vm.wait()
@skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
'Test artifacts fetched from unreliable dl.armbian.com')
@skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited')
@skipUnless(P7ZIP_AVAILABLE, '7z not installed') @skipUnless(P7ZIP_AVAILABLE, '7z not installed')
def test_arm_orangepi_bionic(self): def test_arm_orangepi_bionic(self):
@ -889,6 +891,28 @@ class BootLinuxConsole(LinuxKernelTest):
# Wait for user-space # Wait for user-space
wait_for_console_pattern(self, 'Starting root file system check') wait_for_console_pattern(self, 'Starting root file system check')
def test_aarch64_raspi3_atf(self):
"""
:avocado: tags=arch:aarch64
:avocado: tags=machine:raspi3
:avocado: tags=cpu:cortex-a53
:avocado: tags=device:pl011
:avocado: tags=atf
"""
zip_url = ('https://github.com/pbatard/RPi3/releases/download/'
'v1.15/RPi3_UEFI_Firmware_v1.15.zip')
zip_hash = '74b3bd0de92683cadb14e008a7575e1d0c3cafb9'
zip_path = self.fetch_asset(zip_url, asset_hash=zip_hash)
archive.extract(zip_path, self.workdir)
efi_fd = os.path.join(self.workdir, 'RPI_EFI.fd')
self.vm.set_console(console_index=1)
self.vm.add_args('-nodefaults',
'-device', 'loader,file=%s,force-raw=true' % efi_fd)
self.vm.launch()
self.wait_for_console_pattern('version UEFI Firmware v1.15')
def test_s390x_s390_ccw_virtio(self): def test_s390x_s390_ccw_virtio(self):
""" """
:avocado: tags=arch:s390x :avocado: tags=arch:s390x