From nobody Sun Apr 6 15:43:38 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=1740564000; cv=none;
d=zohomail.com; s=zohoarc;
b=laeDLBEcw5C8e2IWK0NgRa5tX/j78mMW11yyz66j8ridpt3XaP0mTI2tyBh+TCk5tZZrvSAv76tul/AK8Cc9CrTYOJj6gGSHMxCUVB/qW/Sya7fotB05TD4n4UpDm+LPUF4oqil0qYfKeqgpjov2UwftB/tC0vjE947GHHG/568=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1740564000;
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=/tXtnd9GbzdVfuUEfenYAGR6KNlM0z70wcGWBfgGuF0=;
b=QRn5JYY94f+K0O7xpc0BCng5nFxoLI/BH5VXgntDJOqMCTHhECdvR8FTqQ/yRo17W0jwFX/sqmZKuGikpYUa0JpvbkQs+8RKe2O5sN23mqV4FhJXho0Z0Zu1hqFuu5tYyvf8ZvfGzPKdDxqPNwl7ndbvpKGYN1mKqqnISbvgkYU=
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=<thuth@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1740564000848226.3058313499995;
Wed, 26 Feb 2025 02:00:00 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tnEBM-0003oG-LV; Wed, 26 Feb 2025 04:58:26 -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 <thuth@redhat.com>) id 1tnEB9-0003fO-4c
for qemu-devel@nongnu.org; Wed, 26 Feb 2025 04:58:11 -0500
Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <thuth@redhat.com>) id 1tnEB2-00088E-98
for qemu-devel@nongnu.org; Wed, 26 Feb 2025 04:58:09 -0500
Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com
(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
cipher=TLS_AES_256_GCM_SHA384) id us-mta-634-g0yerTPNOnGdyn5xjgLw0g-1; Wed,
26 Feb 2025 04:58:01 -0500
Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111])
(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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
id DFF9A1800268
for <qemu-devel@nongnu.org>; Wed, 26 Feb 2025 09:58:00 +0000 (UTC)
Received: from thuth-p1g4.redhat.com (unknown [10.45.224.144])
by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
id 639B91800358; Wed, 26 Feb 2025 09:57:59 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1740563883;
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=/tXtnd9GbzdVfuUEfenYAGR6KNlM0z70wcGWBfgGuF0=;
b=fzM26+SryI2i7ckNK9g1lz/Nz4vMdWPU6M4SxUqJ2BQ0IqvN/iVFQ9vI1k/8NpW6Dl2Mcm
T+pcgtH3D3qypF1URSS9ygSqvxCyl/DL9KQtbW72g8xmz8wCtQw+Ej72a1U/NYd3MwTAHL
K5cSO6pae+CMAj7uSCdic/SAWFd0wZE=
X-MC-Unique: g0yerTPNOnGdyn5xjgLw0g-1
X-Mimecast-MFC-AGG-ID: g0yerTPNOnGdyn5xjgLw0g_1740563881
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PULL 11/18] tests/functional: Convert the arm replay avocado tests
Date: Wed, 26 Feb 2025 10:57:24 +0100
Message-ID: <20250226095731.1172375-12-thuth@redhat.com>
In-Reply-To: <20250226095731.1172375-1-thuth@redhat.com>
References: <20250226095731.1172375-1-thuth@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111
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.133.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.443,
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=0.001,
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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=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: 1740564001519019000
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 <thuth@redhat.com>
Message-ID: <20250218152744.228335-10-thuth@redhat.com>
---
tests/avocado/replay_kernel.py | 74 -----------------------------
tests/functional/meson.build | 1 +
tests/functional/test_arm_replay.py | 69 +++++++++++++++++++++++++++
3 files changed, 70 insertions(+), 74 deletions(-)
create mode 100755 tests/functional/test_arm_replay.py
diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py
index 4bd48878b7e..02bd868a429 100644
--- a/tests/avocado/replay_kernel.py
+++ b/tests/avocado/replay_kernel.py
@@ -162,54 +162,6 @@ def test_aarch64_virt(self):
=20
self.run_rr(kernel_path, kernel_command_line, console_pattern)
=20
- def test_arm_virt(self):
- """
- :avocado: tags=3Darch:arm
- :avocado: tags=3Dmachine:virt
- """
- kernel_url =3D ('https://archives.fedoraproject.org/pub/archive/fe=
dora'
- '/linux/releases/29/Everything/armhfp/os/images/pxeb=
oot'
- '/vmlinuz')
- kernel_hash =3D 'e9826d741b4fb04cadba8d4824d1ed3b7fb8b4d4'
- kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h=
ash)
-
- kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE +
- 'console=3DttyAMA0')
- console_pattern =3D 'VFS: Cannot open root device'
-
- self.run_rr(kernel_path, kernel_command_line, console_pattern, shi=
ft=3D1)
-
- def test_arm_cubieboard_initrd(self):
- """
- :avocado: tags=3Darch:arm
- :avocado: tags=3Dmachine:cubieboard
- """
- deb_url =3D ('https://apt.armbian.com/pool/main/l/'
- 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6=
.6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb')
- deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b'
- deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash)
- kernel_path =3D self.extract_from_deb(deb_path,
- '/boot/vmlinuz-6.6.16-current-=
sunxi')
- dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun4i-a10-=
cubieboard.dtb'
- dtb_path =3D self.extract_from_deb(deb_path, dtb_path)
- initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/'
- '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/'
- 'arm/rootfs-armv5.cpio.gz')
- initrd_hash =3D '2b50f1873e113523967806f4da2afe385462ff9b'
- initrd_path_gz =3D self.fetch_asset(initrd_url, asset_hash=3Dinitr=
d_hash)
- initrd_path =3D os.path.join(self.workdir, 'rootfs.cpio')
- archive.gzip_uncompress(initrd_path_gz, initrd_path)
-
- kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE +
- 'console=3DttyS0,115200 '
- 'usbcore.nousb '
- 'panic=3D-1 noreboot')
- console_pattern =3D 'Boot successful.'
- self.run_rr(kernel_path, kernel_command_line, console_pattern, shi=
ft=3D1,
- args=3D('-dtb', dtb_path,
- '-initrd', initrd_path,
- '-no-reboot'))
-
def test_s390x_s390_ccw_virtio(self):
"""
:avocado: tags=3Darch:s390x
@@ -241,29 +193,3 @@ def test_alpha_clipper(self):
console_pattern =3D 'Kernel command line: %s' % kernel_command_line
self.run_rr(uncompressed_kernel, kernel_command_line, console_patt=
ern, shift=3D9,
args=3D('-nodefaults', ))
-
- def do_test_advcal_2018(self, file_path, kernel_name, args=3DNone):
- archive.extract(file_path, self.workdir)
-
- for entry in os.scandir(self.workdir):
- if entry.name.startswith('day') and entry.is_dir():
- kernel_path =3D os.path.join(entry.path, kernel_name)
- break
-
- kernel_command_line =3D ''
- console_pattern =3D 'QEMU advent calendar'
- self.run_rr(kernel_path, kernel_command_line, console_pattern,
- args=3Dargs)
-
- def test_arm_vexpressa9(self):
- """
- :avocado: tags=3Darch:arm
- :avocado: tags=3Dmachine:vexpress-a9
- """
- tar_hash =3D '32b7677ce8b6f1471fb0059865f451169934245b'
- tar_url =3D ('https://qemu-advcal.gitlab.io'
- '/qac-best-of-multiarch/download/day16.tar.xz')
- file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash)
- dtb_path =3D self.workdir + '/day16/vexpress-v2p-ca9.dtb'
- self.do_test_advcal_2018(file_path, 'winter.zImage',
- args=3D('-dtb', dtb_path))
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 995cea4f305..a46c4e89464 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -113,6 +113,7 @@ tests_arm_system_thorough =3D [
'arm_orangepi',
'arm_quanta_gsj',
'arm_raspi2',
+ 'arm_replay',
'arm_smdkc210',
'arm_sx1',
'arm_vexpress',
diff --git a/tests/functional/test_arm_replay.py b/tests/functional/test_ar=
m_replay.py
new file mode 100755
index 00000000000..e002e6a2647
--- /dev/null
+++ b/tests/functional/test_arm_replay.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+#
+# Replay test that boots a Linux kernel on arm machines and checks the con=
sole
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from qemu_test import Asset
+from replay_kernel import ReplayKernelBase
+
+
+class ArmReplay(ReplayKernelBase):
+
+ ASSET_VIRT =3D Asset(
+ ('https://archives.fedoraproject.org/pub/archive/fedora/linux/'
+ 'releases/29/Everything/armhfp/os/images/pxeboot/vmlinuz'),
+ '18dd5f1a9a28bd539f9d047f7c0677211bae528e8712b40ca5a229a4ad8e2591')
+
+ def test_virt(self):
+ self.set_machine('virt')
+ kernel_path =3D self.ASSET_VIRT.fetch()
+ kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE +
+ 'console=3DttyAMA0')
+ console_pattern =3D 'VFS: Cannot open root device'
+ self.run_rr(kernel_path, kernel_command_line, console_pattern, shi=
ft=3D1)
+
+ ASSET_CUBIE_KERNEL =3D Asset(
+ ('https://apt.armbian.com/pool/main/l/linux-6.6.16/'
+ 'linux-image-current-sunxi_24.2.1_armhf_'
+ '_6.6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.de=
b'),
+ '3d968c15b121ede871dce49d13ee7644d6f74b6b121b84c9a40f51b0c80d6d22')
+
+ ASSET_CUBIE_INITRD =3D Asset(
+ ('https://github.com/groeck/linux-build-test/raw/'
+ '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/arm/rootfs-armv5=
.cpio.gz'),
+ '334b8d256db67a3f2b3ad070aa08b5ade39624e0e7e35b02f4359a577bc8f39b')
+
+ def test_cubieboard(self):
+ self.set_machine('cubieboard')
+ kernel_path =3D self.archive_extract(self.ASSET_CUBIE_KERNEL,
+ member=3D'boot/vmlinuz-6.6.16-current-sunxi')
+ dtb_path =3D self.archive_extract(self.ASSET_CUBIE_KERNEL,
+ member=3D'usr/lib/linux-image-6.6.16-current-sunxi/sun4i-a10-c=
ubieboard.dtb')
+ initrd_path =3D self.uncompress(self.ASSET_CUBIE_INITRD)
+
+ kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE +
+ 'console=3DttyS0,115200 '
+ 'usbcore.nousb '
+ 'panic=3D-1 noreboot')
+ console_pattern =3D 'Boot successful.'
+ self.run_rr(kernel_path, kernel_command_line, console_pattern, shi=
ft=3D1,
+ args=3D('-dtb', dtb_path,
+ '-initrd', initrd_path,
+ '-no-reboot'))
+
+ ASSET_DAY16 =3D Asset(
+ 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day1=
6.tar.xz',
+ '63311adb2d4c4e7a73214a86d29988add87266a909719c56acfadd026b4110a7')
+
+ def test_vexpressa9(self):
+ self.set_machine('vexpress-a9')
+ self.archive_extract(self.ASSET_DAY16)
+ kernel_path =3D self.scratch_file('day16', 'winter.zImage')
+ dtb_path =3D self.scratch_file('day16', 'vexpress-v2p-ca9.dtb')
+ self.run_rr(kernel_path, self.REPLAY_KERNEL_COMMAND_LINE,
+ 'QEMU advent calendar', args=3D('-dtb', dtb_path))
+
+
+if __name__ =3D=3D '__main__':
+ ReplayKernelBase.main()
--=20
2.48.1