From nobody Fri Apr 4 21:16:10 2025 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=1739892814; cv=none; d=zohomail.com; s=zohoarc; b=hkjcXGW+GxG3y9hKO7TJlARL0+c1DaYXcv9lnNLqxSDJYzezlWAKRwxlgZfgIo5Vd+iJFEevGdjdgMs5dUfBRrn+JmLWH0LaB9NqrsO2op7S9bQRsXfal95pIb57spX8GOF72OQ24TTX2WEvKBxZC7/hTbXkiGxtVaqLIH+Meu8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739892814; h=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=5LgHzhzSfarKUxhDqL2Bjy+KrTB4K289wOQ1/7TM0XI=; b=ZDbPhyuLgZ8SEo//APKHQqYFbmqzHjb7odqcS7hUYE4zxHYOqBlvZ9+pbxamrc0CUr9800fMigFDTK6h4+7ecN8PMVSOtbt5MH6RdNn3v2o/56XsIPvkFu9M1dk8fr9HKzNeW0wZpMDoB2PhbU+rJRp+6WwytrHDt03ELQMh9Ik= 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 1739892814256569.5997197109276; Tue, 18 Feb 2025 07:33:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkPXU-0000f7-By; Tue, 18 Feb 2025 10:29:38 -0500 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 1tkPWK-00084b-4G for qemu-devel@nongnu.org; Tue, 18 Feb 2025 10:28:26 -0500 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 1tkPWG-0008BX-Iq for qemu-devel@nongnu.org; Tue, 18 Feb 2025 10:28:23 -0500 Received: from mx-prod-mc-01.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-333-leztxot4MdGWgoQm7sYA4A-1; Tue, 18 Feb 2025 10:28:13 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 64F2519783B7; Tue, 18 Feb 2025 15:28:12 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.33.187]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5B6C3180035F; Tue, 18 Feb 2025 15:28:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739892498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5LgHzhzSfarKUxhDqL2Bjy+KrTB4K289wOQ1/7TM0XI=; b=QtTnFoOzjoc15m+CTga8ZjPgle1XGTwLbHJyy7QfG82JXd8pGbaZa3xLeYUXPSfiW7LIh3 UqIz9GOO2iHTVjTcPZr2DqozOMu9HsOSEc5pwYzrMk6oUdV01JVNk7G0620TTxalWUARNu lKhMfZpQnfn+Jy/O9w4TCZ/R42Gl6ec= X-MC-Unique: leztxot4MdGWgoQm7sYA4A-1 X-Mimecast-MFC-AGG-ID: leztxot4MdGWgoQm7sYA4A_1739892492 From: Thomas Huth To: qemu-devel@nongnu.org, Pavel Dovgalyuk Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 08/14] tests/functional: Convert the m68k replay avocado tests Date: Tue, 18 Feb 2025 16:27:38 +0100 Message-ID: <20250218152744.228335-9-thuth@redhat.com> In-Reply-To: <20250218152744.228335-1-thuth@redhat.com> References: <20250218152744.228335-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.423, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1739892816614019100 Content-Type: text/plain; charset="utf-8" Put the tests into a separate file now (since in the functional framework, each file is run with one specific qemu-system-* binary). Signed-off-by: Thomas Huth --- tests/avocado/replay_kernel.py | 29 ------------------- tests/functional/meson.build | 1 + tests/functional/test_m68k_replay.py | 42 ++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 29 deletions(-) create mode 100755 tests/functional/test_m68k_replay.py diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py index b2097afc302..4bd48878b7e 100644 --- a/tests/avocado/replay_kernel.py +++ b/tests/avocado/replay_kernel.py @@ -242,24 +242,6 @@ def test_alpha_clipper(self): self.run_rr(uncompressed_kernel, kernel_command_line, console_patt= ern, shift=3D9, args=3D('-nodefaults', )) =20 - def test_m68k_q800(self): - """ - :avocado: tags=3Darch:m68k - :avocado: tags=3Dmachine:q800 - """ - deb_url =3D ('https://snapshot.debian.org/archive/debian-ports' - '/20191021T083923Z/pool-m68k/main' - '/l/linux/kernel-image-5.3.0-1-m68k-di_5.3.7-1_m68k.ude= b') - deb_hash =3D '044954bb9be4160a3ce81f8bc1b5e856b75cccd1' - deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) - kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinux-5.3.0-1-m68k') - - kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + - 'console=3DttyS0 vga=3Doff') - console_pattern =3D 'No filesystem could mount root' - self.run_rr(kernel_path, kernel_command_line, console_pattern) - def do_test_advcal_2018(self, file_path, kernel_name, args=3DNone): archive.extract(file_path, self.workdir) =20 @@ -285,14 +267,3 @@ def test_arm_vexpressa9(self): dtb_path =3D self.workdir + '/day16/vexpress-v2p-ca9.dtb' self.do_test_advcal_2018(file_path, 'winter.zImage', args=3D('-dtb', dtb_path)) - - def test_m68k_mcf5208evb(self): - """ - :avocado: tags=3Darch:m68k - :avocado: tags=3Dmachine:mcf5208evb - """ - tar_hash =3D 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c' - tar_url =3D ('https://qemu-advcal.gitlab.io' - '/qac-best-of-multiarch/download/day07.tar.xz') - file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) - self.do_test_advcal_2018(file_path, 'sanity-clause.elf') diff --git a/tests/functional/meson.build b/tests/functional/meson.build index d59ac2be9da..7af43dbdcfc 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -147,6 +147,7 @@ tests_loongarch64_system_thorough =3D [ tests_m68k_system_thorough =3D [ 'm68k_mcf5208evb', 'm68k_nextcube', + 'm68k_replay', 'm68k_q800', 'm68k_tuxrun', ] diff --git a/tests/functional/test_m68k_replay.py b/tests/functional/test_m= 68k_replay.py new file mode 100755 index 00000000000..18c1db539c5 --- /dev/null +++ b/tests/functional/test_m68k_replay.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python3 +# +# Replay test that boots a Linux kernel on an m68k machine +# and checks the console +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import Asset +from replay_kernel import ReplayKernelBase + + +class M68kReplay(ReplayKernelBase): + + ASSET_Q800 =3D Asset( + ('https://snapshot.debian.org/' + 'archive/debian-ports/20191021T083923Z/pool-m68k/main/l/linux/' + 'kernel-image-5.3.0-1-m68k-di_5.3.7-1_m68k.udeb'), + '949e50d74d4b9bc15d26c06d402717b7a4c0e32ff8100014f5930d8024de7b73') + + def test_q800(self): + self.set_machine('q800') + kernel_path =3D self.archive_extract(self.ASSET_Q800, + member=3D'boot/vmlinux-5.3.0-1-= m68k') + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0 vga=3Doff') + console_pattern =3D 'No filesystem could mount root' + self.run_rr(kernel_path, kernel_command_line, console_pattern) + + ASSET_MCF5208 =3D Asset( + 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day07= .tar.xz', + '753c2f3837126b7c6ba92d0b1e0b156e8a2c5131d2d576bb0b9a763fae73c08a') + + def test_mcf5208evb(self): + self.set_machine('mcf5208evb') + kernel_path =3D self.archive_extract(self.ASSET_MCF5208, + member=3D'day07/sanity-clause.e= lf') + self.run_rr(kernel_path, self.KERNEL_COMMON_COMMAND_LINE, + 'QEMU advent calendar') + + +if __name__ =3D=3D '__main__': + ReplayKernelBase.main() --=20 2.48.1