diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-27 16:58:39 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-27 16:58:39 +0000 |
| commit | cfc1105649947f03134294a2448ce2b2e117456f (patch) | |
| tree | 970197b5c13c7c7e0e8f669e3588408ed11a0a8e /tests/acceptance/boot_linux.py | |
| parent | 725ca3313a5b9cbef89eaa1c728567684f37990a (diff) | |
| parent | 4c9ac67230d2d8c12bfc0f3447ae353e67b43f7f (diff) | |
| download | focaccia-qemu-cfc1105649947f03134294a2448ce2b2e117456f.tar.gz focaccia-qemu-cfc1105649947f03134294a2448ce2b2e117456f.zip | |
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>
Diffstat (limited to 'tests/acceptance/boot_linux.py')
| -rw-r--r-- | tests/acceptance/boot_linux.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index ad997c3f2e..1da4a53d6a 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -183,10 +183,11 @@ class BootLinuxAarch64(BootLinux): self.add_common_args() self.launch_and_wait() - def test_virt_kvm(self): + def test_virt_kvm_gicv2(self): """ :avocado: tags=accel:kvm :avocado: tags=cpu:host + :avocado: tags=device:gicv2 """ if not kvm_available(self.arch, self.qemu_bin): self.cancel(KVM_NOT_AVAILABLE) @@ -196,6 +197,20 @@ class BootLinuxAarch64(BootLinux): self.add_common_args() 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): """ |