From nobody Sun Nov 24 09:10:34 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=1725972069; cv=none; d=zohomail.com; s=zohoarc; b=ktPtQfbQSVqkIt20fqbFpc9zZSr4O6BfYNm0f6Tdyb78My/UB2Rn2QZQJN9fxgBTE7eP6INGLjVmWefsE030Uxim5oTdrIxals+f0j7gEZ6fnsaxaWx2hQYd7jVWSh6Oh3VlfZG/S68xs2QU/QQXIP5tPHkcJL6RlrVUgAHk+dE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725972069; 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=Ml1r1n6NPK0zJab7LZ/SZK7JH5cfPmS5xxctirOPnCI=; b=Ov8OJMx1NBCRAj1HEbdptCpz9psWMWG2UwQpKM8Y/6E/JbEEEXoLx9wRLCZVdsChByFDSdlu9CkOHvIw+EWLjtISatTSEM/WqbA/hjrWJ9cSz3ap+yjI47u+eYxl9dN7znxBqkBs8B9lLOWQcCugQDldAQAPtdCfkBt8B9uuWHc= 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 1725972069938957.6520672260792; Tue, 10 Sep 2024 05:41:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1so08d-0005ZO-DB; Tue, 10 Sep 2024 08:38:31 -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 1so08X-0004kU-96 for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:38:25 -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 1so08S-0005CC-Ln for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:38:24 -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-247-_3f_rzHFOFu1uk_2fs5plg-1; Tue, 10 Sep 2024 08:38:13 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 068EE1944D24; Tue, 10 Sep 2024 12:38:12 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.120]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1C38719560AB; Tue, 10 Sep 2024 12:38:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725971895; 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=Ml1r1n6NPK0zJab7LZ/SZK7JH5cfPmS5xxctirOPnCI=; b=CWjsHIeMiBClwsCcdrIyfRf1pV0Xo3gW0cCtXlwzsDV6J4mzYCUIkbCKTMcyw3IqmEuoM0 4bJjdKutSlpqdChuObA6yTwPOxInx0Pgo22+EzIRaFo5VNcCBowDzWaV7tIm/6E7g4RDNv D/BxlnrtVx37QJo1SglTvyhmFzRbzk4= X-MC-Unique: _3f_rzHFOFu1uk_2fs5plg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 18/22] tests/functional: Convert the Alpha Clipper Avocado test Date: Tue, 10 Sep 2024 14:37:19 +0200 Message-ID: <20240910123726.182975-19-thuth@redhat.com> In-Reply-To: <20240910123726.182975-1-thuth@redhat.com> References: <20240910123726.182975-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.12 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.145, 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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1725972071380116600 Straight forward conversion, just switch to SHA256 hashsum now. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240906180549.792832-13-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/avocado/boot_linux_console.py | 21 -------------- tests/functional/meson.build | 4 +++ tests/functional/test_alpha_clipper.py | 38 ++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 21 deletions(-) create mode 100755 tests/functional/test_alpha_clipper.py diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux= _console.py index a8eac44d9f..75aab90320 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -882,27 +882,6 @@ def test_arm_orangepi_uboot_netbsd9(self): # Wait for user-space wait_for_console_pattern(self, 'Starting root file system check') =20 - def test_alpha_clipper(self): - """ - :avocado: tags=3Darch:alpha - :avocado: tags=3Dmachine:clipper - """ - kernel_url =3D ('http://archive.debian.org/debian/dists/lenny/main= /' - 'installer-alpha/20090123lenny10/images/cdrom/vmlinu= z') - kernel_hash =3D '3a943149335529e2ed3e74d0d787b85fb5671ba3' - kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) - - uncompressed_kernel =3D archive.uncompress(kernel_path, self.workd= ir) - - self.vm.set_console() - kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE + 'console= =3DttyS0' - self.vm.add_args('-nodefaults', - '-kernel', uncompressed_kernel, - '-append', kernel_command_line) - self.vm.launch() - console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) - def do_test_advcal_2018(self, day, tar_hash, kernel_name, console=3D0): tar_url =3D ('https://qemu-advcal.gitlab.io' '/qac-best-of-multiarch/download/day' + day + '.tar.xz') diff --git a/tests/functional/meson.build b/tests/functional/meson.build index a79083b0f9..e1903132a1 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -41,6 +41,10 @@ tests_aarch64_system_thorough =3D [ 'aarch64_virt', ] =20 +tests_alpha_system_thorough =3D [ + 'alpha_clipper', +] + tests_arm_system_thorough =3D [ 'arm_canona1100', 'arm_integratorcp', diff --git a/tests/functional/test_alpha_clipper.py b/tests/functional/test= _alpha_clipper.py new file mode 100755 index 0000000000..c1fbf0e395 --- /dev/null +++ b/tests/functional/test_alpha_clipper.py @@ -0,0 +1,38 @@ +#!/usr/bin/env python3 +# +# Functional test that boots a Linux kernel on an Alpha Clipper machine +# and checks the console +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os + +from qemu_test import LinuxKernelTest, Asset +from qemu_test.utils import gzip_uncompress + + +class AlphaClipperTest(LinuxKernelTest): + + ASSET_KERNEL =3D Asset( + ('http://archive.debian.org/debian/dists/lenny/main/' + 'installer-alpha/20090123lenny10/images/cdrom/vmlinuz'), + '34f53da3fa32212e4f00b03cb944b2ad81c06bc8faaf9b7193b2e544ceeca576') + + def test_alpha_clipper(self): + self.set_machine('clipper') + kernel_path =3D self.ASSET_KERNEL.fetch() + + uncompressed_kernel =3D os.path.join(self.workdir, 'vmlinux') + gzip_uncompress(kernel_path, uncompressed_kernel) + + self.vm.set_console() + kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE + 'console= =3DttyS0' + self.vm.add_args('-nodefaults', + '-kernel', uncompressed_kernel, + '-append', kernel_command_line) + self.vm.launch() + console_pattern =3D 'Kernel command line: %s' % kernel_command_line + self.wait_for_console_pattern(console_pattern) + +if __name__ =3D=3D '__main__': + LinuxKernelTest.main() --=20 2.46.0