From nobody Wed Oct 23 00:33:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1729510912; cv=none; d=zohomail.com; s=zohoarc; b=cm5ggw6PmtQqeMjoHbPk8Lal4aB3+w6YngdTySxi6kdisyxhTwaO1g378Xnf9NMKqscvYtByzDDa1oyLlhXE41MIZxMLd0/OoamAYi474SYhVw9U6zWomPza5tzA0JansRo6B/xuyo//x4bp1px9B9EVAKghiM9SWl+xv2JFaDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729510912; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xS1xkLREns5UYecBft9xrCHMwWOowBmZA5PQsZRtpCA=; b=j3onPWpzj04kYsJquQRikQzQ3fU96MIkKbH8LufbdptloOm8QkJOct8mLpSNs9Ih0HJtX5CuQ/AIWRmOpR/vdWMKxINNbJOq58b/xrg6TjJ3OnAEdS5bIfzSUmZlBTyKpnkZ3PVbup4n/cmsjXfigJsxkN2J+HkeySKyVcqli+M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729510912529926.3079113270402; Mon, 21 Oct 2024 04:41:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2qhr-0002xO-Dh; Mon, 21 Oct 2024 07:36:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t2qhf-0002oh-JK for qemu-devel@nongnu.org; Mon, 21 Oct 2024 07:36:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t2qhZ-0001mJ-My for qemu-devel@nongnu.org; Mon, 21 Oct 2024 07:35:59 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-395-4QycRctgMn-fwm5qSjSgZQ-1; Mon, 21 Oct 2024 07:35:53 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7B75519560AD; Mon, 21 Oct 2024 11:35:52 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.49]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 069531955E84; Mon, 21 Oct 2024 11:35:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729510556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xS1xkLREns5UYecBft9xrCHMwWOowBmZA5PQsZRtpCA=; b=i3GNxcD5T7+LyYXgSfk53TZZ//zU66GFq5/xFTpGL0/tD9IZlaEUBLBrGb5zacCQfwctdw elW2T5bNGkXRC7UKd6ZKgz/9Y8mtfnHkKCJqqUaoo6Q28I7LK7jwJG7xT1gFjD5lFkvhNu uehGKmE66D+gXP7lM8Wt2En8G2Q2PU8= X-MC-Unique: 4QycRctgMn-fwm5qSjSgZQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 21/21] tests/functional: Convert the Avocado sh4 tuxrun test Date: Mon, 21 Oct 2024 13:34:58 +0200 Message-ID: <20241021113500.122500-22-thuth@redhat.com> In-Reply-To: <20241021113500.122500-1-thuth@redhat.com> References: <20241021113500.122500-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.421, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1.699, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1729510914416116600 Move the test into a new file so that it can be run via qemu-system-sh4 in the functional framework. Since this was the last test in tests/avocado/tuxrun_baselines.py, we can now delete that file completely. Signed-off-by: Thomas Huth Message-ID: <20241011131937.377223-18-thuth@redhat.com> --- MAINTAINERS | 4 +- tests/avocado/tuxrun_baselines.py | 228 ---------------------------- tests/functional/meson.build | 2 + tests/functional/test_sh4_tuxrun.py | 57 +++++++ 4 files changed, 62 insertions(+), 229 deletions(-) delete mode 100644 tests/avocado/tuxrun_baselines.py create mode 100755 tests/functional/test_sh4_tuxrun.py diff --git a/MAINTAINERS b/MAINTAINERS index 213d2ff6f3..957d1998b1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1634,6 +1634,7 @@ 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 =20 SPARC Machines -------------- @@ -4093,7 +4094,8 @@ F: scripts/ci/ F: tests/docker/ F: tests/vm/ F: tests/lcitool/ -F: tests/avocado/tuxrun_baselines.py +F: tests/functional/qemu_test/tuxruntest.py +F: tests/functional/test_*_tuxrun.py F: scripts/archive-source.sh F: docs/devel/testing.rst W: https://gitlab.com/qemu-project/qemu/pipelines diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_basel= ines.py deleted file mode 100644 index c358095e1f..0000000000 --- a/tests/avocado/tuxrun_baselines.py +++ /dev/null @@ -1,228 +0,0 @@ -# Functional test that boots known good tuxboot images the same way -# that tuxrun (www.tuxrun.org) does. This tool is used by things like -# the LKFT project to run regression tests on kernels. -# -# Copyright (c) 2023 Linaro Ltd. -# -# Author: -# Alex Benn=C3=A9e -# -# SPDX-License-Identifier: GPL-2.0-or-later - -import os -import time -import tempfile - -from avocado import skip, skipUnless -from avocado_qemu import QemuSystemTest -from avocado_qemu import exec_command, exec_command_and_wait_for_pattern -from avocado_qemu import wait_for_console_pattern -from avocado.utils import process -from avocado.utils.path import find_command - -class TuxRunBaselineTest(QemuSystemTest): - """ - :avocado: tags=3Daccel:tcg - """ - - KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0' - # Tests are ~10-40s, allow for --debug/--enable-gcov overhead - timeout =3D 100 - - def get_tag(self, tagname, default=3DNone): - """ - Get the metadata tag or return the default. - """ - utag =3D self._get_unique_tag_val(tagname) - print(f"{tagname}/{default} -> {utag}") - if utag: - return utag - - return default - - def setUp(self): - super().setUp() - - # We need zstd for all the tuxrun tests - # See https://github.com/avocado-framework/avocado/issues/5609 - zstd =3D find_command('zstd', False) - if zstd is False: - self.cancel('Could not find "zstd", which is required to ' - 'decompress rootfs') - self.zstd =3D zstd - - # Process the TuxRun specific tags, most machines work with - # reasonable defaults but we sometimes need to tweak the - # config. To avoid open coding everything we store all these - # details in the metadata for each test. - - # The tuxboot tag matches the root directory - self.tuxboot =3D self.get_tag('tuxboot') - - # Most Linux's use ttyS0 for their serial port - self.console =3D self.get_tag('console', "ttyS0") - - # Does the machine shutdown QEMU nicely on "halt" - self.shutdown =3D self.get_tag('shutdown') - - # The name of the kernel Image file - self.image =3D self.get_tag('image', "Image") - - self.root =3D self.get_tag('root', "vda") - - # Occasionally we need extra devices to hook things up - self.extradev =3D self.get_tag('extradev') - - self.qemu_img =3D super().get_qemu_img() - - def wait_for_console_pattern(self, success_message, vm=3DNone): - wait_for_console_pattern(self, success_message, - failure_message=3D'Kernel panic - not syn= cing', - vm=3Dvm) - - def fetch_tuxrun_assets(self, csums=3DNone, dt=3DNone): - """ - Fetch the TuxBoot assets. They are stored in a standard way so we - use the per-test tags to fetch details. - """ - base_url =3D f"https://storage.tuxboot.com/20230331/{self.tuxboot}= /" - - # empty hash if we weren't passed one - csums =3D {} if csums is None else csums - ksum =3D csums.get(self.image, None) - isum =3D csums.get("rootfs.ext4.zst", None) - - kernel_image =3D self.fetch_asset(base_url + self.image, - asset_hash =3D ksum, - algorithm =3D "sha256") - disk_image_zst =3D self.fetch_asset(base_url + "rootfs.ext4.zst", - asset_hash =3D isum, - algorithm =3D "sha256") - - cmd =3D f"{self.zstd} -d {disk_image_zst} -o {self.workdir}/rootfs= .ext4" - process.run(cmd) - - if dt: - dsum =3D csums.get(dt, None) - dtb =3D self.fetch_asset(base_url + dt, - asset_hash =3D dsum, - algorithm =3D "sha256") - else: - dtb =3D None - - return (kernel_image, self.workdir + "/rootfs.ext4", dtb) - - def prepare_run(self, kernel, disk, drive, dtb=3DNone, console_index= =3D0): - """ - Setup to run and add the common parameters to the system - """ - self.vm.set_console(console_index=3Dconsole_index) - - # all block devices are raw ext4's - blockdev =3D "driver=3Draw,file.driver=3Dfile," \ - + f"file.filename=3D{disk},node-name=3Dhd0" - - kcmd_line =3D self.KERNEL_COMMON_COMMAND_LINE - kcmd_line +=3D f" root=3D/dev/{self.root}" - kcmd_line +=3D f" console=3D{self.console}" - - self.vm.add_args('-kernel', kernel, - '-append', kcmd_line, - '-blockdev', blockdev) - - # Sometimes we need extra devices attached - if self.extradev: - self.vm.add_args('-device', self.extradev) - - self.vm.add_args('-device', - f"{drive},drive=3Dhd0") - - # Some machines need an explicit DTB - if dtb: - self.vm.add_args('-dtb', dtb) - - def run_tuxtest_tests(self, haltmsg): - """ - Wait for the system to boot up, wait for the login prompt and - then do a few things on the console. Trigger a shutdown and - wait to exit cleanly. - """ - self.wait_for_console_pattern("Welcome to TuxTest") - time.sleep(0.2) - exec_command(self, 'root') - time.sleep(0.2) - exec_command(self, 'cat /proc/interrupts') - time.sleep(0.1) - exec_command(self, 'cat /proc/self/maps') - time.sleep(0.1) - exec_command(self, 'uname -a') - time.sleep(0.1) - exec_command_and_wait_for_pattern(self, 'halt', haltmsg) - - # Wait for VM to shut down gracefully if it can - if self.shutdown =3D=3D "nowait": - self.vm.shutdown() - else: - self.vm.wait() - - def common_tuxrun(self, - csums=3DNone, - dt=3DNone, - drive=3D"virtio-blk-device", - haltmsg=3D"reboot: System halted", - console_index=3D0): - """ - Common path for LKFT tests. Unless we need to do something - special with the command line we can process most things using - the tag metadata. - """ - (kernel, disk, dtb) =3D self.fetch_tuxrun_assets(csums, dt) - - self.prepare_run(kernel, disk, drive, dtb, console_index) - self.vm.launch() - self.run_tuxtest_tests(haltmsg) - - - # - # The tests themselves. The configuration is derived from how - # tuxrun invokes qemu (with minor tweaks like using -blockdev - # consistently). The tuxrun equivalent is something like: - # - # tuxrun --device qemu-{ARCH} \ - # --kernel https://storage.tuxboot.com/{TUXBOOT}/{IMAGE} - # - - # Note: some segfaults caused by unaligned userspace access - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on G= itLab') - def test_sh4(self): - """ - :avocado: tags=3Darch:sh4 - :avocado: tags=3Dmachine:r2d - :avocado: tags=3Dcpu:sh7785 - :avocado: tags=3Dtuxboot:sh4 - :avocado: tags=3Dimage:zImage - :avocado: tags=3Droot:sda - :avocado: tags=3Dconsole:ttySC1 - :avocado: tags=3Dflaky - """ - sums =3D { "rootfs.ext4.zst" : - "3592a7a3d5a641e8b9821449e77bc43c9904a56c30d45da0694349cf= d86743fd", - "zImage" : - "29d9b2aba604a0f53a5dc3b5d0f2b8e35d497de1129f8ee5139eb6fd= f0db692f" } - - # The test is currently too unstable to do much in userspace - # so we skip common_tuxrun and do a minimal boot and shutdown. - (kernel, disk, dtb) =3D self.fetch_tuxrun_assets(csums=3Dsums) - - # the console comes on the second serial port - self.prepare_run(kernel, disk, - "driver=3Dide-hd,bus=3Dide.0,unit=3D0", - console_index=3D1) - self.vm.launch() - - self.wait_for_console_pattern("Welcome to TuxTest") - time.sleep(0.1) - exec_command(self, 'root') - time.sleep(0.1) - exec_command_and_wait_for_pattern(self, 'halt', - "reboot: System halted") diff --git a/tests/functional/meson.build b/tests/functional/meson.build index c17c9b0700..51d1037d96 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -156,8 +156,10 @@ tests_s390x_system_thorough =3D [ =20 tests_sh4_system_thorough =3D [ 'sh4_r2d', + 'sh4_tuxrun', ] =20 + tests_sparc_system_thorough =3D [ 'sparc_sun4m', ] diff --git a/tests/functional/test_sh4_tuxrun.py b/tests/functional/test_sh= 4_tuxrun.py new file mode 100755 index 0000000000..352cb360ef --- /dev/null +++ b/tests/functional/test_sh4_tuxrun.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python3 +# +# Functional test that boots known good tuxboot images the same way +# that tuxrun (www.tuxrun.org) does. This tool is used by things like +# the LKFT project to run regression tests on kernels. +# +# Copyright (c) 2023 Linaro Ltd. +# +# Author: +# Alex Benn=C3=A9e +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import time + +from unittest import skipUnless +from qemu_test import Asset, exec_command_and_wait_for_pattern, exec_comma= nd +from qemu_test.tuxruntest import TuxRunBaselineTest + +class TuxRunSh4Test(TuxRunBaselineTest): + + ASSET_SH4_KERNEL =3D Asset( + 'https://storage.tuxboot.com/20230331/sh4/zImage', + '29d9b2aba604a0f53a5dc3b5d0f2b8e35d497de1129f8ee5139eb6fdf0db692f') + ASSET_SH4_ROOTFS =3D Asset( + 'https://storage.tuxboot.com/20230331/sh4/rootfs.ext4.zst', + '3592a7a3d5a641e8b9821449e77bc43c9904a56c30d45da0694349cfd86743fd') + + # Note: some segfaults caused by unaligned userspace access + @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable') + def test_sh4(self): + self.set_machine('r2d') + self.cpu=3D'sh7785' + self.root=3D'sda' + self.console=3D'ttySC1' + + # The test is currently too unstable to do much in userspace + # so we skip common_tuxrun and do a minimal boot and shutdown. + (kernel, disk, dtb) =3D self.fetch_tuxrun_assets(self.ASSET_SH4_KE= RNEL, + self.ASSET_SH4_ROOT= FS) + + # the console comes on the second serial port + self.prepare_run(kernel, disk, + "driver=3Dide-hd,bus=3Dide.0,unit=3D0", + console_index=3D1) + self.vm.launch() + + self.wait_for_console_pattern("Welcome to TuxTest") + time.sleep(0.1) + exec_command(self, 'root') + time.sleep(0.1) + exec_command_and_wait_for_pattern(self, 'halt', + "reboot: System halted") + +if __name__ =3D=3D '__main__': + TuxRunBaselineTest.main() --=20 2.47.0