From nobody Fri Apr 4 21:17:33 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=1739892622; cv=none; d=zohomail.com; s=zohoarc; b=SAm9Jvsa+K8TARuJXw6urh62JrxcnsmSH8oM2EYdWgFO3OBc+gsV9gVVaYpadJ1MmxWRbpfnkV8fHnX//QJicxRFx3nkllCJ27TXglAkJCe8HUWScZs/Ep8M57aP8KaFI+8oC4WzoFaa12XqPCjULDalwks0ze4K5PBWNbzQ1/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739892622; 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=PyOj8aVm/MZIW0oCN+aSGjzlP3/vwj69dj2qqQBOens=; b=h1sEQpM8GPrhzQjw3sYhw79bAaEXJ1VGvZdfMFeqYdVuF/DW7bk8vAYmjAWROJAZqOAS+bfcYfyjESjA6bWQpBd66DLGTOP+/NJpD5XZlaN7YHJREWcFxStWJWHArrwDKBukHZx2AuFcddfCrLvZZiMKkgw03ZNfFQ5ODihHAsg= 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 1739892622167930.0490189879268; Tue, 18 Feb 2025 07:30:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkPXm-0001Fr-T5; Tue, 18 Feb 2025 10:29:55 -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 1tkPWO-00086M-KH for qemu-devel@nongnu.org; Tue, 18 Feb 2025 10:28:32 -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 ) id 1tkPWM-0008EX-DM for qemu-devel@nongnu.org; Tue, 18 Feb 2025 10:28:28 -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-558-h-Tu-n2IP4eOsNQmCBDUTA-1; Tue, 18 Feb 2025 10:28:21 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 634621800989; Tue, 18 Feb 2025 15:28:20 +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 5AD57180035F; Tue, 18 Feb 2025 15:28:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739892504; 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=PyOj8aVm/MZIW0oCN+aSGjzlP3/vwj69dj2qqQBOens=; b=AaECiAnkKVP6eoRxMSAwhDs0fDbRek5XzW+gcc2y3LwGocV7uMkFhGiDGb/pZPXEg5G/5I o5APPltZ2/J7CsAW/QmtnltOxQy9uDVl9oOZsZGTl71iOnlgVohRCQ6NJ7B+yqrzwLs772 zLZq/w2i2kFjts/dSt3Go5gtJ4VPktg= X-MC-Unique: h-Tu-n2IP4eOsNQmCBDUTA-1 X-Mimecast-MFC-AGG-ID: h-Tu-n2IP4eOsNQmCBDUTA_1739892500 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 11/14] tests/functional: Convert the s390x replay avocado tests Date: Tue, 18 Feb 2025 16:27:41 +0100 Message-ID: <20250218152744.228335-12-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.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.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_H2=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: 1739892623197019000 Content-Type: text/plain; charset="utf-8" Put the tests into a separate file now (in the functional framework, each file is run with one specific qemu-system-* binary). Signed-off-by: Thomas Huth --- tests/avocado/replay_kernel.py | 15 -------------- tests/functional/meson.build | 1 + tests/functional/test_s390x_replay.py | 28 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 15 deletions(-) create mode 100755 tests/functional/test_s390x_replay.py diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py index 4347d202742..49543604613 100644 --- a/tests/avocado/replay_kernel.py +++ b/tests/avocado/replay_kernel.py @@ -161,18 +161,3 @@ def test_aarch64_virt(self): console_pattern =3D 'VFS: Cannot open root device' =20 self.run_rr(kernel_path, kernel_command_line, console_pattern) - - def test_s390x_s390_ccw_virtio(self): - """ - :avocado: tags=3Darch:s390x - :avocado: tags=3Dmachine:s390-ccw-virtio - """ - kernel_url =3D ('https://archives.fedoraproject.org/pub/archive' - '/fedora-secondary/releases/29/Everything/s390x/os/i= mages' - '/kernel.img') - kernel_hash =3D 'e8e8439103ef8053418ef062644ffd46a7919313' - kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) - - kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE + 'console= =3Dsclp0' - console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.run_rr(kernel_path, kernel_command_line, console_pattern, shi= ft=3D9) diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 884b5aabc50..24cd0746b6e 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -249,6 +249,7 @@ tests_rx_system_thorough =3D [ =20 tests_s390x_system_thorough =3D [ 's390x_ccw_virtio', + 's390x_replay', 's390x_topology', 's390x_tuxrun', ] diff --git a/tests/functional/test_s390x_replay.py b/tests/functional/test_= s390x_replay.py new file mode 100755 index 00000000000..33b5843adae --- /dev/null +++ b/tests/functional/test_s390x_replay.py @@ -0,0 +1,28 @@ +#!/usr/bin/env python3 +# +# Replay test that boots a Linux kernel on an s390x machine +# and checks the console +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import Asset +from replay_kernel import ReplayKernelBase + + +class S390xReplay(ReplayKernelBase): + + ASSET_KERNEL =3D Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora-secondary/' + 'releases/29/Everything/s390x/os/images/kernel.img'), + 'dace03b8ae0c9f670ebb9b8d6ce5eb24b62987f346de8f1300a439bb00bb99e7') + + def test_s390_ccw_virtio(self): + self.set_machine('s390-ccw-virtio') + kernel_path =3D self.ASSET_KERNEL.fetch() + kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE + 'console= =3Dsclp0' + console_pattern =3D 'Kernel command line: %s' % kernel_command_line + self.run_rr(kernel_path, kernel_command_line, console_pattern, shi= ft=3D9) + + +if __name__ =3D=3D '__main__': + ReplayKernelBase.main() --=20 2.48.1