From nobody Sat Nov 23 20:37:04 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=1730802976; cv=none; d=zohomail.com; s=zohoarc; b=DStIRkk1uBF6nGMvH5b5bkyJQg1DAq7x/5DcP24tZ+K4L0bvxdGxCOTCBFOLPrF6wOzYMz4VSUnz0pPofChljvtr0aaNkW4DkL7gIQG/HG4w6U8jdF7c95aRKt8gOmibjvpczUsQVq9Jj9g71tmx5lDKHL6o9fIaljQfpXcb3rU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730802976; 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=3IjeZHhgrukS63bYFX7rOh2OPgHJRvVOn6pFVT1F1jY=; b=OOzh8+yV90aBOzUtvilN26Sf1c0zTGK33pXla5vo4Kmb5lvcrGB8QBkh/upY0S/QceYWqEbE8CxglyO814BnvNqEBjPu6FU139blCXEgrFlMWO32+tluyUUBTThWQGT9trtuB7d8phcBGryNPux4EuT5x68B3Vy6hCB5QA18VHA= 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 1730802976456464.8331168029881; Tue, 5 Nov 2024 02:36:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8GuY-00083v-NK; Tue, 05 Nov 2024 05:35:48 -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 1t8GuR-00082p-IS for qemu-devel@nongnu.org; Tue, 05 Nov 2024 05:35:40 -0500 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 1t8GuO-0002iH-Cb for qemu-devel@nongnu.org; Tue, 05 Nov 2024 05:35:38 -0500 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-649-usqQ-EoTOiOuLN6PFGJarA-1; Tue, 05 Nov 2024 05:35:29 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 5D28919560A2; Tue, 5 Nov 2024 10:35:26 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.117]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D78FD195607C; Tue, 5 Nov 2024 10:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730802933; 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=3IjeZHhgrukS63bYFX7rOh2OPgHJRvVOn6pFVT1F1jY=; b=L1r5XGZSVtp2G2j51Dqc4Xqh9JefdtU5c+xaoTbQU2+Hok2FkkqaRDHTM4N+kJsl0QGupQ KINvyYrjYTve5V6NMJlo5xMm487rRLPARXy8B3DZy5kY9QWii5en2lDBaS+CzYPLzW2DkI FTENsUDnEZX2X162qoUtLnEKmMFdtU8= X-MC-Unique: usqQ-EoTOiOuLN6PFGJarA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Alistair Francis Cc: qemu-riscv@nongnu.org, Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Palmer Dabbelt Subject: [PATCH] tests/functional: Convert the RV32-on-RV64 riscv test Date: Tue, 5 Nov 2024 11:35:19 +0100 Message-ID: <20241105103519.341304-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, 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: 1730802978434116600 Content-Type: text/plain; charset="utf-8" A straggler that has been added to the Avocado framework while the conversion to the functional framework was already in progress... Move it over now, too! Signed-off-by: Thomas Huth Reviewed-by: Alistair Francis Reviewed-by: LIU Zhiwei --- tests/avocado/tuxrun_baselines.py | 16 ---------------- tests/functional/test_riscv64_tuxrun.py | 13 +++++++++++++ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_basel= ines.py index 366c262e32..38064840da 100644 --- a/tests/avocado/tuxrun_baselines.py +++ b/tests/avocado/tuxrun_baselines.py @@ -222,19 +222,3 @@ def test_arm64be(self): "rootfs.ext4.zst" : "e6ffd8813c8a335bc15728f2835f90539c84be7f8f5f691a8b01451b= 47fb4bd7"} self.common_tuxrun(csums=3Dsums) - - def test_riscv64_rv32(self): - """ - :avocado: tags=3Darch:riscv64 - :avocado: tags=3Dmachine:virt - :avocado: tags=3Dtuxboot:riscv32 - :avocado: tags=3Dcpu:rv32 - """ - sums =3D { "Image" : - "89599407d7334de629a40e7ad6503c73670359eb5f5ae9d686353a3d= 6deccbd5", - "fw_jump.elf" : - "f2ef28a0b77826f79d085d3e4aa686f1159b315eff9099a37046b189= 36676985", - "rootfs.ext4.zst" : - "7168d296d0283238ea73cd5a775b3dd608e55e04c7b92b76ecce31bb= 13108cba" } - - self.common_tuxrun(csums=3Dsums) diff --git a/tests/functional/test_riscv64_tuxrun.py b/tests/functional/tes= t_riscv64_tuxrun.py index 13501628f9..4e2449539c 100755 --- a/tests/functional/test_riscv64_tuxrun.py +++ b/tests/functional/test_riscv64_tuxrun.py @@ -23,6 +23,13 @@ class TuxRunRiscV64Test(TuxRunBaselineTest): 'https://storage.tuxboot.com/20230331/riscv64/rootfs.ext4.zst', 'b18e3a3bdf27be03da0b285e84cb71bf09eca071c3a087b42884b6982ed679eb') =20 + ASSET_RISCV32_KERNEL =3D Asset( + 'https://storage.tuxboot.com/20230331/riscv32/Image', + '89599407d7334de629a40e7ad6503c73670359eb5f5ae9d686353a3d6deccbd5') + ASSET_RISCV32_ROOTFS =3D Asset( + 'https://storage.tuxboot.com/20230331/riscv32/rootfs.ext4.zst', + '7168d296d0283238ea73cd5a775b3dd608e55e04c7b92b76ecce31bb13108cba') + def test_riscv64(self): self.set_machine('virt') self.common_tuxrun(kernel_asset=3Dself.ASSET_RISCV64_KERNEL, @@ -34,5 +41,11 @@ def test_riscv64_maxcpu(self): self.common_tuxrun(kernel_asset=3Dself.ASSET_RISCV64_KERNEL, rootfs_asset=3Dself.ASSET_RISCV64_ROOTFS) =20 + def test_riscv64_rv32(self): + self.set_machine('virt') + self.cpu=3D'rv32' + self.common_tuxrun(kernel_asset=3Dself.ASSET_RISCV32_KERNEL, + rootfs_asset=3Dself.ASSET_RISCV32_ROOTFS) + if __name__ =3D=3D '__main__': TuxRunBaselineTest.main() --=20 2.47.0