From nobody Sat Nov 23 20:18:07 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=1730397074; cv=none; d=zohomail.com; s=zohoarc; b=fQT3tZ0tzwby1AVwNxISMz4gPQ4chSA1eO+PVc7Dqh6EtgBhbU5hcPyMfgjJf2KELaHKCimeq7TXvs/PYxmDhUwaPo9K1OK/QdkLLmLnQ1FqaX1/0G/g7w456ZndGRpxc1F5+YRlfRBuyN7S6oe17v3UtYdyMlYVPRkTm3Avp6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730397074; 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=8jL5yKJY1VyyrsQYerQAIVSub+1TTr2ElJYKvljMJ6A=; b=dhHz1gRIYfiawHTwqfvKRIbPZvkS2yaMDqjKJSj+ThgFoTR8kCVlSvuHiG72Shx2jePuwTJ7Fv+7unweqkYj/V2eZH954vARxbMQiSw+PQkWjWOF0l31OJx+b2CSpedv+xvWOe8T6rU8jPE23yL54cWgmupq3d40Sft+hiVwrvk= 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 1730397074074749.5018034934392; Thu, 31 Oct 2024 10:51:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6ZIW-00071o-MZ; Thu, 31 Oct 2024 13:49: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 1t6ZIJ-0006x2-JS for qemu-devel@nongnu.org; Thu, 31 Oct 2024 13:49:16 -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 1t6ZIH-0006cA-Kq for qemu-devel@nongnu.org; Thu, 31 Oct 2024 13:49:15 -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-571-C7vDoFNAMwOrIfe_Ii98YQ-1; Thu, 31 Oct 2024 13:49:11 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 495E21955F41; Thu, 31 Oct 2024 17:49:10 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.53]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 72DBE300018D; Thu, 31 Oct 2024 17:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730396952; 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=8jL5yKJY1VyyrsQYerQAIVSub+1TTr2ElJYKvljMJ6A=; b=aIUxEgIh7OnYMjL9TSj6vVBl39aNjdSnVh0mjPVYYlp7mJWKMI8i3z/lNKX1cwhvHuA+j5 PgXOVjdksSHFG01rfwF6WS1q2zILzG5IItHp2HQ3aqU/72BOD2EIu52fp7zLH9EwbRnci5 2f30IKqLb4imrwVzzdd/NV4SxZp1TVw= X-MC-Unique: C7vDoFNAMwOrIfe_Ii98YQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 11/14] tests/functional: Convert the tcg_plugins test Date: Thu, 31 Oct 2024 18:48:29 +0100 Message-ID: <20241031174832.6574-12-thuth@redhat.com> In-Reply-To: <20241031174832.6574-1-thuth@redhat.com> References: <20241031174832.6574-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.366, 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: 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: 1730397074417116600 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). Message-ID: <20241023051754.813412-1-thuth@redhat.com> 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 f48d9142b8..6fa4d89ca1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3717,7 +3717,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