mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/avocado: Re-enable MIPS Malta tests (GitLab issue #1884 fixed)

Browse Source 
Commit 18a536f1f8 ("accel/tcg: Always require can_do_io") fixed
the GitLab issue #1884: we can now re-enable those tests.

This reverts commit f959c3d87c.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231003063808.66564-1-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-03 08:38:08 +02:00 committed by Richard Henderson
parent a0bc599726
commit 432f936ae1
4 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/avocado/boot_linux_console.py
View File

@ -116,7 +116,6 @@ class BootLinuxConsole(LinuxKernelTest):
console_pattern = 'Kernel command line: %s' % kernel_command_line console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern) self.wait_for_console_pattern(console_pattern)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta(self): def test_mips_malta(self):
""" """
:avocado: tags=arch:mips :avocado: tags=arch:mips
@ -139,7 +138,6 @@ class BootLinuxConsole(LinuxKernelTest):
console_pattern = 'Kernel command line: %s' % kernel_command_line console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern) self.wait_for_console_pattern(console_pattern)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips64el_malta(self): def test_mips64el_malta(self):
""" """
This test requires the ar tool to extract "data.tar.gz" from This test requires the ar tool to extract "data.tar.gz" from
@ -193,7 +191,6 @@ class BootLinuxConsole(LinuxKernelTest):
console_pattern = 'Kernel command line: %s' % kernel_command_line console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern) self.wait_for_console_pattern(console_pattern)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta_cpio(self): def test_mips_malta_cpio(self):
""" """
:avocado: tags=arch:mips :avocado: tags=arch:mips
@ -235,7 +232,6 @@ class BootLinuxConsole(LinuxKernelTest):
# Wait for VM to shut down gracefully # Wait for VM to shut down gracefully
self.vm.wait() self.vm.wait()
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
@skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code') @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
def test_mips64el_malta_5KEc_cpio(self): def test_mips64el_malta_5KEc_cpio(self):
""" """
@ -296,7 +292,6 @@ class BootLinuxConsole(LinuxKernelTest):
console_pattern = 'Kernel command line: %s' % kernel_command_line console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern) self.wait_for_console_pattern(console_pattern)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_4k(self): def test_mips_malta32el_nanomips_4k(self):
""" """
:avocado: tags=arch:mipsel :avocado: tags=arch:mipsel
@ -310,7 +305,6 @@ class BootLinuxConsole(LinuxKernelTest):
kernel_hash = '477456aafd2a0f1ddc9482727f20fe9575565dd6' kernel_hash = '477456aafd2a0f1ddc9482727f20fe9575565dd6'
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_16k_up(self): def test_mips_malta32el_nanomips_16k_up(self):
""" """
:avocado: tags=arch:mipsel :avocado: tags=arch:mipsel
@ -324,7 +318,6 @@ class BootLinuxConsole(LinuxKernelTest):
kernel_hash = 'e882868f944c71c816e832e2303b7874d044a7bc' kernel_hash = 'e882868f944c71c816e832e2303b7874d044a7bc'
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_64k_dbg(self): def test_mips_malta32el_nanomips_64k_dbg(self):
""" """
:avocado: tags=arch:mipsel :avocado: tags=arch:mipsel

6
tests/avocado/machine_mips_malta.py
View File

@ -11,7 +11,6 @@ import os
import gzip import gzip
import logging import logging
from avocado import skip
from avocado import skipIf from avocado import skipIf
from avocado import skipUnless from avocado import skipUnless
from avocado.utils import archive from avocado.utils import archive
@ -94,7 +93,6 @@ class MaltaMachineFramebuffer(QemuSystemTest):
cv2.imwrite(debug_png, screendump_bgr) cv2.imwrite(debug_png, screendump_bgr)
self.assertGreaterEqual(tuxlogo_count, cpu_cores_count) self.assertGreaterEqual(tuxlogo_count, cpu_cores_count)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta_i6400_framebuffer_logo_1core(self): def test_mips_malta_i6400_framebuffer_logo_1core(self):
""" """
:avocado: tags=arch:mips64el :avocado: tags=arch:mips64el
@ -103,7 +101,6 @@ class MaltaMachineFramebuffer(QemuSystemTest):
""" """
self.do_test_i6400_framebuffer_logo(1) self.do_test_i6400_framebuffer_logo(1)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_mips_malta_i6400_framebuffer_logo_7cores(self): def test_mips_malta_i6400_framebuffer_logo_7cores(self):
""" """
@ -114,7 +111,6 @@ class MaltaMachineFramebuffer(QemuSystemTest):
""" """
self.do_test_i6400_framebuffer_logo(7) self.do_test_i6400_framebuffer_logo(7)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_mips_malta_i6400_framebuffer_logo_8cores(self): def test_mips_malta_i6400_framebuffer_logo_8cores(self):
""" """
@ -146,7 +142,6 @@ class MaltaMachine(QemuSystemTest):
wait_for_console_pattern(self, prompt) wait_for_console_pattern(self, prompt)
self.vm.shutdown() self.vm.shutdown()
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mipsel_malta_yamon(self): def test_mipsel_malta_yamon(self):
""" """
:avocado: tags=arch:mipsel :avocado: tags=arch:mipsel
@ -155,7 +150,6 @@ class MaltaMachine(QemuSystemTest):
""" """
self.do_test_yamon() self.do_test_yamon()
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips64el_malta_yamon(self): def test_mips64el_malta_yamon(self):
""" """
:avocado: tags=arch:mips64el :avocado: tags=arch:mips64el

