From nobody Sat Nov 23 18:50:18 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=1729660760; cv=none; d=zohomail.com; s=zohoarc; b=PdKgW5BDuHdvYTAJ2JadVoSIyZgwSDPlUgSUQ/EwuVTPn1M/301KUtOcJwfQutsyA8oGkf/H22B41CmFHNyue3rZQ9La6RqbzhcEhgC++ilq71RJQqGjinmrj3COPHEyE8C2jqV/v9LkOkPdMyb+inbRXJpLj0btz9EMmDD120A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729660760; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tFfRyhkIyZoadExmEh7v3ltcHOjFFFy96Lccf4CQTWs=; b=bbwHjg2qWzPU1yDNR9WDhadOL1PjziYwoRbzplemoIHYRrOU5yvicCP3fyfm4cepP4G7Ehm05chlNl0oib+FQuPi1ffsH3cdPsT6y2sAx2Jrzli8wk//FUhpPpXbt5T5Bq2R4AbXDsT9X5/kpoVSev6uV11LT4c804B65UAREkc= 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 1729660760281165.34918864183192; Tue, 22 Oct 2024 22:19:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3Tl9-0005ZL-4p; Wed, 23 Oct 2024 01:18: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 1t3Tl6-0005ZD-V3 for qemu-devel@nongnu.org; Wed, 23 Oct 2024 01:18:12 -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 1t3Tl3-0001f1-RY for qemu-devel@nongnu.org; Wed, 23 Oct 2024 01:18:12 -0400 Received: from mx-prod-mc-05.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-115-PHS7uIfFPPeVQjWbmXurtg-1; Wed, 23 Oct 2024 01:18:03 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1FE321956088; Wed, 23 Oct 2024 05:18:01 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.43]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 25DD21956046; Wed, 23 Oct 2024 05:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729660687; 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; bh=tFfRyhkIyZoadExmEh7v3ltcHOjFFFy96Lccf4CQTWs=; b=SeysRFuLqeoJVq9hrb3qMC4niCBWJypzZ7c7XPeJALRZER4IJy+vcnBP7F3WI4N0cKaoat WgIO7VNgIZN9xaj7m638dSoaa8Dq6BQGiwrnER7QmRmjnl4suhJK1sd3/dG+e1bNuPNGiQ kHO70j56yNIQBu5IMt68zrCtJ/CE3TQ= X-MC-Unique: PHS7uIfFPPeVQjWbmXurtg-1 From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Cc: Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier Subject: [PATCH] tests/functional: Convert the tcg_plugins test Date: Wed, 23 Oct 2024 07:17:54 +0200 Message-ID: <20241023051754.813412-1-thuth@redhat.com> MIME-Version: 1.0 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: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.519, 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.697, 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: 1729660762974116600 Content-Type: text/plain; charset="utf-8" A straight forward conversion, only the usual changes were required here (i.e. adjustment for asset downloading, machine selection). Signed-off-by: Thomas Huth --- MAINTAINERS | 2 +- .../test_aarch64_tcg_plugins.py} | 37 ++++++++----------- 2 files changed, 16 insertions(+), 23 deletions(-) rename tests/{avocado/tcg_plugins.py =3D> functional/test_aarch64_tcg_plug= ins.py} (78%) mode change 100644 =3D> 100755 diff --git a/MAINTAINERS b/MAINTAINERS index ad59e67d67..5115199f42 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3716,7 +3716,7 @@ S: Maintained F: docs/devel/tcg-plugins.rst F: plugins/ F: tests/tcg/plugins/ -F: tests/avocado/tcg_plugins.py +F: tests/functional/test_aarch64_tcg_plugins.py F: contrib/plugins/ =20 AArch64 TCG target diff --git a/tests/avocado/tcg_plugins.py b/tests/functional/test_aarch64_t= cg_plugins.py old mode 100644 new mode 100755 similarity index 78% rename from tests/avocado/tcg_plugins.py rename to tests/functional/test_aarch64_tcg_plugins.py index a6ff457e27..01660eb090 --- a/tests/avocado/tcg_plugins.py +++ b/tests/functional/test_aarch64_tcg_plugins.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 +# # TCG Plugins tests # # These are a little more involved than the basic tests run by check-tcg. @@ -13,7 +15,7 @@ import mmap import re =20 -from boot_linux_console import LinuxKernelTest +from qemu_test import LinuxKernelTest, Asset =20 =20 class PluginKernelBase(LinuxKernelTest): @@ -53,22 +55,14 @@ def run_vm(self, kernel_path, kernel_command_line, =20 class PluginKernelNormal(PluginKernelBase): =20 - def _grab_aarch64_kernel(self): - kernel_url =3D ('https://storage.tuxboot.com/20230331/arm64/Image') - kernel_sha256 =3D 'ce95a7101a5fecebe0fe630deee6bd97b32ba41bc875409= 0e9ad8961ea8674c7' - kernel_path =3D self.fetch_asset(kernel_url, - asset_hash=3Dkernel_sha256, - algorithm =3D "sha256") - return kernel_path + ASSET_KERNEL =3D Asset( + ('https://storage.tuxboot.com/20230331/arm64/Image'), + 'ce95a7101a5fecebe0fe630deee6bd97b32ba41bc8754090e9ad8961ea8674c7') =20 def test_aarch64_virt_insn(self): - """ - :avocado: tags=3Daccel:tcg - :avocado: tags=3Darch:aarch64 - :avocado: tags=3Dmachine:virt - :avocado: tags=3Dcpu:cortex-a53 - """ - kernel_path =3D self._grab_aarch64_kernel() + self.set_machine('virt') + self.cpu=3D'cortex-a53' + kernel_path =3D self.ASSET_KERNEL.fetch() kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + 'console=3DttyAMA0') console_pattern =3D 'Kernel panic - not syncing: VFS:' @@ -92,13 +86,9 @@ def test_aarch64_virt_insn(self): =20 =20 def test_aarch64_virt_insn_icount(self): - """ - :avocado: tags=3Daccel:tcg - :avocado: tags=3Darch:aarch64 - :avocado: tags=3Dmachine:virt - :avocado: tags=3Dcpu:cortex-a53 - """ - kernel_path =3D self._grab_aarch64_kernel() + self.set_machine('virt') + self.cpu=3D'cortex-a53' + kernel_path =3D self.ASSET_KERNEL.fetch() kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + 'console=3DttyAMA0') console_pattern =3D 'Kernel panic - not syncing: VFS:' @@ -120,3 +110,6 @@ def test_aarch64_virt_insn_icount(self): else: count =3D int(m.group("count")) self.log.info(f"Counted: {count} instructions") + +if __name__ =3D=3D '__main__': + LinuxKernelTest.main() --=20 2.47.0