From nobody Sat Nov 15 08:35:00 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1754065498; cv=none; d=zohomail.com; s=zohoarc; b=YYAyNDV2fvoDhNxjngH9FO3xe7PrDW2NFGSxZoRuOy4vXSq+VCRDb2aGPbuqf+qlrGsEk1Hk/Gf5q+FBz53GOLpxKbQ3aIHIeerfMxd7StVxBKtK5jQmKuXe8kP0g4pgS66DwQyo0N/g5IYvpH8270HZigyKqkVxKe4SFPxSrzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065498; 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=zOsXLkgQwvhCL0FcIEPwutsM9p8/52O1BwSSCAb0Msk=; b=OJ+J66TVo4jd7PeKwZ7V/x4er+LTIi3kelNJvVmeHg0DAljKtJnX5+iC+l/YxOXsJFsEzcCfzFTiqAYJs0KLCpZ2ofup/9W6mV7DBLD/vSbEV61RUC/0OwwpachlE6uYTJ4DmRBKburIkEJ48HPVe0NGbuN0j/zs7ohxnfxsQ70= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754065498467409.803700769642; Fri, 1 Aug 2025 09:24:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsYp-0005r3-99; Fri, 01 Aug 2025 12:24:47 -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 1uhrSJ-0005FO-F0 for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:59 -0400 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 1uhrSH-0002lI-PE for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:59 -0400 Received: from mx-prod-mc-03.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-338-3HEg6e0NOKajPoxoK02g1Q-1; Fri, 01 Aug 2025 11:13:53 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 768161956046; Fri, 1 Aug 2025 15:13:52 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.225.137]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 107801800B7F; Fri, 1 Aug 2025 15:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061237; 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=zOsXLkgQwvhCL0FcIEPwutsM9p8/52O1BwSSCAb0Msk=; b=YBxpTSVFR7I4V0gybgKR+WeylEnMqwdaU5vDTDwmPlaz1It6k/0O0BF5Bmq5A8+Xh83vro Xj/vFK1fFty/qGDYduHGuArpWFJQV4IVH5lpRZEO833uKTgzqVGrAyt4nHAKsUn825HgBu tlKsmiP0VKNGEPott4XCXvWwkiwToAE= X-MC-Unique: 3HEg6e0NOKajPoxoK02g1Q-1 X-Mimecast-MFC-AGG-ID: 3HEg6e0NOKajPoxoK02g1Q_1754061232 From: Thomas Huth To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Manos Pitsidianakis , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH 17/24] tests/functional: Move riscv32/riscv64 tests into target-specific folders Date: Fri, 1 Aug 2025 17:12:42 +0200 Message-ID: <20250801151251.751368-18-thuth@redhat.com> In-Reply-To: <20250801151251.751368-1-thuth@redhat.com> References: <20250801151251.751368-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1754065499215116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The opensbi test is used for both, riscv32 and riscv64. Copy the main test to the riscv64 folder and add a simple wrapper to the riscv32 folder to be able to run it for that target, too. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 3 ++- tests/functional/meson.build | 24 ++----------------- tests/functional/riscv32/meson.build | 10 ++++++++ .../test_migration.py} | 0 tests/functional/riscv32/test_opensbi.py | 10 ++++++++ .../test_tuxrun.py} | 0 tests/functional/riscv64/meson.build | 14 +++++++++++ .../test_migration.py} | 0 .../test_opensbi.py} | 0 .../test_tuxrun.py} | 0 10 files changed, 38 insertions(+), 23 deletions(-) create mode 100644 tests/functional/riscv32/meson.build rename tests/functional/{test_riscv32_migration.py =3D> riscv32/test_migra= tion.py} (100%) create mode 100755 tests/functional/riscv32/test_opensbi.py rename tests/functional/{test_riscv32_tuxrun.py =3D> riscv32/test_tuxrun.p= y} (100%) create mode 100644 tests/functional/riscv64/meson.build rename tests/functional/{test_riscv64_migration.py =3D> riscv64/test_migra= tion.py} (100%) rename tests/functional/{test_riscv_opensbi.py =3D> riscv64/test_opensbi.p= y} (100%) rename tests/functional/{test_riscv64_tuxrun.py =3D> riscv64/test_tuxrun.p= y} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 09e31ca1af8..ee26bb82b58 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -331,7 +331,8 @@ F: include/hw/riscv/ F: linux-user/host/riscv32/ F: linux-user/host/riscv64/ F: common-user/host/riscv* -F: tests/functional/test_riscv* +F: tests/functional/riscv32 +F: tests/functional/riscv64 F: tests/tcg/riscv64/ =20 RISC-V XThead* extensions diff --git a/tests/functional/meson.build b/tests/functional/meson.build index cc0e0bc6e0c..2d8f67fd94f 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -26,10 +26,8 @@ subdir('mips64el') subdir('or1k') subdir('ppc') subdir('ppc64') - -test_riscv64_timeouts =3D { - 'riscv64_tuxrun' : 120, -} +subdir('riscv32') +subdir('riscv64') =20 test_s390x_timeouts =3D { 's390x_ccw_virtio' : 420, @@ -60,24 +58,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_riscv32_system_quick =3D [ - 'riscv32_migration', - 'riscv_opensbi', -] - -tests_riscv32_system_thorough =3D [ - 'riscv32_tuxrun', -] - -tests_riscv64_system_quick =3D [ - 'riscv64_migration', - 'riscv_opensbi', -] - -tests_riscv64_system_thorough =3D [ - 'riscv64_tuxrun', -] - tests_rx_system_thorough =3D [ 'rx_gdbsim', ] diff --git a/tests/functional/riscv32/meson.build b/tests/functional/riscv3= 2/meson.build new file mode 100644 index 00000000000..f3ebbb8db5d --- /dev/null +++ b/tests/functional/riscv32/meson.build @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_riscv32_system_quick =3D [ + 'migration', + 'opensbi', +] + +tests_riscv32_system_thorough =3D [ + 'tuxrun', +] diff --git a/tests/functional/test_riscv32_migration.py b/tests/functional/= riscv32/test_migration.py similarity index 100% rename from tests/functional/test_riscv32_migration.py rename to tests/functional/riscv32/test_migration.py diff --git a/tests/functional/riscv32/test_opensbi.py b/tests/functional/ri= scv32/test_opensbi.py new file mode 100755 index 00000000000..d1ac706f0bb --- /dev/null +++ b/tests/functional/riscv32/test_opensbi.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Reuse the 64-bit OpenSBI test for RISC-V 32-bit machines + +from riscv64.test_opensbi import RiscvOpenSBI + +if __name__ =3D=3D '__main__': + RiscvOpenSBI.main() diff --git a/tests/functional/test_riscv32_tuxrun.py b/tests/functional/ris= cv32/test_tuxrun.py similarity index 100% rename from tests/functional/test_riscv32_tuxrun.py rename to tests/functional/riscv32/test_tuxrun.py diff --git a/tests/functional/riscv64/meson.build b/tests/functional/riscv6= 4/meson.build new file mode 100644 index 00000000000..2bdd6b408e8 --- /dev/null +++ b/tests/functional/riscv64/meson.build @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_riscv64_timeouts =3D { + 'tuxrun' : 120, +} + +tests_riscv64_system_quick =3D [ + 'migration', + 'opensbi', +] + +tests_riscv64_system_thorough =3D [ + 'tuxrun', +] diff --git a/tests/functional/test_riscv64_migration.py b/tests/functional/= riscv64/test_migration.py similarity index 100% rename from tests/functional/test_riscv64_migration.py rename to tests/functional/riscv64/test_migration.py diff --git a/tests/functional/test_riscv_opensbi.py b/tests/functional/risc= v64/test_opensbi.py similarity index 100% rename from tests/functional/test_riscv_opensbi.py rename to tests/functional/riscv64/test_opensbi.py diff --git a/tests/functional/test_riscv64_tuxrun.py b/tests/functional/ris= cv64/test_tuxrun.py similarity index 100% rename from tests/functional/test_riscv64_tuxrun.py rename to tests/functional/riscv64/test_tuxrun.py --=20 2.50.1