7
tests/avocado/replay_kernel.py
View File

@ -98,7 +98,6 @@ class ReplayKernelNormal(ReplayKernelBase):
self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5) self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta(self): def test_mips_malta(self):
""" """
:avocado: tags=arch:mips :avocado: tags=arch:mips
@ -117,7 +116,6 @@ class ReplayKernelNormal(ReplayKernelBase):
self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5) self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips64el_malta(self): def test_mips64el_malta(self):
""" """
This test requires the ar tool to extract "data.tar.gz" from This test requires the ar tool to extract "data.tar.gz" from
@ -433,7 +431,6 @@ class ReplayKernelSlow(ReplayKernelBase):
# making it very slow. # making it very slow.
timeout = 180 timeout = 180
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta_cpio(self): def test_mips_malta_cpio(self):
""" """
:avocado: tags=arch:mips :avocado: tags=arch:mips
@ -463,7 +460,6 @@ class ReplayKernelSlow(ReplayKernelBase):
self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5, self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5,
args=('-initrd', initrd_path)) args=('-initrd', initrd_path))
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
@skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code') @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
def test_mips64el_malta_5KEc_cpio(self): def test_mips64el_malta_5KEc_cpio(self):
""" """
@ -506,7 +502,6 @@ class ReplayKernelSlow(ReplayKernelBase):
console_pattern = 'Kernel command line: %s' % kernel_command_line console_pattern = 'Kernel command line: %s' % kernel_command_line
self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5) self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_4k(self): def test_mips_malta32el_nanomips_4k(self):
""" """
:avocado: tags=arch:mipsel :avocado: tags=arch:mipsel
@ -521,7 +516,6 @@ class ReplayKernelSlow(ReplayKernelBase):
kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash) kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
self.do_test_mips_malta32el_nanomips(kernel_path_xz) self.do_test_mips_malta32el_nanomips(kernel_path_xz)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_16k_up(self): def test_mips_malta32el_nanomips_16k_up(self):
""" """
:avocado: tags=arch:mipsel :avocado: tags=arch:mipsel
@ -536,7 +530,6 @@ class ReplayKernelSlow(ReplayKernelBase):
kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash) kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
self.do_test_mips_malta32el_nanomips(kernel_path_xz) self.do_test_mips_malta32el_nanomips(kernel_path_xz)
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_64k_dbg(self): def test_mips_malta32el_nanomips_64k_dbg(self):
""" """
:avocado: tags=arch:mipsel :avocado: tags=arch:mipsel

4
tests/avocado/tuxrun_baselines.py
View File

@ -352,7 +352,6 @@ class TuxRunBaselineTest(QemuSystemTest):
self.common_tuxrun(csums=sums, drive="virtio-blk-pci") self.common_tuxrun(csums=sums, drive="virtio-blk-pci")
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips32(self): def test_mips32(self):
""" """
:avocado: tags=arch:mips :avocado: tags=arch:mips
@ -371,7 +370,6 @@ class TuxRunBaselineTest(QemuSystemTest):
self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0") self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips32el(self): def test_mips32el(self):
""" """
:avocado: tags=arch:mipsel :avocado: tags=arch:mipsel
@ -389,7 +387,6 @@ class TuxRunBaselineTest(QemuSystemTest):
self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0") self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips64(self): def test_mips64(self):
""" """
:avocado: tags=arch:mips64 :avocado: tags=arch:mips64
@ -407,7 +404,6 @@ class TuxRunBaselineTest(QemuSystemTest):
self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0") self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
@skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips64el(self): def test_mips64el(self):
""" """
:avocado: tags=arch:mips64el :avocado: tags=arch:mips64el