From nobody Sat Nov 15 06:33:15 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=1754065190; cv=none; d=zohomail.com; s=zohoarc; b=ZUycd88c5PhyAfHWOdnAGQjgBUPgiBv3O8NZI0K9fEOihfHSxqv95EOT9i0K18JqwJ1tSyZuZHdeYZwdMY1y3nZQQEz/O5g02zOVwUJ7Lx6PDwC5qZ+ft/2q/UhxFeKq/7eRHZVZykcLcFnLZ501C7h4PaMDlaHL0iay0BEDVPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065190; 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=M2PPIqaARayPULG75VltuiTlFhnXiX7YEcOqTi5HXsE=; b=IGHpoJ6IO1JuDPvVoA+qQShnjZaVhztUDNUW0A3fDmDUg8pffYlf7Q0qXJ7+GpfcFWFsNo9CWG/Jc40/Smguzt1p2Dko9DGt0I9tl/UZx6VfhgH6PEwzyVlO3Z0I/5zMP7nGa7OAxRDPwGKcWpypcD4B2MwUghtE4k+ZEfhmoqU= 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 175406519068088.6028857135916; Fri, 1 Aug 2025 09:19:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsT0-0007Wj-4V; Fri, 01 Aug 2025 12:18:46 -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 1uhrRS-0000gP-Tw for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:14 -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 1uhrRP-0002bo-ES for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:06 -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-224-gv5Ni3mUM52Kp2ff4ph5zg-1; Fri, 01 Aug 2025 11:13:01 -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 3991E19773EB; Fri, 1 Aug 2025 15:13:00 +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 8BBC81800B4F; Fri, 1 Aug 2025 15:12:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061182; 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=M2PPIqaARayPULG75VltuiTlFhnXiX7YEcOqTi5HXsE=; b=i57n5yrboeo5qutMZzkp35sNptKhKu//6X/oXXMAkouagewiPAdY79eQQpPyNkH+b6POvl yBh1Cf23WNkInKb7w6jbl8rqRcwDABIrhWBZnkXxS0HRBPTTTVQ4kUUTmDqZjCEMXeHRG7 20200Pyf02mLf3YidI5XieO9IxOfNKw= X-MC-Unique: gv5Ni3mUM52Kp2ff4ph5zg-1 X-Mimecast-MFC-AGG-ID: gv5Ni3mUM52Kp2ff4ph5zg_1754061180 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 01/24] tests/functional: Rework the migration test to have target-specific files Date: Fri, 1 Aug 2025 17:12:26 +0200 Message-ID: <20250801151251.751368-2-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: 1754065193393116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth We are going to move the tests for each target into separate subdirectories. The migration test does not fit quite into this scheme, since it works for multiple targets, but not all. Rework the test to have a common test class, and target specific files with a target specific class, so that this will fit better into the new scheme. Signed-off-by: Thomas Huth Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- tests/functional/meson.build | 22 ++++++------ .../{test_migration.py =3D> migration.py} | 35 +++++-------------- tests/functional/test_aarch64_migration.py | 26 ++++++++++++++ tests/functional/test_alpha_migration.py | 26 ++++++++++++++ tests/functional/test_arm_migration.py | 26 ++++++++++++++ tests/functional/test_i386_migration.py | 26 ++++++++++++++ tests/functional/test_ppc64_migration.py | 26 ++++++++++++++ tests/functional/test_ppc_migration.py | 26 ++++++++++++++ tests/functional/test_riscv32_migration.py | 26 ++++++++++++++ tests/functional/test_riscv64_migration.py | 26 ++++++++++++++ tests/functional/test_sparc64_migration.py | 26 ++++++++++++++ tests/functional/test_sparc_migration.py | 26 ++++++++++++++ tests/functional/test_x86_64_migration.py | 26 ++++++++++++++ 14 files changed, 306 insertions(+), 39 deletions(-) rename tests/functional/{test_migration.py =3D> migration.py} (74%) mode change 100755 =3D> 100644 create mode 100755 tests/functional/test_aarch64_migration.py create mode 100755 tests/functional/test_alpha_migration.py create mode 100755 tests/functional/test_arm_migration.py create mode 100755 tests/functional/test_i386_migration.py create mode 100755 tests/functional/test_ppc64_migration.py create mode 100755 tests/functional/test_ppc_migration.py create mode 100755 tests/functional/test_riscv32_migration.py create mode 100755 tests/functional/test_riscv64_migration.py create mode 100755 tests/functional/test_sparc64_migration.py create mode 100755 tests/functional/test_sparc_migration.py create mode 100755 tests/functional/test_x86_64_migration.py diff --git a/MAINTAINERS b/MAINTAINERS index 069d77f2f80..97f491b083c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3595,7 +3595,7 @@ F: include/migration/ F: include/qemu/userfaultfd.h F: migration/ F: scripts/vmstate-static-checker.py -F: tests/functional/test_migration.py +F: tests/functional/*migration.py F: tests/vmstate-static-checker-data/ F: tests/qtest/migration/ F: tests/qtest/migration-* diff --git a/tests/functional/meson.build b/tests/functional/meson.build index ecf965adc6c..5fb13928b9e 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -80,7 +80,7 @@ tests_generic_bsduser =3D [ ] =20 tests_aarch64_system_quick =3D [ - 'migration', + 'aarch64_migration', ] =20 tests_aarch64_system_thorough =3D [ @@ -110,7 +110,7 @@ tests_aarch64_system_thorough =3D [ ] =20 tests_alpha_system_quick =3D [ - 'migration', + 'alpha_migration', ] =20 tests_alpha_system_thorough =3D [ @@ -119,7 +119,7 @@ tests_alpha_system_thorough =3D [ ] =20 tests_arm_system_quick =3D [ - 'migration', + 'arm_migration', ] =20 tests_arm_system_thorough =3D [ @@ -168,7 +168,7 @@ tests_hppa_system_quick =3D [ ] =20 tests_i386_system_quick =3D [ - 'migration', + 'i386_migration', ] =20 tests_i386_system_thorough =3D [ @@ -228,7 +228,7 @@ tests_or1k_system_thorough =3D [ ] =20 tests_ppc_system_quick =3D [ - 'migration', + 'ppc_migration', 'ppc_74xx', ] =20 @@ -245,7 +245,7 @@ tests_ppc_system_thorough =3D [ ] =20 tests_ppc64_system_quick =3D [ - 'migration', + 'ppc64_migration', ] =20 tests_ppc64_system_thorough =3D [ @@ -260,7 +260,7 @@ tests_ppc64_system_thorough =3D [ ] =20 tests_riscv32_system_quick =3D [ - 'migration', + 'riscv32_migration', 'riscv_opensbi', ] =20 @@ -269,7 +269,7 @@ tests_riscv32_system_thorough =3D [ ] =20 tests_riscv64_system_quick =3D [ - 'migration', + 'riscv64_migration', 'riscv_opensbi', ] =20 @@ -299,7 +299,7 @@ tests_sh4eb_system_thorough =3D [ ] =20 tests_sparc_system_quick =3D [ - 'migration', + 'sparc_migration', ] =20 tests_sparc_system_thorough =3D [ @@ -308,7 +308,7 @@ tests_sparc_system_thorough =3D [ ] =20 tests_sparc64_system_quick =3D [ - 'migration', + 'sparc64_migration', ] =20 tests_sparc64_system_thorough =3D [ @@ -319,7 +319,7 @@ tests_sparc64_system_thorough =3D [ tests_x86_64_system_quick =3D [ 'cpu_queries', 'mem_addr_space', - 'migration', + 'x86_64_migration', 'pc_cpu_hotplug_props', 'virtio_version', 'x86_cpu_model_versions', diff --git a/tests/functional/test_migration.py b/tests/functional/migratio= n.py old mode 100755 new mode 100644 similarity index 74% rename from tests/functional/test_migration.py rename to tests/functional/migration.py index c4393c35434..07395544832 --- a/tests/functional/test_migration.py +++ b/tests/functional/migration.py @@ -1,6 +1,6 @@ -#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later # -# Migration test +# Migration test base class # # Copyright (c) 2019 Red Hat, Inc. # @@ -14,7 +14,7 @@ import tempfile import time =20 -from qemu_test import QemuSystemTest, skipIfMissingCommands +from qemu_test import QemuSystemTest, which from qemu_test.ports import Ports =20 =20 @@ -41,24 +41,7 @@ def assert_migration(self, src_vm, dst_vm): self.assertEqual(dst_vm.cmd('query-status')['status'], 'running') self.assertEqual(src_vm.cmd('query-status')['status'],'postmigrate= ') =20 - def select_machine(self): - target_machine =3D { - 'aarch64': 'quanta-gsj', - 'alpha': 'clipper', - 'arm': 'npcm750-evb', - 'i386': 'isapc', - 'ppc': 'sam460ex', - 'ppc64': 'mac99', - 'riscv32': 'spike', - 'riscv64': 'virt', - 'sparc': 'SS-4', - 'sparc64': 'sun4u', - 'x86_64': 'microvm', - } - self.set_machine(target_machine[self.arch]) - def do_migrate(self, dest_uri, src_uri=3DNone): - self.select_machine() dest_vm =3D self.get_vm('-incoming', dest_uri, name=3D"dest-qemu") dest_vm.add_args('-nodefaults') dest_vm.launch() @@ -76,23 +59,21 @@ def _get_free_port(self, ports): self.skipTest('Failed to find a free port') return port =20 - def test_migration_with_tcp_localhost(self): + def migration_with_tcp_localhost(self): with Ports() as ports: dest_uri =3D 'tcp:localhost:%u' % self._get_free_port(ports) self.do_migrate(dest_uri) =20 - def test_migration_with_unix(self): + def migration_with_unix(self): with tempfile.TemporaryDirectory(prefix=3D'socket_') as socket_pat= h: dest_uri =3D 'unix:%s/qemu-test.sock' % socket_path self.do_migrate(dest_uri) =20 - @skipIfMissingCommands('ncat') - def test_migration_with_exec(self): + def migration_with_exec(self): + if not which('ncat'): + self.skipTest('ncat is not available') with Ports() as ports: free_port =3D self._get_free_port(ports) dest_uri =3D 'exec:ncat -l localhost %u' % free_port src_uri =3D 'exec:ncat localhost %u' % free_port self.do_migrate(dest_uri, src_uri) - -if __name__ =3D=3D '__main__': - QemuSystemTest.main() diff --git a/tests/functional/test_aarch64_migration.py b/tests/functional/= test_aarch64_migration.py new file mode 100755 index 00000000000..70267e756d9 --- /dev/null +++ b/tests/functional/test_aarch64_migration.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# aarch64 migration test + +from migration import MigrationTest + + +class Aarch64MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('quanta-gsj') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('quanta-gsj') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('quanta-gsj') + self.migration_with_exec() + + +if __name__ =3D=3D '__main__': + MigrationTest.main() diff --git a/tests/functional/test_alpha_migration.py b/tests/functional/te= st_alpha_migration.py new file mode 100755 index 00000000000..f11b523ec9e --- /dev/null +++ b/tests/functional/test_alpha_migration.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Alpha migration test + +from migration import MigrationTest + + +class AlphaMigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('clipper') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('clipper') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('clipper') + self.migration_with_exec() + + +if __name__ =3D=3D '__main__': + MigrationTest.main() diff --git a/tests/functional/test_arm_migration.py b/tests/functional/test= _arm_migration.py new file mode 100755 index 00000000000..0aa89f4f61a --- /dev/null +++ b/tests/functional/test_arm_migration.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# arm migration test + +from migration import MigrationTest + + +class ArmMigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('npcm750-evb') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('npcm750-evb') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('npcm750-evb') + self.migration_with_exec() + + +if __name__ =3D=3D '__main__': + MigrationTest.main() diff --git a/tests/functional/test_i386_migration.py b/tests/functional/tes= t_i386_migration.py new file mode 100755 index 00000000000..a57f3164044 --- /dev/null +++ b/tests/functional/test_i386_migration.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# i386 migration test + +from migration import MigrationTest + + +class I386MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('isapc') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('isapc') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('isapc') + self.migration_with_exec() + + +if __name__ =3D=3D '__main__': + MigrationTest.main() diff --git a/tests/functional/test_ppc64_migration.py b/tests/functional/te= st_ppc64_migration.py new file mode 100755 index 00000000000..5dfdaaf709a --- /dev/null +++ b/tests/functional/test_ppc64_migration.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# ppc migration test + +from migration import MigrationTest + + +class PpcMigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('mac99') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('mac99') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('mac99') + self.migration_with_exec() + + +if __name__ =3D=3D '__main__': + MigrationTest.main() diff --git a/tests/functional/test_ppc_migration.py b/tests/functional/test= _ppc_migration.py new file mode 100755 index 00000000000..a8692826d35 --- /dev/null +++ b/tests/functional/test_ppc_migration.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# ppc migration test + +from migration import MigrationTest + + +class PpcMigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('sam460ex') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('sam460ex') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('sam460ex') + self.migration_with_exec() + + +if __name__ =3D=3D '__main__': + MigrationTest.main() diff --git a/tests/functional/test_riscv32_migration.py b/tests/functional/= test_riscv32_migration.py new file mode 100755 index 00000000000..30acbbe69f9 --- /dev/null +++ b/tests/functional/test_riscv32_migration.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# riscv32 migration test + +from migration import MigrationTest + + +class Rv32MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('spike') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('virt') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('spike') + self.migration_with_exec() + + +if __name__ =3D=3D '__main__': + MigrationTest.main() diff --git a/tests/functional/test_riscv64_migration.py b/tests/functional/= test_riscv64_migration.py new file mode 100755 index 00000000000..2d613a29ec4 --- /dev/null +++ b/tests/functional/test_riscv64_migration.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# riscv64 migration test + +from migration import MigrationTest + + +class Rv64MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('virt') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('spike') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('virt') + self.migration_with_exec() + + +if __name__ =3D=3D '__main__': + MigrationTest.main() diff --git a/tests/functional/test_sparc64_migration.py b/tests/functional/= test_sparc64_migration.py new file mode 100755 index 00000000000..a8a6c73c354 --- /dev/null +++ b/tests/functional/test_sparc64_migration.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Sparc64 migration test + +from migration import MigrationTest + + +class Sparc64MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('sun4u') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('sun4u') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('sun4u') + self.migration_with_exec() + + +if __name__ =3D=3D '__main__': + MigrationTest.main() diff --git a/tests/functional/test_sparc_migration.py b/tests/functional/te= st_sparc_migration.py new file mode 100755 index 00000000000..dd6d5783b11 --- /dev/null +++ b/tests/functional/test_sparc_migration.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Sparc migration test + +from migration import MigrationTest + + +class SparcMigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('SS-4') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('SS-5') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('SS-4') + self.migration_with_exec() + + +if __name__ =3D=3D '__main__': + MigrationTest.main() diff --git a/tests/functional/test_x86_64_migration.py b/tests/functional/t= est_x86_64_migration.py new file mode 100755 index 00000000000..f3a517ae1f6 --- /dev/null +++ b/tests/functional/test_x86_64_migration.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# x86_64 migration test + +from migration import MigrationTest + + +class X8664MigrationTest(MigrationTest): + + def test_migration_with_tcp_localhost(self): + self.set_machine('microvm') + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.set_machine('microvm') + self.migration_with_unix() + + def test_migration_with_exec(self): + self.set_machine('microvm') + self.migration_with_exec() + + +if __name__ =3D=3D '__main__': + MigrationTest.main() --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065180; cv=none; d=zohomail.com; s=zohoarc; b=TmMBABLCcMer/qBfdlstEovMw2aR0gzao7NOAt+L0+UHjp6BhAEFpTWuXjaiiQuqGJXARzunPtVEBY8NHJuzH9MVA14jXMEU44abtIdRqlu8dWGHl85Q0WYXuk9RLEiNWU13+a2M4VDjNAkvYOOvXt/AmUTNjr8WBJ51Yyz6wUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065180; 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=ibm3kgce5FekFo1WNXT0w96YzFVkoA7AKH6q7v2gODw=; b=FVaUJ93VwE/RQE3oDbrwivFKNBtsROuws8uFkZdZ6f+mJxX6B60sZzZdN1SYbjiLxowRtMJw1xVL1jvm1hGVI69nlanTWHS0LiY3OkTqUmhhPI86GEVI9CNQPgIk2DrudYFEbw2u7/3SpA7riwUMbx6eU6Kgk6bxWv8t7+Ok4XE= 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 17540651809505.024242160258723; Fri, 1 Aug 2025 09:19:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsT2-0007x0-DG; Fri, 01 Aug 2025 12:18:48 -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 1uhrRa-0000k4-Eu for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:22 -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 1uhrRY-0002dl-5X for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:13 -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-643-ZqZZOCIlNQevAPSmKt52Jw-1; Fri, 01 Aug 2025 11:13:06 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 30286195608F; Fri, 1 Aug 2025 15:13:05 +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 E54171800B4F; Fri, 1 Aug 2025 15:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061189; 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=ibm3kgce5FekFo1WNXT0w96YzFVkoA7AKH6q7v2gODw=; b=RkSt+gzG5Qaz6FfSkzKxm5BHNsoyk1XeUcvvdrN7yn+ZhHN+SNzIgqWwP1jSiJFzM7xlrp 0IVCZNahfFbZoIBmVt20xcGdABE/naBr7s7qFV9eWJ80SSJpoUhKLPKiwnZeV3iTATU+P3 tynk1jNP3rQJXV5aSELfOb5NKUACE0Y= X-MC-Unique: ZqZZOCIlNQevAPSmKt52Jw-1 X-Mimecast-MFC-AGG-ID: ZqZZOCIlNQevAPSmKt52Jw_1754061185 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 02/24] tests/functional: Rework the multiprocess test to have target-specific files Date: Fri, 1 Aug 2025 17:12:27 +0200 Message-ID: <20250801151251.751368-3-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.129.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: 1754065183859124100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth We are going to move the tests for each target into separate subdirectories. The multiprocess test currently contains code for both, x86 and aarch64, so it does not quite fit into this scheme. Rework the test to have a common test class, and target specific files with a target specific class, so that this will fit better into the new scheme. Signed-off-by: Thomas Huth Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- tests/functional/meson.build | 4 +- .../{test_multiprocess.py =3D> multiprocess.py} | 40 +------------------ tests/functional/test_aarch64_multiprocess.py | 31 ++++++++++++++ tests/functional/test_x86_64_multiprocess.py | 31 ++++++++++++++ 5 files changed, 67 insertions(+), 41 deletions(-) rename tests/functional/{test_multiprocess.py =3D> multiprocess.py} (58%) mode change 100755 =3D> 100644 create mode 100755 tests/functional/test_aarch64_multiprocess.py create mode 100755 tests/functional/test_x86_64_multiprocess.py diff --git a/MAINTAINERS b/MAINTAINERS index 97f491b083c..f2164c2b155 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4284,7 +4284,7 @@ F: hw/remote/vfio-user-obj.c F: include/hw/remote/vfio-user-obj.h F: hw/remote/iommu.c F: include/hw/remote/iommu.h -F: tests/functional/test_multiprocess.py +F: tests/functional/*multiprocess.py =20 VFIO-USER: M: John Levon diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 5fb13928b9e..19ea85a6361 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -90,6 +90,7 @@ tests_aarch64_system_thorough =3D [ 'aarch64_hotplug_pci', 'aarch64_imx8mp_evk', 'aarch64_kvm', + 'aarch64_multiprocess', 'aarch64_raspi3', 'aarch64_raspi4', 'aarch64_replay', @@ -106,7 +107,6 @@ tests_aarch64_system_thorough =3D [ 'aarch64_virt_gpu', 'aarch64_xen', 'aarch64_xlnx_versal', - 'multiprocess', ] =20 tests_alpha_system_quick =3D [ @@ -331,7 +331,7 @@ tests_x86_64_system_thorough =3D [ 'acpi_bits', 'intel_iommu', 'linux_initrd', - 'multiprocess', + 'x86_64_multiprocess', 'netdev_ethtool', 'virtio_balloon', 'virtio_gpu', diff --git a/tests/functional/test_multiprocess.py b/tests/functional/multi= process.py old mode 100755 new mode 100644 similarity index 58% rename from tests/functional/test_multiprocess.py rename to tests/functional/multiprocess.py index 92d5207b0eb..6a06c1eda19 --- a/tests/functional/test_multiprocess.py +++ b/tests/functional/multiprocess.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later # # Test for multiprocess qemu # @@ -9,33 +9,13 @@ import os import socket =20 -from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern +from qemu_test import QemuSystemTest, wait_for_console_pattern from qemu_test import exec_command, exec_command_and_wait_for_pattern =20 class Multiprocess(QemuSystemTest): =20 KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' =20 - ASSET_KERNEL_X86 =3D Asset( - ('https://archives.fedoraproject.org/pub/archive/fedora/linux' - '/releases/31/Everything/x86_64/os/images/pxeboot/vmlinuz'), - 'd4738d03dbbe083ca610d0821d0a8f1488bebbdccef54ce33e3adb35fda00129') - - ASSET_INITRD_X86 =3D Asset( - ('https://archives.fedoraproject.org/pub/archive/fedora/linux' - '/releases/31/Everything/x86_64/os/images/pxeboot/initrd.img'), - '3b6cb5c91a14c42e2f61520f1689264d865e772a1f0069e660a800d31dd61fb9') - - ASSET_KERNEL_AARCH64 =3D Asset( - ('https://archives.fedoraproject.org/pub/archive/fedora/linux' - '/releases/31/Everything/aarch64/os/images/pxeboot/vmlinuz'), - '3ae07fcafbfc8e4abeb693035a74fe10698faae15e9ccd48882a9167800c1527') - - ASSET_INITRD_AARCH64 =3D Asset( - ('https://archives.fedoraproject.org/pub/archive/fedora/linux' - '/releases/31/Everything/aarch64/os/images/pxeboot/initrd.img'), - '9fd230cab10b1dafea41cf00150e6669d37051fad133bd618d2130284e16d526') - def do_test(self, kernel_asset, initrd_asset, kernel_command_line, machine_type): """Main test method""" @@ -85,19 +65,3 @@ def do_test(self, kernel_asset, initrd_asset, =20 proxy_sock.close() remote_sock.close() - - def test_multiprocess(self): - kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE - if self.arch =3D=3D 'x86_64': - kernel_command_line +=3D 'console=3DttyS0 rdinit=3D/bin/bash' - self.do_test(self.ASSET_KERNEL_X86, self.ASSET_INITRD_X86, - kernel_command_line, 'pc') - elif self.arch =3D=3D 'aarch64': - kernel_command_line +=3D 'rdinit=3D/bin/bash console=3DttyAMA0' - self.do_test(self.ASSET_KERNEL_AARCH64, self.ASSET_INITRD_AARC= H64, - kernel_command_line, 'virt,gic-version=3D3') - else: - assert False - -if __name__ =3D=3D '__main__': - QemuSystemTest.main() diff --git a/tests/functional/test_aarch64_multiprocess.py b/tests/function= al/test_aarch64_multiprocess.py new file mode 100755 index 00000000000..1c6e45ecb67 --- /dev/null +++ b/tests/functional/test_aarch64_multiprocess.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Test for multiprocess qemu on aarch64 + +from multiprocess import Multiprocess +from qemu_test import Asset + + +class Aarch64Multiprocess(Multiprocess): + + ASSET_KERNEL_AARCH64 =3D Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux' + '/releases/31/Everything/aarch64/os/images/pxeboot/vmlinuz'), + '3ae07fcafbfc8e4abeb693035a74fe10698faae15e9ccd48882a9167800c1527') + + ASSET_INITRD_AARCH64 =3D Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux' + '/releases/31/Everything/aarch64/os/images/pxeboot/initrd.img'), + '9fd230cab10b1dafea41cf00150e6669d37051fad133bd618d2130284e16d526') + + def test_multiprocess(self): + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'rdinit=3D/bin/bash console=3DttyAMA0') + self.do_test(self.ASSET_KERNEL_AARCH64, self.ASSET_INITRD_AARCH64, + kernel_command_line, 'virt,gic-version=3D3') + + +if __name__ =3D=3D '__main__': + Multiprocess.main() diff --git a/tests/functional/test_x86_64_multiprocess.py b/tests/functiona= l/test_x86_64_multiprocess.py new file mode 100755 index 00000000000..756629dd446 --- /dev/null +++ b/tests/functional/test_x86_64_multiprocess.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Test for multiprocess qemu on x86 + +from multiprocess import Multiprocess +from qemu_test import Asset + + +class X86Multiprocess(Multiprocess): + + ASSET_KERNEL_X86 =3D Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux' + '/releases/31/Everything/x86_64/os/images/pxeboot/vmlinuz'), + 'd4738d03dbbe083ca610d0821d0a8f1488bebbdccef54ce33e3adb35fda00129') + + ASSET_INITRD_X86 =3D Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux' + '/releases/31/Everything/x86_64/os/images/pxeboot/initrd.img'), + '3b6cb5c91a14c42e2f61520f1689264d865e772a1f0069e660a800d31dd61fb9') + + def test_multiprocess(self): + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0 rdinit=3D/bin/bash') + self.do_test(self.ASSET_KERNEL_X86, self.ASSET_INITRD_X86, + kernel_command_line, 'pc') + + +if __name__ =3D=3D '__main__': + Multiprocess.main() --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065174; cv=none; d=zohomail.com; s=zohoarc; b=fqo4jG6BTpsJ9gKxtHyXnsM5GXtPGuiEHrC5YDRxLSAO8Cu1MGpPwaEgfm7ImMA7r3a1AVDmJFOGmIRTrjp/QeXvEcYw1YxnydYRSd+dHWipO6TDuNxh1LtWb+7ztzMPWFJ1jHXGSFOuPMQHiVe5TvFxgKd2yTsLqI8a+Mz+dGw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065174; 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=7Rd5KdS4DlTjqASzfCYwNUaZl+0aufFass/Sy/6SrgY=; b=f0miuoLlFOEQs3Qx9oFpMrKMWwLwr2cdjjTvZdkBYVmG+Oyji8XffSC5hN3ZsQOPO1v3CIrtHQO4m6A5qj1YhjRDljCtly3FKjZ9UgiFFmeZ1EXBoNQrR4TbOBrn6y8VqcBcUPYFpg34oxfmN6NxGwEHYyONcyWPdGCelZA/WwM= 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 SMTP id 1754065174534466.56035902547785; Fri, 1 Aug 2025 09:19:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsSs-0006Ih-6w; Fri, 01 Aug 2025 12:18:38 -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 1uhrRb-0000mc-6X for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:22 -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 1uhrRZ-0002e5-4Z for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:14 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-xWNgNvwiM5WWfBiUrA6v0g-1; Fri, 01 Aug 2025 11:13:09 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F1A1D180087E; Fri, 1 Aug 2025 15:13:07 +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 BABEB180035E; Fri, 1 Aug 2025 15:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061192; 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=7Rd5KdS4DlTjqASzfCYwNUaZl+0aufFass/Sy/6SrgY=; b=Bj+kq0y1bHkL+zRV6R+qZSjiqHjqHTmzdePTiGd6CGPFRoUDVfis3EHugpVy5lIV06OztG sy2gwWkSfyCAMZbAMm1hm33801DNwPiA3IoDueh5Q4d5Ys93iDvN/rWf7UTuaeIft/orny Od0Ah77Kzrt/9MGOpYJmXE4g8fnzH6Q= X-MC-Unique: xWNgNvwiM5WWfBiUrA6v0g-1 X-Mimecast-MFC-AGG-ID: xWNgNvwiM5WWfBiUrA6v0g_1754061188 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 03/24] tests/functional/meson.build: Split timeout settings by target Date: Fri, 1 Aug 2025 17:12:28 +0200 Message-ID: <20250801151251.751368-4-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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065193806124100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth We are going to move these settings into target-specific subfolders. As a first step, split the big test_timeouts array up into individual ones. Signed-off-by: Thomas Huth Reviewed-by: Pierrick Bouvier --- tests/functional/meson.build | 50 +++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 19ea85a6361..d0c01303654 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -10,7 +10,7 @@ if get_option('tcg_interpreter') endif =20 # Timeouts for individual tests that can be slow e.g. with debugging enabl= ed -test_timeouts =3D { +test_aarch64_timeouts =3D { 'aarch64_aspeed_ast2700' : 600, 'aarch64_aspeed_ast2700fc' : 600, 'aarch64_device_passthrough' : 720, @@ -25,7 +25,9 @@ test_timeouts =3D { 'aarch64_tuxrun' : 240, 'aarch64_virt' : 360, 'aarch64_virt_gpu' : 480, - 'acpi_bits' : 420, +} + +test_arm_timeouts =3D { 'arm_aspeed_palmetto' : 120, 'arm_aspeed_romulus' : 120, 'arm_aspeed_witherspoon' : 120, @@ -44,24 +46,55 @@ test_timeouts =3D { 'arm_replay' : 240, 'arm_tuxrun' : 240, 'arm_sx1' : 360, - 'intel_iommu': 300, +} + +test_mips_timeouts =3D { 'mips_malta' : 480, +} + +test_mipsel_timeouts =3D { 'mipsel_malta' : 420, 'mipsel_replay' : 480, +} + +test_mips64_timeouts =3D { 'mips64_malta' : 240, +} + +test_mips64el_timeouts =3D { 'mips64el_malta' : 420, 'mips64el_replay' : 180, - 'netdev_ethtool' : 180, +} + +test_ppc_timeouts =3D { 'ppc_40p' : 240, +} + +test_ppc64_timeouts =3D { 'ppc64_hv' : 1000, 'ppc64_powernv' : 480, 'ppc64_pseries' : 480, 'ppc64_replay' : 210, 'ppc64_tuxrun' : 420, 'ppc64_mac99' : 120, +} + +test_riscv64_timeouts =3D { 'riscv64_tuxrun' : 120, +} + +test_s390x_timeouts =3D { 's390x_ccw_virtio' : 420, +} + +test_sh4_timeouts =3D { 'sh4_tuxrun' : 240, +} + +test_x86_64_timeouts =3D { + 'acpi_bits' : 420, + 'intel_iommu': 300, + 'netdev_ethtool' : 180, 'virtio_balloon': 120, 'x86_64_kvm_xen' : 180, 'x86_64_replay' : 480, @@ -403,6 +436,11 @@ foreach speed : ['quick', 'thorough'] build_by_default: false, env: test_precache_env) precache_all +=3D precache + if is_variable('test_' + target_base + '_timeouts') + time_out =3D get_variable('test_' + target_base + '_timeouts').get= (test, 90) + else + time_out =3D 90 + endif =20 # Ideally we would add 'precache' to 'depends' here, such that # 'build_by_default: false' lets the pre-caching automatically @@ -418,8 +456,8 @@ foreach speed : ['quick', 'thorough'] env: test_env, args: [testpath], protocol: 'tap', - timeout: test_timeouts.get(test, 90), - priority: test_timeouts.get(test, 90), + timeout: time_out, + priority: time_out, suite: suites) endforeach endforeach --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065164; cv=none; d=zohomail.com; s=zohoarc; b=CHEN4vsRqxJRB5iMfB7SLyEzmA6xInfVxMLB5gqoCAR3lyLAEdbDFwKpja0mETMvwcVzccsDroGvuip2DHux8C3OzT+uT4QVAlr42vDez1iPgt2P6NF58z8kteAY8axjqGZPqeaPv3kaeLGChXn1emfhIvGT1IkZN6MEu61sfrs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065164; 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=C+iQivB7C77rwbLH7mm8SUcm87UKuSPMMlrZt64XHG4=; b=YzboI4poXe0WhI1qZJSv/sLK9YXXQPoPeuWrnZT8SsTgSex7f5FN7KX4cDSANrkIpjLGtxDO/NDY4x9Wu6gPDhys11JhfwgO8rftjaxb8dtyg8B88i56iHTaxkC5DgyQUxQGqjyrgWmaekDbgVZFG5q6vLjFyGrmJYo0H+r6vQ8= 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 1754065164710281.7793102681487; Fri, 1 Aug 2025 09:19:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsSy-0007D1-7C; Fri, 01 Aug 2025 12:18:44 -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 1uhrRe-0000oI-B6 for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:26 -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 1uhrRb-0002eh-Qf for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:17 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-98-bJHq35hYNeyy6CITRY460A-1; Fri, 01 Aug 2025 11:13:12 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 169481800258; Fri, 1 Aug 2025 15:13:11 +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 A99ED1800B6A; Fri, 1 Aug 2025 15:13:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061195; 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=C+iQivB7C77rwbLH7mm8SUcm87UKuSPMMlrZt64XHG4=; b=HjErPpAFejmhiGpFwYZpjY2aw7K0ibZb+89V/WDjv7MyY+Suk3A9q1oF9Eyv75pzgNtDqe 8RxPMEbyhBxe3E/pKq+hxS44vYdWcGRt6pCrOE8lFmHw8WMtbIq3gP8cQWBXSdf1vXD5Cc JIkxy898Y6Ht0pldTTBZRui5lo4/mFY= X-MC-Unique: bJHq35hYNeyy6CITRY460A-1 X-Mimecast-MFC-AGG-ID: bJHq35hYNeyy6CITRY460A_1754061191 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 04/24] tests/functional/meson.build: Allow tests to reside in subfolders Date: Fri, 1 Aug 2025 17:12:29 +0200 Message-ID: <20250801151251.751368-5-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065167705124100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth We are going to move target-specific tests to subfolders that are named after the target (and generic tests will be put into a "generic" folder), so prepare the meson.build file to allow such locations, too. Signed-off-by: Thomas Huth Reviewed-by: Pierrick Bouvier --- tests/functional/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/functional/meson.build b/tests/functional/meson.build index d0c01303654..449a1d5c402 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -422,7 +422,13 @@ foreach speed : ['quick', 'thorough'] =20 foreach test : target_tests testname =3D '@0@-@1@'.format(target_base, test) - testfile =3D 'test_' + test + '.py' + if fs.exists('test_' + test + '.py') + testfile =3D 'test_' + test + '.py' + elif fs.exists('generic' / 'test_' + test + '.py') + testfile =3D 'generic' / 'test_' + test + '.py' + else + testfile =3D target_base / 'test_' + test + '.py' + endif testpath =3D meson.current_source_dir() / testfile teststamp =3D testname + '.tstamp' test_precache_env =3D environment() --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065201; cv=none; d=zohomail.com; s=zohoarc; b=M/pQMcSgAEHR+73Ejrmw4V4zdqvfV96DTUnYLSu0OplJI5ed1nA6h1gIpV5WUxWypD+fxYekUVPWtWWuiTfdhIuE7BThgWDdjR06US7hZRAosodz+W8ONpecBObEYP9XksagasbeLtcpkjD5TKiOpgo3vYpVaOXru/rweTi5KCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065201; 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=qaZQsilhG3XuvxPt+VN6HorCm+/w49q+06L3a0lFyc8=; b=gaTyFLJTqR53f7Qe6WT59/Cm8pS9mE6omsIR4E2A9vu19Aoa5yfGWBsTwt5l+VwFkyklNH5v/XeswJjnId7dxt8qWEmbGKLxtY5h9iw15aE6j6ShZsGm6mlRLAGTmVqZ2vfoJ2T2Il2VNB2YD/iLafBvub9zNeyKk1vuLUeO3MA= 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 175406520104412.200143985079649; Fri, 1 Aug 2025 09:20:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsTg-0000Mu-6l; Fri, 01 Aug 2025 12:19:29 -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 1uhrRv-0002BT-7Z for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:35 -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 1uhrRs-0002gi-MT for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:34 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-1-OYMJd7ftMZ-ACIXRjd4pZw-1; Fri, 01 Aug 2025 11:13:27 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 787E3180A267; Fri, 1 Aug 2025 15:13:14 +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 D2CBF1800EF2; Fri, 1 Aug 2025 15:13:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061211; 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=qaZQsilhG3XuvxPt+VN6HorCm+/w49q+06L3a0lFyc8=; b=Dhlz2bh8Xr8MXPb1urRl3+nVuvHYZJHrCN8QrUP2oQ/8gJV5sKWVsZubd0WppRO0sb9+La 92E9ViJKuU/dn3ua7WBvS8cf/KxC0ujBHHeZWWBsJgTkP9as6xCSu231bESdWRRraeZPp8 SgL4tn/JiUxbYbt8MR/n9yJPoO14G3M= X-MC-Unique: OYMJd7ftMZ-ACIXRjd4pZw-1 X-Mimecast-MFC-AGG-ID: OYMJd7ftMZ-ACIXRjd4pZw_1754061197 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 05/24] tests/functional: Move aarch64 tests into architecture specific folder Date: Fri, 1 Aug 2025 17:12:30 +0200 Message-ID: <20250801151251.751368-6-thuth@redhat.com> In-Reply-To: <20250801151251.751368-1-thuth@redhat.com> References: <20250801151251.751368-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.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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065203408116600 From: Thomas Huth The tests/functional folder has become quite crowded already, some restructuring would be helpful here. Thus move the aarch64 tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 23 +++++---- tests/functional/aarch64/meson.build | 48 +++++++++++++++++++ .../test_aspeed_ast2700.py} | 0 .../test_aspeed_ast2700fc.py} | 0 .../test_device_passthrough.py} | 0 .../test_hotplug_pci.py} | 0 .../test_imx8mp_evk.py} | 0 .../test_kvm.py} | 0 .../test_migration.py} | 0 .../test_multiprocess.py} | 0 .../test_raspi3.py} | 0 .../test_raspi4.py} | 0 .../test_replay.py} | 0 .../test_reverse_debug.py} | 0 .../test_rme_sbsaref.py} | 2 +- .../test_rme_virt.py} | 0 .../test_sbsaref.py} | 0 .../test_sbsaref_alpine.py} | 2 +- .../test_sbsaref_freebsd.py} | 2 +- .../test_smmu.py} | 0 .../test_tcg_plugins.py} | 0 .../test_tuxrun.py} | 0 .../test_virt.py} | 0 .../test_virt_gpu.py} | 0 .../test_xen.py} | 0 .../test_xlnx_versal.py} | 0 tests/functional/meson.build | 48 +------------------ 27 files changed, 63 insertions(+), 62 deletions(-) create mode 100644 tests/functional/aarch64/meson.build rename tests/functional/{test_aarch64_aspeed_ast2700.py =3D> aarch64/test_= aspeed_ast2700.py} (100%) rename tests/functional/{test_aarch64_aspeed_ast2700fc.py =3D> aarch64/tes= t_aspeed_ast2700fc.py} (100%) rename tests/functional/{test_aarch64_device_passthrough.py =3D> aarch64/t= est_device_passthrough.py} (100%) rename tests/functional/{test_aarch64_hotplug_pci.py =3D> aarch64/test_hot= plug_pci.py} (100%) rename tests/functional/{test_aarch64_imx8mp_evk.py =3D> aarch64/test_imx8= mp_evk.py} (100%) rename tests/functional/{test_aarch64_kvm.py =3D> aarch64/test_kvm.py} (10= 0%) rename tests/functional/{test_aarch64_migration.py =3D> aarch64/test_migra= tion.py} (100%) rename tests/functional/{test_aarch64_multiprocess.py =3D> aarch64/test_mu= ltiprocess.py} (100%) rename tests/functional/{test_aarch64_raspi3.py =3D> aarch64/test_raspi3.p= y} (100%) rename tests/functional/{test_aarch64_raspi4.py =3D> aarch64/test_raspi4.p= y} (100%) rename tests/functional/{test_aarch64_replay.py =3D> aarch64/test_replay.p= y} (100%) rename tests/functional/{test_aarch64_reverse_debug.py =3D> aarch64/test_r= everse_debug.py} (100%) rename tests/functional/{test_aarch64_rme_sbsaref.py =3D> aarch64/test_rme= _sbsaref.py} (98%) rename tests/functional/{test_aarch64_rme_virt.py =3D> aarch64/test_rme_vi= rt.py} (100%) rename tests/functional/{test_aarch64_sbsaref.py =3D> aarch64/test_sbsaref= .py} (100%) rename tests/functional/{test_aarch64_sbsaref_alpine.py =3D> aarch64/test_= sbsaref_alpine.py} (97%) rename tests/functional/{test_aarch64_sbsaref_freebsd.py =3D> aarch64/test= _sbsaref_freebsd.py} (97%) rename tests/functional/{test_aarch64_smmu.py =3D> aarch64/test_smmu.py} (= 100%) rename tests/functional/{test_aarch64_tcg_plugins.py =3D> aarch64/test_tcg= _plugins.py} (100%) rename tests/functional/{test_aarch64_tuxrun.py =3D> aarch64/test_tuxrun.p= y} (100%) rename tests/functional/{test_aarch64_virt.py =3D> aarch64/test_virt.py} (= 100%) rename tests/functional/{test_aarch64_virt_gpu.py =3D> aarch64/test_virt_g= pu.py} (100%) rename tests/functional/{test_aarch64_xen.py =3D> aarch64/test_xen.py} (10= 0%) rename tests/functional/{test_aarch64_xlnx_versal.py =3D> aarch64/test_xln= x_versal.py} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index f2164c2b155..a4d99c38869 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -212,7 +212,7 @@ L: qemu-arm@nongnu.org S: Maintained F: hw/arm/smmu* F: include/hw/arm/smmu* -F: tests/functional/test_aarch64_smmu.py +F: tests/functional/aarch64/test_smmu.py =20 AVR TCG CPUs M: Michael Rolnik @@ -874,7 +874,7 @@ F: include/hw/arm/fsl-imx8mp.h F: include/hw/misc/imx8mp_*.h F: include/hw/pci-host/fsl_imx8m_phy.h F: docs/system/arm/imx8mp-evk.rst -F: tests/functional/test_aarch64_imx8mp_evk.py +F: tests/functional/aarch64/test_imx8mp_evk.py F: tests/qtest/rs5c372-test.c =20 MPS2 / MPS3 @@ -952,8 +952,7 @@ F: include/hw/arm/rasp* F: include/hw/*/bcm283* F: docs/system/arm/raspi.rst F: tests/functional/test_arm_raspi2.py -F: tests/functional/test_aarch64_raspi3.py -F: tests/functional/test_aarch64_raspi4.py +F: tests/functional/aarch64/test_raspi*.py =20 Real View M: Peter Maydell @@ -993,7 +992,7 @@ F: hw/misc/sbsa_ec.c F: hw/watchdog/sbsa_gwdt.c F: include/hw/watchdog/sbsa_gwdt.h F: docs/system/arm/sbsa.rst -F: tests/functional/test_aarch64_*sbsaref*.py +F: tests/functional/aarch64/test_*sbsaref*.py =20 Sharp SL-5500 (Collie) PDA M: Peter Maydell @@ -1063,8 +1062,8 @@ S: Maintained F: hw/arm/virt* F: include/hw/arm/virt.h F: docs/system/arm/virt.rst -F: tests/functional/test_aarch64_*virt*.py -F: tests/functional/test_aarch64_tuxrun.py +F: tests/functional/aarch64/test_*virt*.py +F: tests/functional/aarch64/test_tuxrun.py F: tests/functional/test_arm_tuxrun.py F: tests/functional/test_arm_virt.py =20 @@ -1096,7 +1095,7 @@ F: hw/display/dpcd.c F: include/hw/display/dpcd.h F: docs/system/arm/xlnx-versal-virt.rst F: docs/system/arm/xlnx-zcu102.rst -F: tests/functional/test_aarch64_xlnx_versal.py +F: tests/functional/aarch64/test_xlnx_versal.py =20 Xilinx Versal OSPI M: Francisco Iglesias @@ -2108,7 +2107,7 @@ ARM PCI Hotplug M: Gustavo Romero L: qemu-arm@nongnu.org S: Supported -F: tests/functional/test_aarch64_hotplug_pci.py +F: tests/functional/aarch64/test_hotplug_pci.py =20 ACPI/SMBIOS M: Michael S. Tsirkin @@ -2636,7 +2635,7 @@ M: Alex Benn=C3=A9e S: Maintained F: hw/core/guest-loader.c F: docs/system/guest-loader.rst -F: tests/functional/test_aarch64_xen.py +F: tests/functional/aarch64/test_xen.py =20 Intel Hexadecimal Object File Loader M: Su Hang @@ -2705,7 +2704,7 @@ F: hw/display/virtio-gpu* F: hw/display/virtio-vga.* F: include/hw/virtio/virtio-gpu.h F: docs/system/devices/virtio-gpu.rst -F: tests/functional/test_aarch64_virt_gpu.py +F: tests/functional/aarch64/test_virt_gpu.py =20 vhost-user-blk M: Raphael Norwitz @@ -3931,7 +3930,7 @@ S: Maintained F: docs/devel/tcg-plugins.rst F: plugins/ F: tests/tcg/plugins/ -F: tests/functional/test_aarch64_tcg_plugins.py +F: tests/functional/aarch64/test_tcg_plugins.py F: contrib/plugins/ F: scripts/qemu-plugin-symbols.py =20 diff --git a/tests/functional/aarch64/meson.build b/tests/functional/aarch6= 4/meson.build new file mode 100644 index 00000000000..04846c6eb18 --- /dev/null +++ b/tests/functional/aarch64/meson.build @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_aarch64_timeouts =3D { + 'aspeed_ast2700' : 600, + 'aspeed_ast2700fc' : 600, + 'device_passthrough' : 720, + 'imx8mp_evk' : 240, + 'raspi4' : 480, + 'reverse_debug' : 180, + 'rme_virt' : 1200, + 'rme_sbsaref' : 1200, + 'sbsaref_alpine' : 1200, + 'sbsaref_freebsd' : 720, + 'smmu' : 720, + 'tuxrun' : 240, + 'virt' : 360, + 'virt_gpu' : 480, +} + +tests_aarch64_system_quick =3D [ + 'migration', +] + +tests_aarch64_system_thorough =3D [ + 'aspeed_ast2700', + 'aspeed_ast2700fc', + 'device_passthrough', + 'hotplug_pci', + 'imx8mp_evk', + 'kvm', + 'multiprocess', + 'raspi3', + 'raspi4', + 'replay', + 'reverse_debug', + 'rme_virt', + 'rme_sbsaref', + 'sbsaref', + 'sbsaref_alpine', + 'sbsaref_freebsd', + 'smmu', + 'tcg_plugins', + 'tuxrun', + 'virt', + 'virt_gpu', + 'xen', + 'xlnx_versal', +] diff --git a/tests/functional/test_aarch64_aspeed_ast2700.py b/tests/functi= onal/aarch64/test_aspeed_ast2700.py similarity index 100% rename from tests/functional/test_aarch64_aspeed_ast2700.py rename to tests/functional/aarch64/test_aspeed_ast2700.py diff --git a/tests/functional/test_aarch64_aspeed_ast2700fc.py b/tests/func= tional/aarch64/test_aspeed_ast2700fc.py similarity index 100% rename from tests/functional/test_aarch64_aspeed_ast2700fc.py rename to tests/functional/aarch64/test_aspeed_ast2700fc.py diff --git a/tests/functional/test_aarch64_device_passthrough.py b/tests/fu= nctional/aarch64/test_device_passthrough.py similarity index 100% rename from tests/functional/test_aarch64_device_passthrough.py rename to tests/functional/aarch64/test_device_passthrough.py diff --git a/tests/functional/test_aarch64_hotplug_pci.py b/tests/functiona= l/aarch64/test_hotplug_pci.py similarity index 100% rename from tests/functional/test_aarch64_hotplug_pci.py rename to tests/functional/aarch64/test_hotplug_pci.py diff --git a/tests/functional/test_aarch64_imx8mp_evk.py b/tests/functional= /aarch64/test_imx8mp_evk.py similarity index 100% rename from tests/functional/test_aarch64_imx8mp_evk.py rename to tests/functional/aarch64/test_imx8mp_evk.py diff --git a/tests/functional/test_aarch64_kvm.py b/tests/functional/aarch6= 4/test_kvm.py similarity index 100% rename from tests/functional/test_aarch64_kvm.py rename to tests/functional/aarch64/test_kvm.py diff --git a/tests/functional/test_aarch64_migration.py b/tests/functional/= aarch64/test_migration.py similarity index 100% rename from tests/functional/test_aarch64_migration.py rename to tests/functional/aarch64/test_migration.py diff --git a/tests/functional/test_aarch64_multiprocess.py b/tests/function= al/aarch64/test_multiprocess.py similarity index 100% rename from tests/functional/test_aarch64_multiprocess.py rename to tests/functional/aarch64/test_multiprocess.py diff --git a/tests/functional/test_aarch64_raspi3.py b/tests/functional/aar= ch64/test_raspi3.py similarity index 100% rename from tests/functional/test_aarch64_raspi3.py rename to tests/functional/aarch64/test_raspi3.py diff --git a/tests/functional/test_aarch64_raspi4.py b/tests/functional/aar= ch64/test_raspi4.py similarity index 100% rename from tests/functional/test_aarch64_raspi4.py rename to tests/functional/aarch64/test_raspi4.py diff --git a/tests/functional/test_aarch64_replay.py b/tests/functional/aar= ch64/test_replay.py similarity index 100% rename from tests/functional/test_aarch64_replay.py rename to tests/functional/aarch64/test_replay.py diff --git a/tests/functional/test_aarch64_reverse_debug.py b/tests/functio= nal/aarch64/test_reverse_debug.py similarity index 100% rename from tests/functional/test_aarch64_reverse_debug.py rename to tests/functional/aarch64/test_reverse_debug.py diff --git a/tests/functional/test_aarch64_rme_sbsaref.py b/tests/functiona= l/aarch64/test_rme_sbsaref.py similarity index 98% rename from tests/functional/test_aarch64_rme_sbsaref.py rename to tests/functional/aarch64/test_rme_sbsaref.py index 746770e776d..100f1c7738b 100755 --- a/tests/functional/test_aarch64_rme_sbsaref.py +++ b/tests/functional/aarch64/test_rme_sbsaref.py @@ -13,7 +13,7 @@ =20 from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern from qemu_test import exec_command_and_wait_for_pattern -from test_aarch64_rme_virt import test_realms_guest +from test_rme_virt import test_realms_guest =20 =20 class Aarch64RMESbsaRefMachine(QemuSystemTest): diff --git a/tests/functional/test_aarch64_rme_virt.py b/tests/functional/a= arch64/test_rme_virt.py similarity index 100% rename from tests/functional/test_aarch64_rme_virt.py rename to tests/functional/aarch64/test_rme_virt.py diff --git a/tests/functional/test_aarch64_sbsaref.py b/tests/functional/aa= rch64/test_sbsaref.py similarity index 100% rename from tests/functional/test_aarch64_sbsaref.py rename to tests/functional/aarch64/test_sbsaref.py diff --git a/tests/functional/test_aarch64_sbsaref_alpine.py b/tests/functi= onal/aarch64/test_sbsaref_alpine.py similarity index 97% rename from tests/functional/test_aarch64_sbsaref_alpine.py rename to tests/functional/aarch64/test_sbsaref_alpine.py index 87769993831..abb8f5114bd 100755 --- a/tests/functional/test_aarch64_sbsaref_alpine.py +++ b/tests/functional/aarch64/test_sbsaref_alpine.py @@ -12,7 +12,7 @@ =20 from qemu_test import QemuSystemTest, Asset, skipSlowTest from qemu_test import wait_for_console_pattern -from test_aarch64_sbsaref import fetch_firmware +from test_sbsaref import fetch_firmware =20 =20 class Aarch64SbsarefAlpine(QemuSystemTest): diff --git a/tests/functional/test_aarch64_sbsaref_freebsd.py b/tests/funct= ional/aarch64/test_sbsaref_freebsd.py similarity index 97% rename from tests/functional/test_aarch64_sbsaref_freebsd.py rename to tests/functional/aarch64/test_sbsaref_freebsd.py index 7ef016fba62..3b942f7795c 100755 --- a/tests/functional/test_aarch64_sbsaref_freebsd.py +++ b/tests/functional/aarch64/test_sbsaref_freebsd.py @@ -12,7 +12,7 @@ =20 from qemu_test import QemuSystemTest, Asset, skipSlowTest from qemu_test import wait_for_console_pattern -from test_aarch64_sbsaref import fetch_firmware +from test_sbsaref import fetch_firmware =20 =20 class Aarch64SbsarefFreeBSD(QemuSystemTest): diff --git a/tests/functional/test_aarch64_smmu.py b/tests/functional/aarch= 64/test_smmu.py similarity index 100% rename from tests/functional/test_aarch64_smmu.py rename to tests/functional/aarch64/test_smmu.py diff --git a/tests/functional/test_aarch64_tcg_plugins.py b/tests/functiona= l/aarch64/test_tcg_plugins.py similarity index 100% rename from tests/functional/test_aarch64_tcg_plugins.py rename to tests/functional/aarch64/test_tcg_plugins.py diff --git a/tests/functional/test_aarch64_tuxrun.py b/tests/functional/aar= ch64/test_tuxrun.py similarity index 100% rename from tests/functional/test_aarch64_tuxrun.py rename to tests/functional/aarch64/test_tuxrun.py diff --git a/tests/functional/test_aarch64_virt.py b/tests/functional/aarch= 64/test_virt.py similarity index 100% rename from tests/functional/test_aarch64_virt.py rename to tests/functional/aarch64/test_virt.py diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/a= arch64/test_virt_gpu.py similarity index 100% rename from tests/functional/test_aarch64_virt_gpu.py rename to tests/functional/aarch64/test_virt_gpu.py diff --git a/tests/functional/test_aarch64_xen.py b/tests/functional/aarch6= 4/test_xen.py similarity index 100% rename from tests/functional/test_aarch64_xen.py rename to tests/functional/aarch64/test_xen.py diff --git a/tests/functional/test_aarch64_xlnx_versal.py b/tests/functiona= l/aarch64/test_xlnx_versal.py similarity index 100% rename from tests/functional/test_aarch64_xlnx_versal.py rename to tests/functional/aarch64/test_xlnx_versal.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 449a1d5c402..3229128cd7e 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -9,23 +9,7 @@ if get_option('tcg_interpreter') subdir_done() endif =20 -# Timeouts for individual tests that can be slow e.g. with debugging enabl= ed -test_aarch64_timeouts =3D { - 'aarch64_aspeed_ast2700' : 600, - 'aarch64_aspeed_ast2700fc' : 600, - 'aarch64_device_passthrough' : 720, - 'aarch64_imx8mp_evk' : 240, - 'aarch64_raspi4' : 480, - 'aarch64_reverse_debug' : 180, - 'aarch64_rme_virt' : 1200, - 'aarch64_rme_sbsaref' : 1200, - 'aarch64_sbsaref_alpine' : 1200, - 'aarch64_sbsaref_freebsd' : 720, - 'aarch64_smmu' : 720, - 'aarch64_tuxrun' : 240, - 'aarch64_virt' : 360, - 'aarch64_virt_gpu' : 480, -} +subdir('aarch64') =20 test_arm_timeouts =3D { 'arm_aspeed_palmetto' : 120, @@ -112,36 +96,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_aarch64_system_quick =3D [ - 'aarch64_migration', -] - -tests_aarch64_system_thorough =3D [ - 'aarch64_aspeed_ast2700', - 'aarch64_aspeed_ast2700fc', - 'aarch64_device_passthrough', - 'aarch64_hotplug_pci', - 'aarch64_imx8mp_evk', - 'aarch64_kvm', - 'aarch64_multiprocess', - 'aarch64_raspi3', - 'aarch64_raspi4', - 'aarch64_replay', - 'aarch64_reverse_debug', - 'aarch64_rme_virt', - 'aarch64_rme_sbsaref', - 'aarch64_sbsaref', - 'aarch64_sbsaref_alpine', - 'aarch64_sbsaref_freebsd', - 'aarch64_smmu', - 'aarch64_tcg_plugins', - 'aarch64_tuxrun', - 'aarch64_virt', - 'aarch64_virt_gpu', - 'aarch64_xen', - 'aarch64_xlnx_versal', -] - tests_alpha_system_quick =3D [ 'alpha_migration', ] --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065248; cv=none; d=zohomail.com; s=zohoarc; b=EmDZsj2oZwsay8zWzX7n1cA1/oNovjecAWQevdu3vYzHOKdQaqv9rs/8v1x4+ObBLUJfCahLVZF7JjW82IelSJURneHaAbYRLhEB4V2MUZ0pJ9aKHY4HgWfQde3Q3BK8CvUshjGoLserra1h3LkNRjUH/3elIaRvrCPVmnafAY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065248; 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=GuhwhcI+rZMOb/3aq1I/em0+9HoXbrdoI1b8gEVZ/IA=; b=UvJ3+sN2ddwY+xidOsnHv1MGeDg3s9bakUzsJrV2rEBXWtYxyGBRBusqnmPSEOeGnqDSqgs/KV9Dp9nm6OuaXB0+sifmfR6VYyacdIOB3SSxjsiScHjtlJV7SYi69U0SIMTJzO+KSvcGZxP7aiezRHLnJLkOjQWsKNcQ6zyQOXI= 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 1754065248096405.56178378903303; Fri, 1 Aug 2025 09:20:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsT4-0008EX-B5; Fri, 01 Aug 2025 12:18:50 -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 1uhrRr-0001b8-5X for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:31 -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 1uhrRp-0002gR-Iw for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:30 -0400 Received: from mx-prod-mc-01.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-557-StLqg0B7PNKMA5yggOdAYw-1; Fri, 01 Aug 2025 11:13:20 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6A3A5195D01C; Fri, 1 Aug 2025 15:13:17 +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 037A21800B4F; Fri, 1 Aug 2025 15:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061208; 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=GuhwhcI+rZMOb/3aq1I/em0+9HoXbrdoI1b8gEVZ/IA=; b=Z5LLh3Ef2rXzK4y8r2lDLedLqtQShdlSvKxUbq3BoQPwZGfuwghDLbgtwyKpbn+jEQ2wLd 9aFJFO9EVcEJHNQPYw2UuXmEMSYUtZxnQdXjd3VqXr8oemaye0sao98WRpByoOnkxdK6M2 /6AA9IYIm0u77o0fhF2lJCa1wrUSVo4= X-MC-Unique: StLqg0B7PNKMA5yggOdAYw-1 X-Mimecast-MFC-AGG-ID: StLqg0B7PNKMA5yggOdAYw_1754061198 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 06/24] tests/functional: Move alpha tests into architecture specific folder Date: Fri, 1 Aug 2025 17:12:31 +0200 Message-ID: <20250801151251.751368-7-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.129.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: 1754065253553124100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded already, some restructuring would be helpful here. Thus move the alpha tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 3 ++- tests/functional/alpha/meson.build | 10 ++++++++++ .../{test_alpha_clipper.py =3D> alpha/test_clipper.py} | 0 .../test_migration.py} | 0 .../{test_alpha_replay.py =3D> alpha/test_replay.py} | 0 tests/functional/meson.build | 10 +--------- 6 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 tests/functional/alpha/meson.build rename tests/functional/{test_alpha_clipper.py =3D> alpha/test_clipper.py}= (100%) rename tests/functional/{test_alpha_migration.py =3D> alpha/test_migration= .py} (100%) rename tests/functional/{test_alpha_replay.py =3D> alpha/test_replay.py} (= 100%) diff --git a/MAINTAINERS b/MAINTAINERS index a4d99c38869..96b5dd4b2eb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -189,6 +189,7 @@ M: Richard Henderson S: Maintained F: target/alpha/ F: tests/tcg/alpha/ +F: tests/functional/alpha/ F: disas/alpha.c =20 ARM TCG CPUs @@ -656,7 +657,7 @@ S: Maintained F: hw/alpha/ F: hw/isa/smc37c669-superio.c F: tests/tcg/alpha/system/ -F: tests/functional/test_alpha_clipper.py +F: tests/functional/alpha/test_clipper.py =20 ARM Machines ------------ diff --git a/tests/functional/alpha/meson.build b/tests/functional/alpha/me= son.build new file mode 100644 index 00000000000..26a5b3f2e4b --- /dev/null +++ b/tests/functional/alpha/meson.build @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_alpha_system_quick =3D [ + 'migration', +] + +tests_alpha_system_thorough =3D [ + 'clipper', + 'replay', +] diff --git a/tests/functional/test_alpha_clipper.py b/tests/functional/alph= a/test_clipper.py similarity index 100% rename from tests/functional/test_alpha_clipper.py rename to tests/functional/alpha/test_clipper.py diff --git a/tests/functional/test_alpha_migration.py b/tests/functional/al= pha/test_migration.py similarity index 100% rename from tests/functional/test_alpha_migration.py rename to tests/functional/alpha/test_migration.py diff --git a/tests/functional/test_alpha_replay.py b/tests/functional/alpha= /test_replay.py similarity index 100% rename from tests/functional/test_alpha_replay.py rename to tests/functional/alpha/test_replay.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 3229128cd7e..77d8f4db808 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -10,6 +10,7 @@ if get_option('tcg_interpreter') endif =20 subdir('aarch64') +subdir('alpha') =20 test_arm_timeouts =3D { 'arm_aspeed_palmetto' : 120, @@ -96,15 +97,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_alpha_system_quick =3D [ - 'alpha_migration', -] - -tests_alpha_system_thorough =3D [ - 'alpha_clipper', - 'alpha_replay', -] - tests_arm_system_quick =3D [ 'arm_migration', ] --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065327; cv=none; d=zohomail.com; s=zohoarc; b=KtE2EKJMAPZYWUWOxtPee70u58f+nDBofOUsqaYqXWV4uga0hggjVQXUhm7YH+0uYNPFCk1yKp+tFCPVS/Fgs5CModKN+TMQ4ASdgYiq8hUsnuPfGONwKdHW/rz45m/q2TXQh7KEZpQlqxswAXDA56yiTPZ7XbNtf3am2tmENnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065327; 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=AhT7unPjbjnIzc2sXXtJ7KERKqgqdGAIFe8XjfzKCdA=; b=eBpd7HzTIdpYZaheOGwIRlurWQQwlV2ntfaBE1nFPJom7SugjtazBtwihCHu+/RcmfKnYHy620ex2i92L9/AeANsag5+oLhHDMDBUWkoV7oyvLxAhy92kUs32fOg+h/MJ5+DyhpyMQyukXZ4aW4mMPguVkANO+COdZ0W9IdcjYw= 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 1754065327755201.63833537724622; Fri, 1 Aug 2025 09:22:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsU6-0002HY-R0; Fri, 01 Aug 2025 12:19:55 -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 1uhrS2-00031F-DG for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:42 -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 1uhrRz-0002hZ-LJ for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:42 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-658-A0oWIX6YOUCgxDMTOikuZQ-1; Fri, 01 Aug 2025 11:13:37 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 93DF618009A8; Fri, 1 Aug 2025 15:13:20 +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 E6E631800D8E; Fri, 1 Aug 2025 15:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061218; 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=AhT7unPjbjnIzc2sXXtJ7KERKqgqdGAIFe8XjfzKCdA=; b=ZMHpAJfo6Xxanp3/HprD9+jX7F1ccHvZndUGic/c33ZrKLTrPyFPp7y9A8/JLOjKAYGRn1 gS20vvU4qAHo/o+0ahke14xnAROvmyeOYqBp4zEtP7pD7fc1WW4x/4kq2gXm8OYbK8P3Om 6m35TqND+NNjI3oT22LmayjzMqKozog= X-MC-Unique: A0oWIX6YOUCgxDMTOikuZQ-1 X-Mimecast-MFC-AGG-ID: A0oWIX6YOUCgxDMTOikuZQ_1754061214 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 07/24] tests/functional: Move arm tests into architecture specific folder Date: Fri, 1 Aug 2025 17:12:32 +0200 Message-ID: <20250801151251.751368-8-thuth@redhat.com> In-Reply-To: <20250801151251.751368-1-thuth@redhat.com> References: <20250801151251.751368-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.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065329515116600 From: Thomas Huth The tests/functional folder has become quite crowded, thus move the arm tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 36 +++++------ tests/functional/arm/meson.build | 62 +++++++++++++++++++ .../test_aspeed_ast1030.py} | 0 .../test_aspeed_ast2500.py} | 0 .../test_aspeed_ast2600.py} | 0 .../test_aspeed_bletchley.py} | 0 .../test_aspeed_catalina.py} | 0 .../test_aspeed_gb200nvl_bmc.py} | 0 .../test_aspeed_palmetto.py} | 0 .../test_aspeed_rainier.py} | 0 .../test_aspeed_romulus.py} | 0 .../test_aspeed_witherspoon.py} | 0 .../{test_arm_bflt.py =3D> arm/test_bflt.py} | 0 .../test_bpim2u.py} | 0 .../test_canona1100.py} | 0 .../test_collie.py} | 0 .../test_cubieboard.py} | 0 .../test_emcraft_sf2.py} | 0 .../test_integratorcp.py} | 0 .../test_max78000fthr.py} | 0 .../test_microbit.py} | 0 .../test_migration.py} | 0 .../test_orangepi.py} | 0 .../test_quanta_gsj.py} | 0 .../test_raspi2.py} | 0 .../test_realview.py} | 0 .../test_replay.py} | 0 .../test_smdkc210.py} | 0 .../test_stellaris.py} | 0 .../{test_arm_sx1.py =3D> arm/test_sx1.py} | 0 .../test_tuxrun.py} | 0 .../test_vexpress.py} | 0 .../{test_arm_virt.py =3D> arm/test_virt.py} | 0 tests/functional/meson.build | 62 +------------------ 34 files changed, 81 insertions(+), 79 deletions(-) create mode 100644 tests/functional/arm/meson.build rename tests/functional/{test_arm_aspeed_ast1030.py =3D> arm/test_aspeed_a= st1030.py} (100%) rename tests/functional/{test_arm_aspeed_ast2500.py =3D> arm/test_aspeed_a= st2500.py} (100%) rename tests/functional/{test_arm_aspeed_ast2600.py =3D> arm/test_aspeed_a= st2600.py} (100%) rename tests/functional/{test_arm_aspeed_bletchley.py =3D> arm/test_aspeed= _bletchley.py} (100%) mode change 100644 =3D> 100755 rename tests/functional/{test_arm_aspeed_catalina.py =3D> arm/test_aspeed_= catalina.py} (100%) rename tests/functional/{test_arm_aspeed_gb200nvl_bmc.py =3D> arm/test_asp= eed_gb200nvl_bmc.py} (100%) mode change 100644 =3D> 100755 rename tests/functional/{test_arm_aspeed_palmetto.py =3D> arm/test_aspeed_= palmetto.py} (100%) rename tests/functional/{test_arm_aspeed_rainier.py =3D> arm/test_aspeed_r= ainier.py} (100%) rename tests/functional/{test_arm_aspeed_romulus.py =3D> arm/test_aspeed_r= omulus.py} (100%) rename tests/functional/{test_arm_aspeed_witherspoon.py =3D> arm/test_aspe= ed_witherspoon.py} (100%) mode change 100644 =3D> 100755 rename tests/functional/{test_arm_bflt.py =3D> arm/test_bflt.py} (100%) rename tests/functional/{test_arm_bpim2u.py =3D> arm/test_bpim2u.py} (100%) rename tests/functional/{test_arm_canona1100.py =3D> arm/test_canona1100.p= y} (100%) rename tests/functional/{test_arm_collie.py =3D> arm/test_collie.py} (100%) rename tests/functional/{test_arm_cubieboard.py =3D> arm/test_cubieboard.p= y} (100%) rename tests/functional/{test_arm_emcraft_sf2.py =3D> arm/test_emcraft_sf2= .py} (100%) rename tests/functional/{test_arm_integratorcp.py =3D> arm/test_integrator= cp.py} (100%) rename tests/functional/{test_arm_max78000fthr.py =3D> arm/test_max78000ft= hr.py} (100%) rename tests/functional/{test_arm_microbit.py =3D> arm/test_microbit.py} (= 100%) rename tests/functional/{test_arm_migration.py =3D> arm/test_migration.py}= (100%) rename tests/functional/{test_arm_orangepi.py =3D> arm/test_orangepi.py} (= 100%) rename tests/functional/{test_arm_quanta_gsj.py =3D> arm/test_quanta_gsj.p= y} (100%) rename tests/functional/{test_arm_raspi2.py =3D> arm/test_raspi2.py} (100%) rename tests/functional/{test_arm_realview.py =3D> arm/test_realview.py} (= 100%) rename tests/functional/{test_arm_replay.py =3D> arm/test_replay.py} (100%) rename tests/functional/{test_arm_smdkc210.py =3D> arm/test_smdkc210.py} (= 100%) rename tests/functional/{test_arm_stellaris.py =3D> arm/test_stellaris.py}= (100%) rename tests/functional/{test_arm_sx1.py =3D> arm/test_sx1.py} (100%) rename tests/functional/{test_arm_tuxrun.py =3D> arm/test_tuxrun.py} (100%) rename tests/functional/{test_arm_vexpress.py =3D> arm/test_vexpress.py} (= 100%) rename tests/functional/{test_arm_virt.py =3D> arm/test_virt.py} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 96b5dd4b2eb..fa7a0ee7e6e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -673,7 +673,7 @@ F: include/hw/*/allwinner* F: hw/arm/cubieboard.c F: docs/system/arm/cubieboard.rst F: hw/misc/axp209.c -F: tests/functional/test_arm_cubieboard.py +F: tests/functional/arm/test_cubieboard.py =20 Allwinner-h3 M: Niek Linnenbank @@ -683,7 +683,7 @@ F: hw/*/allwinner-h3* F: include/hw/*/allwinner-h3* F: hw/arm/orangepi.c F: docs/system/arm/orangepi.rst -F: tests/functional/test_arm_orangepi.py +F: tests/functional/arm/test_orangepi.py =20 ARM PrimeCell and CMSDK devices M: Peter Maydell @@ -753,7 +753,7 @@ F: docs/system/arm/bananapi_m2u.rst F: hw/*/allwinner-r40*.c F: hw/arm/bananapi_m2u.c F: include/hw/*/allwinner-r40*.h -F: tests/functional/test_arm_bpim2u.py +F: tests/functional/arm/test_bpim2u.py =20 B-L475E-IOT01A IoT Node M: Samuel Tardieu @@ -771,7 +771,7 @@ S: Odd Fixes F: hw/*/exynos* F: include/hw/*/exynos* F: docs/system/arm/exynos.rst -F: tests/functional/test_arm_smdkc210.py +F: tests/functional/arm/test_smdkc210.py =20 Calxeda Highbank M: Rob Herring @@ -790,7 +790,7 @@ S: Odd Fixes F: include/hw/arm/digic.h F: hw/*/digic* F: include/hw/*/digic* -F: tests/functional/test_arm_canona1100.py +F: tests/functional/arm/test_canona1100.py F: docs/system/arm/digic.rst =20 Goldfish RTC @@ -833,7 +833,7 @@ S: Odd Fixes F: hw/arm/integratorcp.c F: hw/misc/arm_integrator_debug.c F: include/hw/misc/arm_integrator_debug.h -F: tests/functional/test_arm_integratorcp.py +F: tests/functional/arm/test_integratorcp.py F: docs/system/arm/integratorcp.rst =20 MCIMX6UL EVK / i.MX6ul @@ -939,7 +939,7 @@ F: pc-bios/npcm7xx_bootrom.bin F: pc-bios/npcm8xx_bootrom.bin F: roms/vbootrom F: docs/system/arm/nuvoton.rst -F: tests/functional/test_arm_quanta_gsj.py +F: tests/functional/arm/test_quanta_gsj.py =20 Raspberry Pi M: Peter Maydell @@ -952,7 +952,7 @@ F: hw/*/bcm283* F: include/hw/arm/rasp* F: include/hw/*/bcm283* F: docs/system/arm/raspi.rst -F: tests/functional/test_arm_raspi2.py +F: tests/functional/arm/test_raspi2.py F: tests/functional/aarch64/test_raspi*.py =20 Real View @@ -964,7 +964,7 @@ F: hw/cpu/realview_mpcore.c F: hw/intc/realview_gic.c F: include/hw/intc/realview_gic.h F: docs/system/arm/realview.rst -F: tests/functional/test_arm_realview.py +F: tests/functional/arm/test_realview.py =20 SABRELITE / i.MX6 M: Peter Maydell @@ -1004,7 +1004,7 @@ F: hw/arm/strongarm* F: hw/gpio/zaurus.c F: include/hw/arm/sharpsl.h F: docs/system/arm/collie.rst -F: tests/functional/test_arm_collie.py +F: tests/functional/arm/test_collie.py =20 Stellaris M: Peter Maydell @@ -1015,7 +1015,7 @@ F: hw/display/ssd03* F: include/hw/input/stellaris_gamepad.h F: include/hw/timer/stellaris-gptm.h F: docs/system/arm/stellaris.rst -F: tests/functional/test_arm_stellaris.py +F: tests/functional/arm/test_stellaris.py =20 STM32L4x5 SoC Family M: Samuel Tardieu @@ -1044,7 +1044,7 @@ S: Odd Fixes F: hw/arm/vexpress.c F: hw/display/sii9022.c F: docs/system/arm/vexpress.rst -F: tests/functional/test_arm_vexpress.py +F: tests/functional/arm/test_vexpress.py =20 Versatile PB M: Peter Maydell @@ -1065,8 +1065,8 @@ F: include/hw/arm/virt.h F: docs/system/arm/virt.rst F: tests/functional/aarch64/test_*virt*.py F: tests/functional/aarch64/test_tuxrun.py -F: tests/functional/test_arm_tuxrun.py -F: tests/functional/test_arm_virt.py +F: tests/functional/arm/test_tuxrun.py +F: tests/functional/arm/test_virt.py =20 Xilinx Zynq M: Edgar E. Iglesias @@ -1187,7 +1187,7 @@ L: qemu-arm@nongnu.org S: Maintained F: hw/arm/msf2-som.c F: docs/system/arm/emcraft-sf2.rst -F: tests/functional/test_arm_emcraft_sf2.py +F: tests/functional/arm/test_emcraft_sf2.py =20 ASPEED BMCs M: C=C3=A9dric Le Goater @@ -1220,7 +1220,7 @@ F: hw/*/microbit*.c F: include/hw/*/nrf51*.h F: include/hw/*/microbit*.h F: tests/qtest/microbit-test.c -F: tests/functional/test_arm_microbit.py +F: tests/functional/arm/test_microbit.py F: docs/system/arm/nrf.rst =20 ARM PL011 Rust device @@ -2076,7 +2076,7 @@ S: Odd Fixes F: hw/*/omap* F: include/hw/arm/omap.h F: docs/system/arm/sx1.rst -F: tests/functional/test_arm_sx1.py +F: tests/functional/arm/test_sx1.py =20 IPack M: Alberto Garcia @@ -3911,7 +3911,7 @@ F: configs/targets/*linux-user.mak F: scripts/qemu-binfmt-conf.sh F: scripts/update-syscalltbl.sh F: scripts/update-mips-syscall-args.sh -F: tests/functional/test_arm_bflt.py +F: tests/functional/arm/test_bflt.py =20 Tiny Code Generator (TCG) ------------------------- diff --git a/tests/functional/arm/meson.build b/tests/functional/arm/meson.= build new file mode 100644 index 00000000000..e4e7dba8d08 --- /dev/null +++ b/tests/functional/arm/meson.build @@ -0,0 +1,62 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_arm_timeouts =3D { + 'aspeed_palmetto' : 120, + 'aspeed_romulus' : 120, + 'aspeed_witherspoon' : 120, + 'aspeed_ast2500' : 720, + 'aspeed_ast2600' : 1200, + 'aspeed_bletchley' : 480, + 'aspeed_catalina' : 480, + 'aspeed_gb200nvl_bmc' : 480, + 'aspeed_rainier' : 480, + 'bpim2u' : 500, + 'collie' : 180, + 'cubieboard' : 360, + 'orangepi' : 540, + 'quanta_gsj' : 240, + 'raspi2' : 120, + 'replay' : 240, + 'tuxrun' : 240, + 'sx1' : 360, +} + +tests_arm_system_quick =3D [ + 'migration', +] + +tests_arm_system_thorough =3D [ + 'aspeed_ast1030', + 'aspeed_palmetto', + 'aspeed_romulus', + 'aspeed_witherspoon', + 'aspeed_ast2500', + 'aspeed_ast2600', + 'aspeed_bletchley', + 'aspeed_catalina', + 'aspeed_gb200nvl_bmc', + 'aspeed_rainier', + 'bpim2u', + 'canona1100', + 'collie', + 'cubieboard', + 'emcraft_sf2', + 'integratorcp', + 'max78000fthr', + 'microbit', + 'orangepi', + 'quanta_gsj', + 'raspi2', + 'realview', + 'replay', + 'smdkc210', + 'stellaris', + 'sx1', + 'vexpress', + 'virt', + 'tuxrun', +] + +tests_arm_linuxuser_thorough =3D [ + 'bflt', +] diff --git a/tests/functional/test_arm_aspeed_ast1030.py b/tests/functional= /arm/test_aspeed_ast1030.py similarity index 100% rename from tests/functional/test_arm_aspeed_ast1030.py rename to tests/functional/arm/test_aspeed_ast1030.py diff --git a/tests/functional/test_arm_aspeed_ast2500.py b/tests/functional= /arm/test_aspeed_ast2500.py similarity index 100% rename from tests/functional/test_arm_aspeed_ast2500.py rename to tests/functional/arm/test_aspeed_ast2500.py diff --git a/tests/functional/test_arm_aspeed_ast2600.py b/tests/functional= /arm/test_aspeed_ast2600.py similarity index 100% rename from tests/functional/test_arm_aspeed_ast2600.py rename to tests/functional/arm/test_aspeed_ast2600.py diff --git a/tests/functional/test_arm_aspeed_bletchley.py b/tests/function= al/arm/test_aspeed_bletchley.py old mode 100644 new mode 100755 similarity index 100% rename from tests/functional/test_arm_aspeed_bletchley.py rename to tests/functional/arm/test_aspeed_bletchley.py diff --git a/tests/functional/test_arm_aspeed_catalina.py b/tests/functiona= l/arm/test_aspeed_catalina.py similarity index 100% rename from tests/functional/test_arm_aspeed_catalina.py rename to tests/functional/arm/test_aspeed_catalina.py diff --git a/tests/functional/test_arm_aspeed_gb200nvl_bmc.py b/tests/funct= ional/arm/test_aspeed_gb200nvl_bmc.py old mode 100644 new mode 100755 similarity index 100% rename from tests/functional/test_arm_aspeed_gb200nvl_bmc.py rename to tests/functional/arm/test_aspeed_gb200nvl_bmc.py diff --git a/tests/functional/test_arm_aspeed_palmetto.py b/tests/functiona= l/arm/test_aspeed_palmetto.py similarity index 100% rename from tests/functional/test_arm_aspeed_palmetto.py rename to tests/functional/arm/test_aspeed_palmetto.py diff --git a/tests/functional/test_arm_aspeed_rainier.py b/tests/functional= /arm/test_aspeed_rainier.py similarity index 100% rename from tests/functional/test_arm_aspeed_rainier.py rename to tests/functional/arm/test_aspeed_rainier.py diff --git a/tests/functional/test_arm_aspeed_romulus.py b/tests/functional= /arm/test_aspeed_romulus.py similarity index 100% rename from tests/functional/test_arm_aspeed_romulus.py rename to tests/functional/arm/test_aspeed_romulus.py diff --git a/tests/functional/test_arm_aspeed_witherspoon.py b/tests/functi= onal/arm/test_aspeed_witherspoon.py old mode 100644 new mode 100755 similarity index 100% rename from tests/functional/test_arm_aspeed_witherspoon.py rename to tests/functional/arm/test_aspeed_witherspoon.py diff --git a/tests/functional/test_arm_bflt.py b/tests/functional/arm/test_= bflt.py similarity index 100% rename from tests/functional/test_arm_bflt.py rename to tests/functional/arm/test_bflt.py diff --git a/tests/functional/test_arm_bpim2u.py b/tests/functional/arm/tes= t_bpim2u.py similarity index 100% rename from tests/functional/test_arm_bpim2u.py rename to tests/functional/arm/test_bpim2u.py diff --git a/tests/functional/test_arm_canona1100.py b/tests/functional/arm= /test_canona1100.py similarity index 100% rename from tests/functional/test_arm_canona1100.py rename to tests/functional/arm/test_canona1100.py diff --git a/tests/functional/test_arm_collie.py b/tests/functional/arm/tes= t_collie.py similarity index 100% rename from tests/functional/test_arm_collie.py rename to tests/functional/arm/test_collie.py diff --git a/tests/functional/test_arm_cubieboard.py b/tests/functional/arm= /test_cubieboard.py similarity index 100% rename from tests/functional/test_arm_cubieboard.py rename to tests/functional/arm/test_cubieboard.py diff --git a/tests/functional/test_arm_emcraft_sf2.py b/tests/functional/ar= m/test_emcraft_sf2.py similarity index 100% rename from tests/functional/test_arm_emcraft_sf2.py rename to tests/functional/arm/test_emcraft_sf2.py diff --git a/tests/functional/test_arm_integratorcp.py b/tests/functional/a= rm/test_integratorcp.py similarity index 100% rename from tests/functional/test_arm_integratorcp.py rename to tests/functional/arm/test_integratorcp.py diff --git a/tests/functional/test_arm_max78000fthr.py b/tests/functional/a= rm/test_max78000fthr.py similarity index 100% rename from tests/functional/test_arm_max78000fthr.py rename to tests/functional/arm/test_max78000fthr.py diff --git a/tests/functional/test_arm_microbit.py b/tests/functional/arm/t= est_microbit.py similarity index 100% rename from tests/functional/test_arm_microbit.py rename to tests/functional/arm/test_microbit.py diff --git a/tests/functional/test_arm_migration.py b/tests/functional/arm/= test_migration.py similarity index 100% rename from tests/functional/test_arm_migration.py rename to tests/functional/arm/test_migration.py diff --git a/tests/functional/test_arm_orangepi.py b/tests/functional/arm/t= est_orangepi.py similarity index 100% rename from tests/functional/test_arm_orangepi.py rename to tests/functional/arm/test_orangepi.py diff --git a/tests/functional/test_arm_quanta_gsj.py b/tests/functional/arm= /test_quanta_gsj.py similarity index 100% rename from tests/functional/test_arm_quanta_gsj.py rename to tests/functional/arm/test_quanta_gsj.py diff --git a/tests/functional/test_arm_raspi2.py b/tests/functional/arm/tes= t_raspi2.py similarity index 100% rename from tests/functional/test_arm_raspi2.py rename to tests/functional/arm/test_raspi2.py diff --git a/tests/functional/test_arm_realview.py b/tests/functional/arm/t= est_realview.py similarity index 100% rename from tests/functional/test_arm_realview.py rename to tests/functional/arm/test_realview.py diff --git a/tests/functional/test_arm_replay.py b/tests/functional/arm/tes= t_replay.py similarity index 100% rename from tests/functional/test_arm_replay.py rename to tests/functional/arm/test_replay.py diff --git a/tests/functional/test_arm_smdkc210.py b/tests/functional/arm/t= est_smdkc210.py similarity index 100% rename from tests/functional/test_arm_smdkc210.py rename to tests/functional/arm/test_smdkc210.py diff --git a/tests/functional/test_arm_stellaris.py b/tests/functional/arm/= test_stellaris.py similarity index 100% rename from tests/functional/test_arm_stellaris.py rename to tests/functional/arm/test_stellaris.py diff --git a/tests/functional/test_arm_sx1.py b/tests/functional/arm/test_s= x1.py similarity index 100% rename from tests/functional/test_arm_sx1.py rename to tests/functional/arm/test_sx1.py diff --git a/tests/functional/test_arm_tuxrun.py b/tests/functional/arm/tes= t_tuxrun.py similarity index 100% rename from tests/functional/test_arm_tuxrun.py rename to tests/functional/arm/test_tuxrun.py diff --git a/tests/functional/test_arm_vexpress.py b/tests/functional/arm/t= est_vexpress.py similarity index 100% rename from tests/functional/test_arm_vexpress.py rename to tests/functional/arm/test_vexpress.py diff --git a/tests/functional/test_arm_virt.py b/tests/functional/arm/test_= virt.py similarity index 100% rename from tests/functional/test_arm_virt.py rename to tests/functional/arm/test_virt.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 77d8f4db808..708246b0d08 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -11,27 +11,7 @@ endif =20 subdir('aarch64') subdir('alpha') - -test_arm_timeouts =3D { - 'arm_aspeed_palmetto' : 120, - 'arm_aspeed_romulus' : 120, - 'arm_aspeed_witherspoon' : 120, - 'arm_aspeed_ast2500' : 720, - 'arm_aspeed_ast2600' : 1200, - 'arm_aspeed_bletchley' : 480, - 'arm_aspeed_catalina' : 480, - 'arm_aspeed_gb200nvl_bmc' : 480, - 'arm_aspeed_rainier' : 480, - 'arm_bpim2u' : 500, - 'arm_collie' : 180, - 'arm_cubieboard' : 360, - 'arm_orangepi' : 540, - 'arm_quanta_gsj' : 240, - 'arm_raspi2' : 120, - 'arm_replay' : 240, - 'arm_tuxrun' : 240, - 'arm_sx1' : 360, -} +subdir('arm') =20 test_mips_timeouts =3D { 'mips_malta' : 480, @@ -97,46 +77,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_arm_system_quick =3D [ - 'arm_migration', -] - -tests_arm_system_thorough =3D [ - 'arm_aspeed_ast1030', - 'arm_aspeed_palmetto', - 'arm_aspeed_romulus', - 'arm_aspeed_witherspoon', - 'arm_aspeed_ast2500', - 'arm_aspeed_ast2600', - 'arm_aspeed_bletchley', - 'arm_aspeed_catalina', - 'arm_aspeed_gb200nvl_bmc', - 'arm_aspeed_rainier', - 'arm_bpim2u', - 'arm_canona1100', - 'arm_collie', - 'arm_cubieboard', - 'arm_emcraft_sf2', - 'arm_integratorcp', - 'arm_max78000fthr', - 'arm_microbit', - 'arm_orangepi', - 'arm_quanta_gsj', - 'arm_raspi2', - 'arm_realview', - 'arm_replay', - 'arm_smdkc210', - 'arm_stellaris', - 'arm_sx1', - 'arm_vexpress', - 'arm_virt', - 'arm_tuxrun', -] - -tests_arm_linuxuser_thorough =3D [ - 'arm_bflt', -] - tests_avr_system_thorough =3D [ 'avr_mega2560', 'avr_uno', --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065856; cv=none; d=zohomail.com; s=zohoarc; b=HMEKKgH8GxnvqIL9+v5VunEgosKo+yhbcw+Be6cebidxGHipQPyjjYVmTMy6GL6mGGIPVX6mvffZYYA7hD7Uu+2HsUHika79D33k/dEXWkZ9pFtHqHuRdVvHrj4Dv7GyJW2e/9b+7WxH6EARztuqTFhIFj6llIboV8ENSejipN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065856; 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=rpnhCcwDIEBXn79ys7hzaKqw8+rprwSuWv6GxyAzUVU=; b=NBohSPDMTJkFNLfvF5dSIm6DDuX3wpt2qNkrMWweBxmS7tZ4vzIWLLLoC2d7wfYePpDe3BatzWoajCWKDE5/bXkU64V8vmhMaX4QrMor/l2HG26KiOM9liBVphl5QX15DhKHU+FRKY10eHGNE/MDEJ8RrCPxtTrAaR6epNDUsmw= 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 1754065856682333.1354957432385; Fri, 1 Aug 2025 09:30:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsUr-0006KJ-5h; Fri, 01 Aug 2025 12:20:41 -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 1uhrS6-0003ZW-37 for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:46 -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 1uhrS4-0002if-9v for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:45 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65-hdGXGKj6O1qTRM7EuJOUYQ-1; Fri, 01 Aug 2025 11:13:36 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0ED7A1801A02; Fri, 1 Aug 2025 15:13:24 +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 50CCB180035E; Fri, 1 Aug 2025 15:13:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061223; 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=rpnhCcwDIEBXn79ys7hzaKqw8+rprwSuWv6GxyAzUVU=; b=ErW9TIuQS+trFDdS5MdxiuL+ccP6gSJ98PkIsz8/YK/548xMyBuanIbiV3L83eqK7amKwf cxaG3hzIVaj4/25FXAPzgQNc1T81xh+O1ppXG5vIfCwSOLC2IfyMWxQGrHzUKeJJE8q8HQ aOCnaeKTVrMLNOiz27YjSJYxBrkow4Q= X-MC-Unique: hdGXGKj6O1qTRM7EuJOUYQ-1 X-Mimecast-MFC-AGG-ID: hdGXGKj6O1qTRM7EuJOUYQ_1754061215 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 08/24] tests/functional: Move avr tests into architecture specific folder Date: Fri, 1 Aug 2025 17:12:33 +0200 Message-ID: <20250801151251.751368-9-thuth@redhat.com> In-Reply-To: <20250801151251.751368-1-thuth@redhat.com> References: <20250801151251.751368-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.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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065859053124100 From: Thomas Huth The tests/functional folder has become quite crowded, thus move the avr tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 4 ++-- tests/functional/avr/meson.build | 6 ++++++ .../{test_avr_mega2560.py =3D> avr/test_mega2560.py} | 0 tests/functional/{test_avr_uno.py =3D> avr/test_uno.py} | 0 tests/functional/meson.build | 6 +----- 5 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 tests/functional/avr/meson.build rename tests/functional/{test_avr_mega2560.py =3D> avr/test_mega2560.py} (= 100%) rename tests/functional/{test_avr_uno.py =3D> avr/test_uno.py} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index fa7a0ee7e6e..0cfd12ec77e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -221,7 +221,7 @@ S: Maintained F: docs/system/target-avr.rst F: gdb-xml/avr-cpu.xml F: target/avr/ -F: tests/functional/test_avr_*.py +F: tests/functional/avr/ =20 Hexagon TCG CPUs M: Brian Cain @@ -1247,7 +1247,7 @@ Arduino M: Philippe Mathieu-Daud=C3=A9 S: Maintained F: hw/avr/arduino.c -F: tests/functional/test_avr_uno.py +F: tests/functional/avr/test_uno.py =20 HP-PARISC Machines ------------------ diff --git a/tests/functional/avr/meson.build b/tests/functional/avr/meson.= build new file mode 100644 index 00000000000..7a2cb7099e7 --- /dev/null +++ b/tests/functional/avr/meson.build @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_avr_system_thorough =3D [ + 'mega2560', + 'uno', +] diff --git a/tests/functional/test_avr_mega2560.py b/tests/functional/avr/t= est_mega2560.py similarity index 100% rename from tests/functional/test_avr_mega2560.py rename to tests/functional/avr/test_mega2560.py diff --git a/tests/functional/test_avr_uno.py b/tests/functional/avr/test_u= no.py similarity index 100% rename from tests/functional/test_avr_uno.py rename to tests/functional/avr/test_uno.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 708246b0d08..8b7b962d4d6 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -12,6 +12,7 @@ endif subdir('aarch64') subdir('alpha') subdir('arm') +subdir('avr') =20 test_mips_timeouts =3D { 'mips_malta' : 480, @@ -77,11 +78,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_avr_system_thorough =3D [ - 'avr_mega2560', - 'avr_uno', -] - tests_hppa_system_quick =3D [ 'hppa_seabios', ] --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065244; cv=none; d=zohomail.com; s=zohoarc; b=ZASrmk3MEtYtzcm6uW0YsMfCgHoSMOfSU6eforvRQRlMMm+M9ur1LGTCjonndvsaICAfG4IluyWDW50Tbj3bHd9rCxISaz4AaMJE0+n2YIMnIzi9Ns0g6IHrYPu0OVkb1tYgwWByAtkEJghlD5WBqez8w097/oYqz8wfWswQgII= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065244; 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=wQ7KrqKEGTDzG09G0HKW/4auocwmvv+XXAEfZJUK+Ew=; b=mW0ZxTqbt+IDcLFjUGQhpIZoTfuTs9Z6sRjh14x6CC/z1T7gZaqVcobSDtVo5QZucrZ/hZNvU7dnGMZIhU50iTrS7fwdYniYqyvo6ADAMyXk/wof0lM/Fe48v+6dcSy2gpe9jepm/hhAbCY3cvp26jRq0GPxC49RWzV8cvfh1qU= 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 1754065244223675.2956341367035; Fri, 1 Aug 2025 09:20:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsUe-0004YE-Uy; Fri, 01 Aug 2025 12:20:29 -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 1uhrS4-0003Oo-M0 for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:44 -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 1uhrS3-0002iM-3h for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:44 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-365-1u0nn6M9N1aVTEXRr4KWNQ-1; Fri, 01 Aug 2025 11:13:39 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 24C6018015E7; Fri, 1 Aug 2025 15:13:27 +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 0AD68180035E; Fri, 1 Aug 2025 15:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061222; 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=wQ7KrqKEGTDzG09G0HKW/4auocwmvv+XXAEfZJUK+Ew=; b=FdC0HcvE0a9ezsHQCzBFyxK0gtQfEHfkIQCLcUC8cAvWAZ6QRC/3DTMldG5Vq96tEm5tK4 xdUQEqGZfo9vP/LlsjOZ/iz3ZKlmTWTF246aSAKBUJY+7Pd/HhcxrGOYtM7zN2wuqMjS6o N4ohzfCKV/MNzpCPP1C9AaYXJDr8oe8= X-MC-Unique: 1u0nn6M9N1aVTEXRr4KWNQ-1 X-Mimecast-MFC-AGG-ID: 1u0nn6M9N1aVTEXRr4KWNQ_1754061215 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 09/24] tests/functional: Move hppa tests into architecture specific folder Date: Fri, 1 Aug 2025 17:12:34 +0200 Message-ID: <20250801151251.751368-10-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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065245579116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the avr tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- tests/functional/hppa/meson.build | 5 +++++ .../{test_hppa_seabios.py =3D> hppa/test_seabios.py} | 0 tests/functional/meson.build | 5 +---- 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 tests/functional/hppa/meson.build rename tests/functional/{test_hppa_seabios.py =3D> hppa/test_seabios.py} (= 100%) diff --git a/MAINTAINERS b/MAINTAINERS index 0cfd12ec77e..8d4881947ca 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1271,7 +1271,7 @@ F: include/hw/pci-host/astro.h F: include/hw/pci-host/dino.h F: pc-bios/hppa-firmware.img F: roms/seabios-hppa/ -F: tests/functional/test_hppa_seabios.py +F: tests/functional/hppa/test_seabios.py =20 LoongArch Machines ------------------ diff --git a/tests/functional/hppa/meson.build b/tests/functional/hppa/meso= n.build new file mode 100644 index 00000000000..a3348370884 --- /dev/null +++ b/tests/functional/hppa/meson.build @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_hppa_system_quick =3D [ + 'seabios', +] diff --git a/tests/functional/test_hppa_seabios.py b/tests/functional/hppa/= test_seabios.py similarity index 100% rename from tests/functional/test_hppa_seabios.py rename to tests/functional/hppa/test_seabios.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 8b7b962d4d6..99ffb1b0348 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -13,6 +13,7 @@ subdir('aarch64') subdir('alpha') subdir('arm') subdir('avr') +subdir('hppa') =20 test_mips_timeouts =3D { 'mips_malta' : 480, @@ -78,10 +79,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_hppa_system_quick =3D [ - 'hppa_seabios', -] - tests_i386_system_quick =3D [ 'i386_migration', ] --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065326; cv=none; d=zohomail.com; s=zohoarc; b=PLioDqa4WaAF4ywx+bNk7S5HNw5PCE5gHenyZhpBjalxszJChDIm0FP/eynfmSH+qgGyS4Nce7Gbi/4JiTPasQW+w2e/Xi5U1igDuQqzagzxAicKf8KIEcstu18zjrN4zMuSb0m4+vayX89L83oTdvJMOll6kQYKDU5N78DFHbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065326; 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=xPyLRCEchZuKSQe9gBn+rCXPcOdsz5BV7rzrR2JevRc=; b=CELDPnag+g6K1DPhgBfTvIt6KEjY4nBQ/wYydGoYkBqIYGGitGLI2FNPcX8n7Y4LSbUmOEDGh7nRGHfkVS2S6SIxkkIlnnzF19MB2Ejedw1hlqZUM/8DnXSDRrdq9B1z/3B39u3NgNED/Hdr/UuPLkt0CmtCRFonQed/PO9ZbLE= 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 1754065326845507.08701789060126; Fri, 1 Aug 2025 09:22:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsUl-0005NA-2A; Fri, 01 Aug 2025 12:20:35 -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 1uhrS5-0003YZ-Vg for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:46 -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 1uhrS4-0002ih-9E for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:45 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-399-31w5tGUGNiiIJfkpWeANOQ-1; Fri, 01 Aug 2025 11:13:37 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 040221800373; Fri, 1 Aug 2025 15:13:30 +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 D61061800D85; Fri, 1 Aug 2025 15:13:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061223; 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=xPyLRCEchZuKSQe9gBn+rCXPcOdsz5BV7rzrR2JevRc=; b=UGYgxpUA3VWhKYAYqzGSRwjuOXafG8wNcUXmZmAV7RwAjg9VjprEPygsTcko/JfmIIkHNQ xBeTQ9mMqlg84+gzXOfo75gRHqTJgDN770pD7c+mypmn1pHj/Dfi9PA2+Pa85+xVm+WZMv OrLBuh78edjcRyPVqndifp8X74Z6bE0= X-MC-Unique: 31w5tGUGNiiIJfkpWeANOQ-1 X-Mimecast-MFC-AGG-ID: 31w5tGUGNiiIJfkpWeANOQ_1754061216 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 10/24] tests/functional: Move i386 tests into architecture specific folder Date: Fri, 1 Aug 2025 17:12:35 +0200 Message-ID: <20250801151251.751368-11-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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065344661124100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the i386 tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- tests/functional/i386/meson.build | 10 ++++++++++ .../{test_i386_migration.py =3D> i386/test_migration.py} | 0 .../{test_i386_replay.py =3D> i386/test_replay.py} | 0 .../{test_i386_tuxrun.py =3D> i386/test_tuxrun.py} | 0 tests/functional/meson.build | 10 +--------- 6 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 tests/functional/i386/meson.build rename tests/functional/{test_i386_migration.py =3D> i386/test_migration.p= y} (100%) rename tests/functional/{test_i386_replay.py =3D> i386/test_replay.py} (10= 0%) rename tests/functional/{test_i386_tuxrun.py =3D> i386/test_tuxrun.py} (10= 0%) diff --git a/MAINTAINERS b/MAINTAINERS index 8d4881947ca..db89dd830b4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1888,7 +1888,7 @@ F: hw/isa/apm.c F: include/hw/isa/apm.h F: tests/unit/test-x86-topo.c F: tests/qtest/test-x86-cpuid-compat.c -F: tests/functional/test_i386_tuxrun.py +F: tests/functional/i386/test_tuxrun.py F: tests/functional/test_linux_initrd.py F: tests/functional/test_mem_addr_space.py F: tests/functional/test_pc_cpu_hotplug_props.py diff --git a/tests/functional/i386/meson.build b/tests/functional/i386/meso= n.build new file mode 100644 index 00000000000..23d8c216be7 --- /dev/null +++ b/tests/functional/i386/meson.build @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_i386_system_quick =3D [ + 'migration', +] + +tests_i386_system_thorough =3D [ + 'replay', + 'tuxrun', +] diff --git a/tests/functional/test_i386_migration.py b/tests/functional/i38= 6/test_migration.py similarity index 100% rename from tests/functional/test_i386_migration.py rename to tests/functional/i386/test_migration.py diff --git a/tests/functional/test_i386_replay.py b/tests/functional/i386/t= est_replay.py similarity index 100% rename from tests/functional/test_i386_replay.py rename to tests/functional/i386/test_replay.py diff --git a/tests/functional/test_i386_tuxrun.py b/tests/functional/i386/t= est_tuxrun.py similarity index 100% rename from tests/functional/test_i386_tuxrun.py rename to tests/functional/i386/test_tuxrun.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 99ffb1b0348..c72b17df1dd 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -14,6 +14,7 @@ subdir('alpha') subdir('arm') subdir('avr') subdir('hppa') +subdir('i386') =20 test_mips_timeouts =3D { 'mips_malta' : 480, @@ -79,15 +80,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_i386_system_quick =3D [ - 'i386_migration', -] - -tests_i386_system_thorough =3D [ - 'i386_replay', - 'i386_tuxrun', -] - tests_loongarch64_system_thorough =3D [ 'loongarch64_virt', ] --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065229; cv=none; d=zohomail.com; s=zohoarc; b=Z/Sx1zjACggsrhXZmn9XqGXFv5gVewE1e5EZNjFX8HS7g5rbxzS/fykJBO3YWgFeILY9S5oqdxOzzdt3gx/gyD0SunjVHrc5n5sF80ZPaKum4YUSJPq3KAbXedVy6RTPxMUBs5c9rHGdCNOIBEfhZjXsra7dnteGwRYEGPndj7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065229; 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=ZkBO2nsj/6LfUP1W8Cw1w1Pq0gLVnuyIUDtJHfg8odw=; b=gK3OHZXlaP9rEFx6wNL8ltcF8xSlqV8Rk3JOtnqzkSFsVu2X39pcIWgO90WABb/70JH8v2ywYt6GMhMrAmUWzuccZE5gzunAiLeTeBC1NtGK0i5xmdUdrTpXRGXa1QWi5P256Lke9PG5trWNJAQE1ACmV9HSC9nGayNDEJ73ROI= 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 1754065229628492.0786795333339; Fri, 1 Aug 2025 09:20:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsUD-0003H0-Ey; Fri, 01 Aug 2025 12:20:01 -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 1uhrS2-000341-Kq for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:42 -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 1uhrS0-0002hg-Vv for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:42 -0400 Received: from mx-prod-mc-01.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-580-EqgXv-MLO--KZBl0TiLqBA-1; Fri, 01 Aug 2025 11:13:34 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DBFFB195D020; Fri, 1 Aug 2025 15:13:32 +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 AFB401800B77; Fri, 1 Aug 2025 15:13:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061218; 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=ZkBO2nsj/6LfUP1W8Cw1w1Pq0gLVnuyIUDtJHfg8odw=; b=gdDpclCqwT/m/FJ2Y/X7nuYXsNdUKSwJmuQLhxD8sfbu1XigQCZ+H8Va90fkyvM7KsRrAa i0l4az3V4Ey+msroeykB1OkEkoKtguR79Z7yt27matGl19xfi9xZtQ5D4JwqWsvSPLIFpj 7Q/ncKEbcnziRjZONNRBOW8kNK7qvUo= X-MC-Unique: EqgXv-MLO--KZBl0TiLqBA-1 X-Mimecast-MFC-AGG-ID: EqgXv-MLO--KZBl0TiLqBA_1754061213 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 11/24] tests/functional: Move loongarch64 tests into architecture specific folder Date: Fri, 1 Aug 2025 17:12:36 +0200 Message-ID: <20250801151251.751368-12-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: 1754065231318116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the loongarch64 tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- tests/functional/loongarch64/meson.build | 5 +++++ .../{test_loongarch64_virt.py =3D> loongarch64/test_virt.py} | 0 tests/functional/meson.build | 5 +---- 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 tests/functional/loongarch64/meson.build rename tests/functional/{test_loongarch64_virt.py =3D> loongarch64/test_vi= rt.py} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index db89dd830b4..2065e73e155 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -257,7 +257,7 @@ M: Song Gao S: Maintained F: target/loongarch/ F: tests/tcg/loongarch64/ -F: tests/functional/test_loongarch64_virt.py +F: tests/functional/loongarch64/test_virt.py =20 M68K TCG CPUs M: Laurent Vivier diff --git a/tests/functional/loongarch64/meson.build b/tests/functional/lo= ongarch64/meson.build new file mode 100644 index 00000000000..d1687176a3d --- /dev/null +++ b/tests/functional/loongarch64/meson.build @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_loongarch64_system_thorough =3D [ + 'virt', +] diff --git a/tests/functional/test_loongarch64_virt.py b/tests/functional/l= oongarch64/test_virt.py similarity index 100% rename from tests/functional/test_loongarch64_virt.py rename to tests/functional/loongarch64/test_virt.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index c72b17df1dd..22b46ab34a2 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -15,6 +15,7 @@ subdir('arm') subdir('avr') subdir('hppa') subdir('i386') +subdir('loongarch64') =20 test_mips_timeouts =3D { 'mips_malta' : 480, @@ -80,10 +81,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_loongarch64_system_thorough =3D [ - 'loongarch64_virt', -] - tests_m68k_system_thorough =3D [ 'm68k_mcf5208evb', 'm68k_nextcube', --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065458; cv=none; d=zohomail.com; s=zohoarc; b=A9MaTB7DByyOuxb343x0d0pIiO4BKvaOE6MiqsYuKn0LQUIPIq8kj3Xd+ktCcsdthuRpkH06TwEQZHvs8xTc+HQLzgQMMp9XyI9xKllYphVJ2u5ome9XPxS7wt2+mxeH9RMXUBR3Lotvzhcyrz+3kgf45cLPieZZHPjx085Ckk0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065458; 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=R38dtNkMVxOq3rT4DTYArFyUO98peDtS5mO1SVK657M=; b=W+Xdvc5pxhpQ68PUPRqZidxYXAFgHwlv0LtASvMbbqkKS6a8DC00Y5bPdrDDLL5RPvvdEvOtdc2JmUhymqMtzBybS9wCO40CwLTpSfvzfgjCW9Dsh16Mawyqd/iFPJlASTA3y4u/4ymKWMZIYm8pqplCM0Zg35oPOkZCmBhT4Uo= 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 1754065458538767.7077974075562; Fri, 1 Aug 2025 09:24:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsVw-0007z2-DZ; Fri, 01 Aug 2025 12:21:52 -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 1uhrS9-0003u4-48 for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:49 -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 1uhrS7-0002jS-Aq for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:48 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-CyFar11eMoKNubUGH4EooQ-1; Fri, 01 Aug 2025 11:13:43 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 597BE180A247; Fri, 1 Aug 2025 15:13:36 +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 815D51800B4F; Fri, 1 Aug 2025 15:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061226; 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=R38dtNkMVxOq3rT4DTYArFyUO98peDtS5mO1SVK657M=; b=d7duJq+Xw4LDMQ/QT8wCx/XTR7iG7o8RfeE6kgApDq5/iT+9tvy5dyUIHUaLCJHccxxkoN Ouly8259Y3rYANA/dMhwfRnbFRMCuInMF4SG9zNybGvF6o7+NZHbwu30zj/JJyUlAmnhbu UMFF+KWksbMrYUjcIauYBuioI8yRj4I= X-MC-Unique: CyFar11eMoKNubUGH4EooQ-1 X-Mimecast-MFC-AGG-ID: CyFar11eMoKNubUGH4EooQ_1754061221 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 12/24] tests/functional: Move m68k tests into architecture specific folder Date: Fri, 1 Aug 2025 17:12:37 +0200 Message-ID: <20250801151251.751368-13-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065460814116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the m68k tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 8 ++++---- tests/functional/m68k/meson.build | 9 +++++++++ .../{test_m68k_mcf5208evb.py =3D> m68k/test_mcf5208evb.py} | 0 .../{test_m68k_nextcube.py =3D> m68k/test_nextcube.py} | 0 .../functional/{test_m68k_q800.py =3D> m68k/test_q800.py} | 0 .../{test_m68k_replay.py =3D> m68k/test_replay.py} | 0 .../{test_m68k_tuxrun.py =3D> m68k/test_tuxrun.py} | 0 tests/functional/meson.build | 9 +-------- 8 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 tests/functional/m68k/meson.build rename tests/functional/{test_m68k_mcf5208evb.py =3D> m68k/test_mcf5208evb= .py} (100%) rename tests/functional/{test_m68k_nextcube.py =3D> m68k/test_nextcube.py}= (100%) rename tests/functional/{test_m68k_q800.py =3D> m68k/test_q800.py} (100%) rename tests/functional/{test_m68k_replay.py =3D> m68k/test_replay.py} (10= 0%) rename tests/functional/{test_m68k_tuxrun.py =3D> m68k/test_tuxrun.py} (10= 0%) diff --git a/MAINTAINERS b/MAINTAINERS index 2065e73e155..5860922277e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1309,7 +1309,7 @@ F: hw/m68k/mcf_intc.c F: hw/char/mcf_uart.c F: hw/net/mcf_fec.c F: include/hw/m68k/mcf*.h -F: tests/functional/test_m68k_mcf5208evb.py +F: tests/functional/m68k/test_mcf5208evb.py =20 NeXTcube M: Thomas Huth @@ -1317,7 +1317,7 @@ S: Odd Fixes F: hw/m68k/next-*.c F: hw/display/next-fb.c F: include/hw/m68k/next-cube.h -F: tests/functional/test_m68k_nextcube.py +F: tests/functional/m68k/test_nextcube.py =20 q800 M: Laurent Vivier @@ -1343,7 +1343,7 @@ F: include/hw/m68k/q800-glue.h F: include/hw/misc/djmemc.h F: include/hw/misc/iosb.h F: include/hw/audio/asc.h -F: tests/functional/test_m68k_q800.py +F: tests/functional/m68k/test_q800.py =20 virt M: Laurent Vivier @@ -1358,7 +1358,7 @@ F: include/hw/intc/goldfish_pic.h F: include/hw/intc/m68k_irqc.h F: include/hw/misc/virt_ctrl.h F: docs/specs/virt-ctlr.rst -F: tests/functional/test_m68k_tuxrun.py +F: tests/functional/m68k/test_tuxrun.py =20 MicroBlaze Machines ------------------- diff --git a/tests/functional/m68k/meson.build b/tests/functional/m68k/meso= n.build new file mode 100644 index 00000000000..e29044a6d73 --- /dev/null +++ b/tests/functional/m68k/meson.build @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_m68k_system_thorough =3D [ + 'mcf5208evb', + 'nextcube', + 'replay', + 'q800', + 'tuxrun', +] diff --git a/tests/functional/test_m68k_mcf5208evb.py b/tests/functional/m6= 8k/test_mcf5208evb.py similarity index 100% rename from tests/functional/test_m68k_mcf5208evb.py rename to tests/functional/m68k/test_mcf5208evb.py diff --git a/tests/functional/test_m68k_nextcube.py b/tests/functional/m68k= /test_nextcube.py similarity index 100% rename from tests/functional/test_m68k_nextcube.py rename to tests/functional/m68k/test_nextcube.py diff --git a/tests/functional/test_m68k_q800.py b/tests/functional/m68k/tes= t_q800.py similarity index 100% rename from tests/functional/test_m68k_q800.py rename to tests/functional/m68k/test_q800.py diff --git a/tests/functional/test_m68k_replay.py b/tests/functional/m68k/t= est_replay.py similarity index 100% rename from tests/functional/test_m68k_replay.py rename to tests/functional/m68k/test_replay.py diff --git a/tests/functional/test_m68k_tuxrun.py b/tests/functional/m68k/t= est_tuxrun.py similarity index 100% rename from tests/functional/test_m68k_tuxrun.py rename to tests/functional/m68k/test_tuxrun.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 22b46ab34a2..cc81d40a314 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -16,6 +16,7 @@ subdir('avr') subdir('hppa') subdir('i386') subdir('loongarch64') +subdir('m68k') =20 test_mips_timeouts =3D { 'mips_malta' : 480, @@ -81,14 +82,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_m68k_system_thorough =3D [ - 'm68k_mcf5208evb', - 'm68k_nextcube', - 'm68k_replay', - 'm68k_q800', - 'm68k_tuxrun', -] - tests_microblaze_system_thorough =3D [ 'microblaze_replay', 'microblaze_s3adsp1800' --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065508; cv=none; d=zohomail.com; s=zohoarc; b=HRlRl3opFT8DY2FzI8TCmaUXSN6oOKvtA1m5D9Z5/oRhz3Pol1tqbexCnvkUAVbCUGjbd7I9CZnejfCkQI9fnF7t+emZOnOvVFUyobokJ+4lTjBWm5PfvZspyJgm0AAsPuO6KQaRwEK54fyLJkeSB7lBopgM5yZ1uWv2VM6AUww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065508; 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=pFRRAPD7J9bYzRMDMci0gEJxp+NnubUn3QJKLuRVcLw=; b=ST5xQLjk3ThFopDIrQuDrJKfve4J1LYJ9sxuFgbzliqY4jfV3SfISi/QRz25MomLK9C0tI3mNdqCtGuewuWcb5Y/ORGSFRvckoWGq2xq50fDbuIwz6Xq0onfRCr7H9BY5bMxqQUdDTihiTFUZ5btymNM4AVP0sdHlg61zzu5p7g= 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 1754065508957442.09407910433947; Fri, 1 Aug 2025 09:25:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsY8-0003dG-TV; Fri, 01 Aug 2025 12:24:05 -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 1uhrSC-0004TU-OS for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:52 -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 1uhrSA-0002js-QT for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:52 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-586-OtCA88bwPW6NJ0OCXH16DA-1; Fri, 01 Aug 2025 11:13:45 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3542E18015F7; Fri, 1 Aug 2025 15:13:39 +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 DCD2A180035E; Fri, 1 Aug 2025 15:13:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061229; 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=pFRRAPD7J9bYzRMDMci0gEJxp+NnubUn3QJKLuRVcLw=; b=MWxMVdGQOz6zpRzj+xYD8dUUlZtovBsYULZjkgQ8NHxkOL7tarKIS3jK+K7dzRqpHiditN rl8zaTWKA+wZP9xkRo2hpJ0XS60BfrYrk+HQ1O5pN5otIf+9TOnrg5P8ZEvQl4wFghsuvK ZaL7Y2URvaCZ6WCk8dEijA1rOwHhMgw= X-MC-Unique: OtCA88bwPW6NJ0OCXH16DA-1 X-Mimecast-MFC-AGG-ID: OtCA88bwPW6NJ0OCXH16DA_1754061221 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 13/24] tests/functional: Move microblaze tests into architecture specific folder Date: Fri, 1 Aug 2025 17:12:38 +0200 Message-ID: <20250801151251.751368-14-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065511710124100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the microblaze tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- tests/functional/meson.build | 11 ++--------- tests/functional/microblaze/meson.build | 6 ++++++ .../test_replay.py} | 0 .../test_s3adsp1800.py} | 0 tests/functional/microblazeel/meson.build | 5 +++++ .../test_s3adsp1800.py} | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 tests/functional/microblaze/meson.build rename tests/functional/{test_microblaze_replay.py =3D> microblaze/test_re= play.py} (100%) rename tests/functional/{test_microblaze_s3adsp1800.py =3D> microblaze/tes= t_s3adsp1800.py} (100%) create mode 100644 tests/functional/microblazeel/meson.build rename tests/functional/{test_microblazeel_s3adsp1800.py =3D> microblazeel= /test_s3adsp1800.py} (92%) diff --git a/MAINTAINERS b/MAINTAINERS index 5860922277e..7e2080faa5c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1367,7 +1367,7 @@ M: Edgar E. Iglesias S: Maintained F: hw/microblaze/petalogix_s3adsp1800_mmu.c F: include/hw/char/xilinx_uartlite.h -F: tests/functional/test_microblaze*.py +F: tests/functional/microblaze*/test_s3adsp1800.py =20 petalogix_ml605 M: Edgar E. Iglesias diff --git a/tests/functional/meson.build b/tests/functional/meson.build index cc81d40a314..fc15c261f7b 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -17,6 +17,8 @@ subdir('hppa') subdir('i386') subdir('loongarch64') subdir('m68k') +subdir('microblaze') +subdir('microblazeel') =20 test_mips_timeouts =3D { 'mips_malta' : 480, @@ -82,15 +84,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_microblaze_system_thorough =3D [ - 'microblaze_replay', - 'microblaze_s3adsp1800' -] - -tests_microblazeel_system_thorough =3D [ - 'microblazeel_s3adsp1800' -] - tests_mips_system_thorough =3D [ 'mips_malta', 'mips_replay', diff --git a/tests/functional/microblaze/meson.build b/tests/functional/mic= roblaze/meson.build new file mode 100644 index 00000000000..8069ca9be60 --- /dev/null +++ b/tests/functional/microblaze/meson.build @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_microblaze_system_thorough =3D [ + 'replay', + 's3adsp1800' +] diff --git a/tests/functional/test_microblaze_replay.py b/tests/functional/= microblaze/test_replay.py similarity index 100% rename from tests/functional/test_microblaze_replay.py rename to tests/functional/microblaze/test_replay.py diff --git a/tests/functional/test_microblaze_s3adsp1800.py b/tests/functio= nal/microblaze/test_s3adsp1800.py similarity index 100% rename from tests/functional/test_microblaze_s3adsp1800.py rename to tests/functional/microblaze/test_s3adsp1800.py diff --git a/tests/functional/microblazeel/meson.build b/tests/functional/m= icroblazeel/meson.build new file mode 100644 index 00000000000..27619dc5a9a --- /dev/null +++ b/tests/functional/microblazeel/meson.build @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_microblazeel_system_thorough =3D [ + 's3adsp1800' +] diff --git a/tests/functional/test_microblazeel_s3adsp1800.py b/tests/funct= ional/microblazeel/test_s3adsp1800.py similarity index 92% rename from tests/functional/test_microblazeel_s3adsp1800.py rename to tests/functional/microblazeel/test_s3adsp1800.py index 915902d48bd..75ce8856ed1 100755 --- a/tests/functional/test_microblazeel_s3adsp1800.py +++ b/tests/functional/microblazeel/test_s3adsp1800.py @@ -7,7 +7,7 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 -from test_microblaze_s3adsp1800 import MicroblazeMachine +from microblaze.test_s3adsp1800 import MicroblazeMachine =20 =20 class MicroblazeLittleEndianMachine(MicroblazeMachine): --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065458; cv=none; d=zohomail.com; s=zohoarc; b=nKwoXjgFCw41e4iMbVxB/66sF+EgHQWEGTbweV6s2rka5mFSlQlg71586BfJ2Fgw4JGQel9NSBpFOsHMgwD5HgtFg21NJOTKwaou9kmbik/WxwCnUtHUaBh7NpkUt4wqBHbtvbLjD6t9WJMWO07/Ywu0ScwmWKnLa0EyLnFqwds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065458; 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=fj6j6q8hV3UH5vAhO+mE9KE+7lEYiDcKXUwnBowiEeY=; b=Nhb0PEr+7lhzSLgX/K+Z0kOoIR2ZayrzKm5KyHLX8v9y8SEg36DAyW6ctGBR/tzwLPDt6kERBvxs5v0/VJp7sXMS0V29auv8ePyjTEGrEyPxEgnN1oc7GQxNM7qUziSuVqdLFaZkQ6pxfpF6rfMpNdF+DZKAKJhru3YTl7BdZ10= 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 1754065458620816.936041789016; Fri, 1 Aug 2025 09:24:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsUo-00061e-CV; Fri, 01 Aug 2025 12:20:39 -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 1uhrSF-00055N-Ni for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:55 -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 1uhrSD-0002kQ-GS for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:55 -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-339-3dKmTcfRN0K8Kj8elOr1Bw-1; Fri, 01 Aug 2025 11:13:46 -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 B86FB19773E9; Fri, 1 Aug 2025 15:13:42 +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 2A9B51800D85; Fri, 1 Aug 2025 15:13:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061232; 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=fj6j6q8hV3UH5vAhO+mE9KE+7lEYiDcKXUwnBowiEeY=; b=dHxoaBe5kDQMVjWKa6LW7GcjMVg3DrggRdF7IAb7nED/AODt+pnOBUu2EZty+Za2aojbuh 1do5C9yYJlIGpfgNX/lG95NQQbLwj/GBzRyXQYCWf6rGyTH8Q/d40Gf2BOeFzhqq+G6Iz9 /BD0R1Ve+mmeB7Mrly9onBeHVUEnkBY= X-MC-Unique: 3dKmTcfRN0K8Kj8elOr1Bw-1 X-Mimecast-MFC-AGG-ID: 3dKmTcfRN0K8Kj8elOr1Bw_1754061222 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 14/24] tests/functional: Move mips tests into target-specific folders Date: Fri, 1 Aug 2025 17:12:39 +0200 Message-ID: <20250801151251.751368-15-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.129.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: 1754065461563124100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the mips tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 8 ++-- tests/functional/meson.build | 47 ++----------------- tests/functional/mips/meson.build | 11 +++++ .../test_malta.py} | 0 .../test_replay.py} | 0 .../test_tuxrun.py} | 0 tests/functional/mips64/meson.build | 10 ++++ .../test_malta.py} | 2 +- .../test_tuxrun.py} | 0 tests/functional/mips64el/meson.build | 14 ++++++ .../test_fuloong2e.py} | 0 .../test_loongson3v.py} | 0 .../test_malta.py} | 4 +- .../test_replay.py} | 0 .../test_tuxrun.py} | 0 tests/functional/mipsel/meson.build | 12 +++++ .../test_malta.py} | 2 +- .../test_replay.py} | 0 .../test_tuxrun.py} | 0 19 files changed, 59 insertions(+), 51 deletions(-) create mode 100644 tests/functional/mips/meson.build rename tests/functional/{test_mips_malta.py =3D> mips/test_malta.py} (100%) rename tests/functional/{test_mips_replay.py =3D> mips/test_replay.py} (10= 0%) rename tests/functional/{test_mips_tuxrun.py =3D> mips/test_tuxrun.py} (10= 0%) create mode 100644 tests/functional/mips64/meson.build rename tests/functional/{test_mips64_malta.py =3D> mips64/test_malta.py} (= 96%) rename tests/functional/{test_mips64_tuxrun.py =3D> mips64/test_tuxrun.py}= (100%) create mode 100644 tests/functional/mips64el/meson.build rename tests/functional/{test_mips64el_fuloong2e.py =3D> mips64el/test_ful= oong2e.py} (100%) rename tests/functional/{test_mips64el_loongson3v.py =3D> mips64el/test_lo= ongson3v.py} (100%) rename tests/functional/{test_mips64el_malta.py =3D> mips64el/test_malta.p= y} (98%) rename tests/functional/{test_mips64el_replay.py =3D> mips64el/test_replay= .py} (100%) rename tests/functional/{test_mips64el_tuxrun.py =3D> mips64el/test_tuxrun= .py} (100%) create mode 100644 tests/functional/mipsel/meson.build rename tests/functional/{test_mipsel_malta.py =3D> mipsel/test_malta.py} (= 98%) rename tests/functional/{test_mipsel_replay.py =3D> mipsel/test_replay.py}= (100%) mode change 100644 =3D> 100755 rename tests/functional/{test_mipsel_tuxrun.py =3D> mipsel/test_tuxrun.py}= (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 7e2080faa5c..56e430db153 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1403,8 +1403,8 @@ F: hw/acpi/piix4.c F: hw/mips/malta.c F: hw/pci-host/gt64120.c F: include/hw/southbridge/piix.h -F: tests/functional/test_mips*_malta.py -F: tests/functional/test_mips*_tuxrun.py +F: tests/functional/mips*/test_malta.py +F: tests/functional/mips*/test_tuxrun.py =20 Mipssim R: Aleksandar Rikalo @@ -1420,7 +1420,7 @@ S: Odd Fixes F: hw/mips/fuloong2e.c F: hw/pci-host/bonito.c F: include/hw/pci-host/bonito.h -F: tests/functional/test_mips64el_fuloong2e.py +F: tests/functional/mips64el/test_fuloong2e.py =20 Loongson-3 virtual platforms M: Huacai Chen @@ -1435,7 +1435,7 @@ F: hw/mips/loongson3_virt.c F: include/hw/intc/loongson_ipi_common.h F: include/hw/intc/loongson_ipi.h F: include/hw/intc/loongson_liointc.h -F: tests/functional/test_mips64el_loongson3v.py +F: tests/functional/mips64el/test_loongson3v.py =20 Boston M: Paul Burton diff --git a/tests/functional/meson.build b/tests/functional/meson.build index fc15c261f7b..586f3dc6cac 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -19,24 +19,10 @@ subdir('loongarch64') subdir('m68k') subdir('microblaze') subdir('microblazeel') - -test_mips_timeouts =3D { - 'mips_malta' : 480, -} - -test_mipsel_timeouts =3D { - 'mipsel_malta' : 420, - 'mipsel_replay' : 480, -} - -test_mips64_timeouts =3D { - 'mips64_malta' : 240, -} - -test_mips64el_timeouts =3D { - 'mips64el_malta' : 420, - 'mips64el_replay' : 180, -} +subdir('mips') +subdir('mipsel') +subdir('mips64') +subdir('mips64el') =20 test_ppc_timeouts =3D { 'ppc_40p' : 240, @@ -84,31 +70,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_mips_system_thorough =3D [ - 'mips_malta', - 'mips_replay', - 'mips_tuxrun', -] - -tests_mipsel_system_thorough =3D [ - 'mipsel_malta', - 'mipsel_replay', - 'mipsel_tuxrun', -] - -tests_mips64_system_thorough =3D [ - 'mips64_malta', - 'mips64_tuxrun', -] - -tests_mips64el_system_thorough =3D [ - 'mips64el_fuloong2e', - 'mips64el_loongson3v', - 'mips64el_malta', - 'mips64el_replay', - 'mips64el_tuxrun', -] - tests_or1k_system_thorough =3D [ 'or1k_replay', 'or1k_sim', diff --git a/tests/functional/mips/meson.build b/tests/functional/mips/meso= n.build new file mode 100644 index 00000000000..49aaf53b02d --- /dev/null +++ b/tests/functional/mips/meson.build @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_mips_timeouts =3D { + 'malta' : 480, +} + +tests_mips_system_thorough =3D [ + 'malta', + 'replay', + 'tuxrun', +] diff --git a/tests/functional/test_mips_malta.py b/tests/functional/mips/te= st_malta.py similarity index 100% rename from tests/functional/test_mips_malta.py rename to tests/functional/mips/test_malta.py diff --git a/tests/functional/test_mips_replay.py b/tests/functional/mips/t= est_replay.py similarity index 100% rename from tests/functional/test_mips_replay.py rename to tests/functional/mips/test_replay.py diff --git a/tests/functional/test_mips_tuxrun.py b/tests/functional/mips/t= est_tuxrun.py similarity index 100% rename from tests/functional/test_mips_tuxrun.py rename to tests/functional/mips/test_tuxrun.py diff --git a/tests/functional/mips64/meson.build b/tests/functional/mips64/= meson.build new file mode 100644 index 00000000000..3ff21189879 --- /dev/null +++ b/tests/functional/mips64/meson.build @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_mips64_timeouts =3D { + 'malta' : 240, +} + +tests_mips64_system_thorough =3D [ + 'malta', + 'tuxrun', +] diff --git a/tests/functional/test_mips64_malta.py b/tests/functional/mips6= 4/test_malta.py similarity index 96% rename from tests/functional/test_mips64_malta.py rename to tests/functional/mips64/test_malta.py index 53c3e0c1221..a553d3c5bc7 100755 --- a/tests/functional/test_mips64_malta.py +++ b/tests/functional/mips64/test_malta.py @@ -5,7 +5,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later =20 from qemu_test import LinuxKernelTest, Asset -from test_mips_malta import mips_check_wheezy +from mips.test_malta import mips_check_wheezy =20 =20 class MaltaMachineConsole(LinuxKernelTest): diff --git a/tests/functional/test_mips64_tuxrun.py b/tests/functional/mips= 64/test_tuxrun.py similarity index 100% rename from tests/functional/test_mips64_tuxrun.py rename to tests/functional/mips64/test_tuxrun.py diff --git a/tests/functional/mips64el/meson.build b/tests/functional/mips6= 4el/meson.build new file mode 100644 index 00000000000..69ec50174c4 --- /dev/null +++ b/tests/functional/mips64el/meson.build @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_mips64el_timeouts =3D { + 'malta' : 420, + 'replay' : 180, +} + +tests_mips64el_system_thorough =3D [ + 'fuloong2e', + 'loongson3v', + 'malta', + 'replay', + 'tuxrun', +] diff --git a/tests/functional/test_mips64el_fuloong2e.py b/tests/functional= /mips64el/test_fuloong2e.py similarity index 100% rename from tests/functional/test_mips64el_fuloong2e.py rename to tests/functional/mips64el/test_fuloong2e.py diff --git a/tests/functional/test_mips64el_loongson3v.py b/tests/functiona= l/mips64el/test_loongson3v.py similarity index 100% rename from tests/functional/test_mips64el_loongson3v.py rename to tests/functional/mips64el/test_loongson3v.py diff --git a/tests/functional/test_mips64el_malta.py b/tests/functional/mip= s64el/test_malta.py similarity index 98% rename from tests/functional/test_mips64el_malta.py rename to tests/functional/mips64el/test_malta.py index 3cc79b74c18..8fdc49b3005 100755 --- a/tests/functional/test_mips64el_malta.py +++ b/tests/functional/mips64el/test_malta.py @@ -16,7 +16,7 @@ from qemu_test import exec_command_and_wait_for_pattern from qemu_test import skipIfMissingImports, skipFlakyTest, skipUntrustedTe= st =20 -from test_mips_malta import mips_check_wheezy +from mips.test_malta import mips_check_wheezy =20 =20 class MaltaMachineConsole(LinuxKernelTest): @@ -191,7 +191,7 @@ def test_mips_malta_i6400_framebuffer_logo_8cores(self): self.do_test_i6400_framebuffer_logo(8) =20 =20 -from test_mipsel_malta import MaltaMachineYAMON +from mipsel.test_malta import MaltaMachineYAMON =20 if __name__ =3D=3D '__main__': LinuxKernelTest.main() diff --git a/tests/functional/test_mips64el_replay.py b/tests/functional/mi= ps64el/test_replay.py similarity index 100% rename from tests/functional/test_mips64el_replay.py rename to tests/functional/mips64el/test_replay.py diff --git a/tests/functional/test_mips64el_tuxrun.py b/tests/functional/mi= ps64el/test_tuxrun.py similarity index 100% rename from tests/functional/test_mips64el_tuxrun.py rename to tests/functional/mips64el/test_tuxrun.py diff --git a/tests/functional/mipsel/meson.build b/tests/functional/mipsel/= meson.build new file mode 100644 index 00000000000..8bfdf0649b5 --- /dev/null +++ b/tests/functional/mipsel/meson.build @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_mipsel_timeouts =3D { + 'malta' : 420, + 'replay' : 480, +} + +tests_mipsel_system_thorough =3D [ + 'malta', + 'replay', + 'tuxrun', +] diff --git a/tests/functional/test_mipsel_malta.py b/tests/functional/mipse= l/test_malta.py similarity index 98% rename from tests/functional/test_mipsel_malta.py rename to tests/functional/mipsel/test_malta.py index 9ee2884da8e..427e163d19d 100755 --- a/tests/functional/test_mipsel_malta.py +++ b/tests/functional/mipsel/test_malta.py @@ -13,7 +13,7 @@ from qemu_test import interrupt_interactive_console_until_pattern from qemu_test import wait_for_console_pattern =20 -from test_mips_malta import mips_check_wheezy +from mips.test_malta import mips_check_wheezy =20 =20 class MaltaMachineConsole(LinuxKernelTest): diff --git a/tests/functional/test_mipsel_replay.py b/tests/functional/mips= el/test_replay.py old mode 100644 new mode 100755 similarity index 100% rename from tests/functional/test_mipsel_replay.py rename to tests/functional/mipsel/test_replay.py diff --git a/tests/functional/test_mipsel_tuxrun.py b/tests/functional/mips= el/test_tuxrun.py similarity index 100% rename from tests/functional/test_mipsel_tuxrun.py rename to tests/functional/mipsel/test_tuxrun.py --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065836; cv=none; d=zohomail.com; s=zohoarc; b=hY4cb3ZmpS+2Gu1MvHZSfezU8RSijd/UyiE+PZ1wpPyD/Gq1HclCTNjV1mu6Fl9PytPd9w6wa1TORQVL0fficYUMm+60TZCQtRgomf2MtfLcOFaXRv6WBN0tRL6wJKzlUngxBu7wWY3Us7oxvq6wHSt5hfxF97uhBpz1Z5kOL/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065836; 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=m3w6m9Ne+lmaK5GR3tcjGylbUwOlD6+g4phTVoQsrw0=; b=A1vQwfjNnp5CvzwOasiFJd7huB5t0Qgp6tzuXjZnkzv7Nw6k1uA7iCBRfpS5AK4sBhg6Qf4jzthnJTp35z8sfmGIK00737NE6F/p8efQtgyHXiIIRO3gQ7NQTwxO/rLLaY2fVo58PrPkX4cKnDnX19mOLKcERQ5nVq3xyB05m24= 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 1754065836262257.7968259407098; Fri, 1 Aug 2025 09:30:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsUr-0006Gy-2h; Fri, 01 Aug 2025 12:20:41 -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 1uhrSD-0004cR-Ar for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:53 -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 1uhrSB-0002k5-J0 for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:53 -0400 Received: from mx-prod-mc-01.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-581-G0IH9VzyO1u9Q8zpfTOFpQ-1; Fri, 01 Aug 2025 11:13:48 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5AFD4195D002; Fri, 1 Aug 2025 15:13:46 +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 78CDA1800B6A; Fri, 1 Aug 2025 15:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061230; 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=m3w6m9Ne+lmaK5GR3tcjGylbUwOlD6+g4phTVoQsrw0=; b=WQCfqFESImBZ36XZpTyq836Z9Z2J12CR9xY5J2FIVD/mFsm9aWMr675VYNNfFAokzQsJPs wJUgKD7CmB2oykzMJM8hF5nKUiqNYWCp2nnTMiXueE2KaDDK4XzY12+OmWC399TFOuuAWW 1TnjxfW9EAex5POidKszMsyfAiJbADE= X-MC-Unique: G0IH9VzyO1u9Q8zpfTOFpQ-1 X-Mimecast-MFC-AGG-ID: G0IH9VzyO1u9Q8zpfTOFpQ_1754061226 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 15/24] tests/functional: Move or1k tests into target-specific folders Date: Fri, 1 Aug 2025 17:12:40 +0200 Message-ID: <20250801151251.751368-16-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.129.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: 1754065838810124100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the openrisc tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- tests/functional/meson.build | 6 +----- tests/functional/or1k/meson.build | 6 ++++++ .../functional/{test_or1k_replay.py =3D> or1k/test_replay.py} | 0 tests/functional/{test_or1k_sim.py =3D> or1k/test_sim.py} | 0 5 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 tests/functional/or1k/meson.build rename tests/functional/{test_or1k_replay.py =3D> or1k/test_replay.py} (10= 0%) rename tests/functional/{test_or1k_sim.py =3D> or1k/test_sim.py} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 56e430db153..db0cc7de6cb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1454,7 +1454,7 @@ S: Maintained F: docs/system/openrisc/or1k-sim.rst F: hw/intc/ompic.c F: hw/openrisc/openrisc_sim.c -F: tests/functional/test_or1k_sim.py +F: tests/functional/or1k/test_sim.py =20 PowerPC Machines ---------------- diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 586f3dc6cac..e5e3d1667b8 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -23,6 +23,7 @@ subdir('mips') subdir('mipsel') subdir('mips64') subdir('mips64el') +subdir('or1k') =20 test_ppc_timeouts =3D { 'ppc_40p' : 240, @@ -70,11 +71,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_or1k_system_thorough =3D [ - 'or1k_replay', - 'or1k_sim', -] - tests_ppc_system_quick =3D [ 'ppc_migration', 'ppc_74xx', diff --git a/tests/functional/or1k/meson.build b/tests/functional/or1k/meso= n.build new file mode 100644 index 00000000000..e246e2ab08d --- /dev/null +++ b/tests/functional/or1k/meson.build @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_or1k_system_thorough =3D [ + 'replay', + 'sim', +] diff --git a/tests/functional/test_or1k_replay.py b/tests/functional/or1k/t= est_replay.py similarity index 100% rename from tests/functional/test_or1k_replay.py rename to tests/functional/or1k/test_replay.py diff --git a/tests/functional/test_or1k_sim.py b/tests/functional/or1k/test= _sim.py similarity index 100% rename from tests/functional/test_or1k_sim.py rename to tests/functional/or1k/test_sim.py --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065270; cv=none; d=zohomail.com; s=zohoarc; b=SzX2D52l5S/wkQPGFtIhZcMD8a8IUvpP2RBADbrDmTXALc5q7K8N5L5I0uYarfHVM8lPiXrmhQY0MHqoFKl9u9gIudoViqcX1Qcrt4C6OfdCqcxcVv0dxGN8laBHaR8lnfM0VSYaKynrNEveIvv+tu/jAwKCZnCQZLoZbvk+0+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065270; 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=KWa/jRwvlQMtpKGYMonPBuwG3wZ2fEIL8batErtgn0M=; b=CuDQcChRN8cRv+G0fK44MYPkjaVrlnjxNBx/0BhHchMRZRnu6+43Px7QQEX9WzRK+z138H12Btt2BIdeSJz5astyZJOg8cFofhC+nbDP2DoHq5cNbs9afdYquV/aQj/eLNVwLtz25e9Kmi0yaoim28qoONHE6ik+WyBL76N6UzA= 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 1754065270940400.39636364068235; Fri, 1 Aug 2025 09:21:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsUw-0006lY-KX; Fri, 01 Aug 2025 12:20:49 -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 1uhrSG-00058P-4u for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:58 -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 1uhrSD-0002kT-K7 for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:13:55 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-663-Rl21HIGJNuiDLUEcPPK9Gw-1; Fri, 01 Aug 2025 11:13:51 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 763EF180028F; Fri, 1 Aug 2025 15:13:49 +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 20D811800B4F; Fri, 1 Aug 2025 15:13:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061232; 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=KWa/jRwvlQMtpKGYMonPBuwG3wZ2fEIL8batErtgn0M=; b=Tz3DUTcfHYuZvjBz0ALPZWmr9/2TEIrs6qWjn/AtAQUpNdbvASfJ9VPDxu427D4Dwck8k1 Xt+E4GAbL22mXZIGRcqKkrNkhXRvjN6jKQlOLFQz3i8I5Y/GR3DpEWShSQ/tHrxcNSm+uV bhPmkUW4vcSosouaVqSOl3AaQMSsbVg= X-MC-Unique: Rl21HIGJNuiDLUEcPPK9Gw-1 X-Mimecast-MFC-AGG-ID: Rl21HIGJNuiDLUEcPPK9Gw_1754061229 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 16/24] tests/functional: Move ppc/ppc64 tests into target-specific folders Date: Fri, 1 Aug 2025 17:12:41 +0200 Message-ID: <20250801151251.751368-17-thuth@redhat.com> In-Reply-To: <20250801151251.751368-1-thuth@redhat.com> References: <20250801151251.751368-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.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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065273863124100 From: Thomas Huth The tests/functional folder has become quite crowded, thus move the ppc and ppc64 tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 32 ++++++------- tests/functional/meson.build | 47 +------------------ tests/functional/ppc/meson.build | 22 +++++++++ .../{test_ppc_40p.py =3D> ppc/test_40p.py} | 0 .../{test_ppc_74xx.py =3D> ppc/test_74xx.py} | 0 .../{test_ppc_amiga.py =3D> ppc/test_amiga.py} | 0 .../test_bamboo.py} | 0 .../{test_ppc_mac.py =3D> ppc/test_mac.py} | 0 .../test_migration.py} | 0 .../test_mpc8544ds.py} | 0 .../test_replay.py} | 0 .../test_sam460ex.py} | 0 .../test_tuxrun.py} | 0 .../test_virtex_ml507.py} | 0 tests/functional/ppc64/meson.build | 25 ++++++++++ .../test_e500.py} | 0 .../{test_ppc64_hv.py =3D> ppc64/test_hv.py} | 0 .../test_mac99.py} | 0 .../test_migration.py} | 0 .../test_powernv.py} | 0 .../test_pseries.py} | 0 .../test_replay.py} | 0 .../test_reverse_debug.py} | 0 .../test_tuxrun.py} | 0 24 files changed, 65 insertions(+), 61 deletions(-) create mode 100644 tests/functional/ppc/meson.build rename tests/functional/{test_ppc_40p.py =3D> ppc/test_40p.py} (100%) rename tests/functional/{test_ppc_74xx.py =3D> ppc/test_74xx.py} (100%) rename tests/functional/{test_ppc_amiga.py =3D> ppc/test_amiga.py} (100%) rename tests/functional/{test_ppc_bamboo.py =3D> ppc/test_bamboo.py} (100%) rename tests/functional/{test_ppc_mac.py =3D> ppc/test_mac.py} (100%) rename tests/functional/{test_ppc_migration.py =3D> ppc/test_migration.py}= (100%) rename tests/functional/{test_ppc_mpc8544ds.py =3D> ppc/test_mpc8544ds.py}= (100%) rename tests/functional/{test_ppc_replay.py =3D> ppc/test_replay.py} (100%) rename tests/functional/{test_ppc_sam460ex.py =3D> ppc/test_sam460ex.py} (= 100%) mode change 100644 =3D> 100755 rename tests/functional/{test_ppc_tuxrun.py =3D> ppc/test_tuxrun.py} (100%) rename tests/functional/{test_ppc_virtex_ml507.py =3D> ppc/test_virtex_ml5= 07.py} (100%) create mode 100644 tests/functional/ppc64/meson.build rename tests/functional/{test_ppc64_e500.py =3D> ppc64/test_e500.py} (100%) rename tests/functional/{test_ppc64_hv.py =3D> ppc64/test_hv.py} (100%) rename tests/functional/{test_ppc64_mac99.py =3D> ppc64/test_mac99.py} (10= 0%) rename tests/functional/{test_ppc64_migration.py =3D> ppc64/test_migration= .py} (100%) rename tests/functional/{test_ppc64_powernv.py =3D> ppc64/test_powernv.py}= (100%) rename tests/functional/{test_ppc64_pseries.py =3D> ppc64/test_pseries.py}= (100%) rename tests/functional/{test_ppc64_replay.py =3D> ppc64/test_replay.py} (= 100%) rename tests/functional/{test_ppc64_reverse_debug.py =3D> ppc64/test_rever= se_debug.py} (100%) rename tests/functional/{test_ppc64_tuxrun.py =3D> ppc64/test_tuxrun.py} (= 100%) diff --git a/MAINTAINERS b/MAINTAINERS index db0cc7de6cb..09e31ca1af8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -309,7 +309,7 @@ F: configs/devices/ppc* F: docs/system/ppc/embedded.rst F: docs/system/target-ppc.rst F: tests/tcg/ppc*/* -F: tests/functional/test_ppc_74xx.py +F: tests/functional/ppc/test_74xx.py =20 RISC-V TCG CPUs M: Palmer Dabbelt @@ -1463,7 +1463,7 @@ L: qemu-ppc@nongnu.org S: Orphan F: hw/ppc/ppc440_bamboo.c F: hw/pci-host/ppc4xx_pci.c -F: tests/functional/test_ppc_bamboo.py +F: tests/functional/ppc/test_bamboo.py =20 e500 M: Bernhard Beschow @@ -1481,8 +1481,8 @@ F: pc-bios/u-boot.e500 F: hw/intc/openpic_kvm.c F: include/hw/ppc/openpic_kvm.h F: docs/system/ppc/ppce500.rst -F: tests/functional/test_ppc64_e500.py -F: tests/functional/test_ppc_tuxrun.py +F: tests/functional/ppc64/test_e500.py +F: tests/functional/ppc/test_tuxrun.py =20 mpc8544ds M: Bernhard Beschow @@ -1490,7 +1490,7 @@ L: qemu-ppc@nongnu.org S: Odd Fixes F: hw/ppc/mpc8544ds.c F: hw/ppc/mpc8544_guts.c -F: tests/functional/test_ppc_mpc8544ds.py +F: tests/functional/ppc/test_mpc8544ds.py =20 New World (mac99) M: Mark Cave-Ayland @@ -1512,8 +1512,8 @@ F: include/hw/ppc/mac_dbdma.h F: include/hw/pci-host/uninorth.h F: include/hw/input/adb* F: pc-bios/qemu_vga.ndrv -F: tests/functional/test_ppc_mac.py -F: tests/functional/test_ppc64_mac99.py +F: tests/functional/ppc/test_mac.py +F: tests/functional/ppc64/test_mac99.py =20 Old World (g3beige) M: Mark Cave-Ayland @@ -1529,7 +1529,7 @@ F: include/hw/intc/heathrow_pic.h F: include/hw/input/adb* F: include/hw/pci-host/grackle.h F: pc-bios/qemu_vga.ndrv -F: tests/functional/test_ppc_mac.py +F: tests/functional/ppc/test_mac.py =20 PReP M: Herv=C3=A9 Poussineau @@ -1546,7 +1546,7 @@ F: hw/dma/i82374.c F: hw/rtc/m48t59-isa.c F: include/hw/isa/pc87312.h F: include/hw/rtc/m48t59.h -F: tests/functional/test_ppc_40p.py +F: tests/functional/ppc/test_40p.py =20 sPAPR (pseries) M: Nicholas Piggin @@ -1569,9 +1569,9 @@ F: tests/qtest/spapr* F: tests/qtest/libqos/*spapr* F: tests/qtest/rtas* F: tests/qtest/libqos/rtas* -F: tests/functional/test_ppc64_pseries.py -F: tests/functional/test_ppc64_hv.py -F: tests/functional/test_ppc64_tuxrun.py +F: tests/functional/ppc64/test_pseries.py +F: tests/functional/ppc64/test_hv.py +F: tests/functional/ppc64/test_tuxrun.py =20 PowerNV (Non-Virtualized) M: Nicholas Piggin @@ -1590,7 +1590,7 @@ F: include/hw/ssi/pnv_spi* F: pc-bios/skiboot.lid F: pc-bios/pnv-pnor.bin F: tests/qtest/pnv* -F: tests/functional/test_ppc64_powernv.py +F: tests/functional/ppc64/test_powernv.py =20 pca955x M: Glenn Miles @@ -1605,7 +1605,7 @@ M: Edgar E. Iglesias L: qemu-ppc@nongnu.org S: Odd Fixes F: hw/ppc/virtex_ml507.c -F: tests/functional/test_ppc_virtex_ml507.py +F: tests/functional/ppc/test_virtex_ml507.py =20 sam460ex M: BALATON Zoltan @@ -1621,7 +1621,7 @@ F: pc-bios/dtb/canyonlands.dt[sb] F: pc-bios/u-boot-sam460ex-20100605.bin F: roms/u-boot-sam460ex F: docs/system/ppc/amigang.rst -F: tests/functional/test_ppc_sam460ex.py +F: tests/functional/ppc/test_sam460ex.py =20 pegasos2 M: BALATON Zoltan @@ -1639,7 +1639,7 @@ S: Maintained F: hw/ppc/amigaone.c F: hw/pci-host/articia.c F: include/hw/pci-host/articia.h -F: tests/functional/test_ppc_amiga.py +F: tests/functional/ppc/test_amiga.py =20 Virtual Open Firmware (VOF) M: Alexey Kardashevskiy diff --git a/tests/functional/meson.build b/tests/functional/meson.build index e5e3d1667b8..cc0e0bc6e0c 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -24,19 +24,8 @@ subdir('mipsel') subdir('mips64') subdir('mips64el') subdir('or1k') - -test_ppc_timeouts =3D { - 'ppc_40p' : 240, -} - -test_ppc64_timeouts =3D { - 'ppc64_hv' : 1000, - 'ppc64_powernv' : 480, - 'ppc64_pseries' : 480, - 'ppc64_replay' : 210, - 'ppc64_tuxrun' : 420, - 'ppc64_mac99' : 120, -} +subdir('ppc') +subdir('ppc64') =20 test_riscv64_timeouts =3D { 'riscv64_tuxrun' : 120, @@ -71,38 +60,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_ppc_system_quick =3D [ - 'ppc_migration', - 'ppc_74xx', -] - -tests_ppc_system_thorough =3D [ - 'ppc_40p', - 'ppc_amiga', - 'ppc_bamboo', - 'ppc_mac', - 'ppc_mpc8544ds', - 'ppc_replay', - 'ppc_sam460ex', - 'ppc_tuxrun', - 'ppc_virtex_ml507', -] - -tests_ppc64_system_quick =3D [ - 'ppc64_migration', -] - -tests_ppc64_system_thorough =3D [ - 'ppc64_e500', - 'ppc64_hv', - 'ppc64_powernv', - 'ppc64_pseries', - 'ppc64_replay', - 'ppc64_reverse_debug', - 'ppc64_tuxrun', - 'ppc64_mac99', -] - tests_riscv32_system_quick =3D [ 'riscv32_migration', 'riscv_opensbi', diff --git a/tests/functional/ppc/meson.build b/tests/functional/ppc/meson.= build new file mode 100644 index 00000000000..3d562010d8c --- /dev/null +++ b/tests/functional/ppc/meson.build @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_ppc_timeouts =3D { + '40p' : 240, +} + +tests_ppc_system_quick =3D [ + 'migration', + '74xx', +] + +tests_ppc_system_thorough =3D [ + '40p', + 'amiga', + 'bamboo', + 'mac', + 'mpc8544ds', + 'replay', + 'sam460ex', + 'tuxrun', + 'virtex_ml507', +] diff --git a/tests/functional/test_ppc_40p.py b/tests/functional/ppc/test_4= 0p.py similarity index 100% rename from tests/functional/test_ppc_40p.py rename to tests/functional/ppc/test_40p.py diff --git a/tests/functional/test_ppc_74xx.py b/tests/functional/ppc/test_= 74xx.py similarity index 100% rename from tests/functional/test_ppc_74xx.py rename to tests/functional/ppc/test_74xx.py diff --git a/tests/functional/test_ppc_amiga.py b/tests/functional/ppc/test= _amiga.py similarity index 100% rename from tests/functional/test_ppc_amiga.py rename to tests/functional/ppc/test_amiga.py diff --git a/tests/functional/test_ppc_bamboo.py b/tests/functional/ppc/tes= t_bamboo.py similarity index 100% rename from tests/functional/test_ppc_bamboo.py rename to tests/functional/ppc/test_bamboo.py diff --git a/tests/functional/test_ppc_mac.py b/tests/functional/ppc/test_m= ac.py similarity index 100% rename from tests/functional/test_ppc_mac.py rename to tests/functional/ppc/test_mac.py diff --git a/tests/functional/test_ppc_migration.py b/tests/functional/ppc/= test_migration.py similarity index 100% rename from tests/functional/test_ppc_migration.py rename to tests/functional/ppc/test_migration.py diff --git a/tests/functional/test_ppc_mpc8544ds.py b/tests/functional/ppc/= test_mpc8544ds.py similarity index 100% rename from tests/functional/test_ppc_mpc8544ds.py rename to tests/functional/ppc/test_mpc8544ds.py diff --git a/tests/functional/test_ppc_replay.py b/tests/functional/ppc/tes= t_replay.py similarity index 100% rename from tests/functional/test_ppc_replay.py rename to tests/functional/ppc/test_replay.py diff --git a/tests/functional/test_ppc_sam460ex.py b/tests/functional/ppc/t= est_sam460ex.py old mode 100644 new mode 100755 similarity index 100% rename from tests/functional/test_ppc_sam460ex.py rename to tests/functional/ppc/test_sam460ex.py diff --git a/tests/functional/test_ppc_tuxrun.py b/tests/functional/ppc/tes= t_tuxrun.py similarity index 100% rename from tests/functional/test_ppc_tuxrun.py rename to tests/functional/ppc/test_tuxrun.py diff --git a/tests/functional/test_ppc_virtex_ml507.py b/tests/functional/p= pc/test_virtex_ml507.py similarity index 100% rename from tests/functional/test_ppc_virtex_ml507.py rename to tests/functional/ppc/test_virtex_ml507.py diff --git a/tests/functional/ppc64/meson.build b/tests/functional/ppc64/me= son.build new file mode 100644 index 00000000000..842fe0fc715 --- /dev/null +++ b/tests/functional/ppc64/meson.build @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_ppc64_timeouts =3D { + 'hv' : 1000, + 'mac99' : 120, + 'powernv' : 480, + 'pseries' : 480, + 'replay' : 210, + 'tuxrun' : 420, +} + +tests_ppc64_system_quick =3D [ + 'migration', +] + +tests_ppc64_system_thorough =3D [ + 'e500', + 'hv', + 'mac99', + 'powernv', + 'pseries', + 'replay', + 'reverse_debug', + 'tuxrun', +] diff --git a/tests/functional/test_ppc64_e500.py b/tests/functional/ppc64/t= est_e500.py similarity index 100% rename from tests/functional/test_ppc64_e500.py rename to tests/functional/ppc64/test_e500.py diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/ppc64/tes= t_hv.py similarity index 100% rename from tests/functional/test_ppc64_hv.py rename to tests/functional/ppc64/test_hv.py diff --git a/tests/functional/test_ppc64_mac99.py b/tests/functional/ppc64/= test_mac99.py similarity index 100% rename from tests/functional/test_ppc64_mac99.py rename to tests/functional/ppc64/test_mac99.py diff --git a/tests/functional/test_ppc64_migration.py b/tests/functional/pp= c64/test_migration.py similarity index 100% rename from tests/functional/test_ppc64_migration.py rename to tests/functional/ppc64/test_migration.py diff --git a/tests/functional/test_ppc64_powernv.py b/tests/functional/ppc6= 4/test_powernv.py similarity index 100% rename from tests/functional/test_ppc64_powernv.py rename to tests/functional/ppc64/test_powernv.py diff --git a/tests/functional/test_ppc64_pseries.py b/tests/functional/ppc6= 4/test_pseries.py similarity index 100% rename from tests/functional/test_ppc64_pseries.py rename to tests/functional/ppc64/test_pseries.py diff --git a/tests/functional/test_ppc64_replay.py b/tests/functional/ppc64= /test_replay.py similarity index 100% rename from tests/functional/test_ppc64_replay.py rename to tests/functional/ppc64/test_replay.py diff --git a/tests/functional/test_ppc64_reverse_debug.py b/tests/functiona= l/ppc64/test_reverse_debug.py similarity index 100% rename from tests/functional/test_ppc64_reverse_debug.py rename to tests/functional/ppc64/test_reverse_debug.py diff --git a/tests/functional/test_ppc64_tuxrun.py b/tests/functional/ppc64= /test_tuxrun.py similarity index 100% rename from tests/functional/test_ppc64_tuxrun.py rename to tests/functional/ppc64/test_tuxrun.py --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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 Reviewed-by: Pierrick Bouvier --- 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 From nobody Sat Nov 15 06:33:15 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=1754065483; cv=none; d=zohomail.com; s=zohoarc; b=HrkDm47SjJgCjyZB7vlTSxCmL8+ijKm+OAY2dMxpgBphVIP+YQ0ZF4rT5tOr7yWaBc8zwoUkVstIS/DwFdcfBRo8CJCjxv7/WoLXyU24dKPKFIOmo0fOG/OARWWX7iPNc15oA96rjhleAmZipVGPofJLtDljZvI9nkfDFfLxEOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065483; 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=pf4bGSr5xr6kmyWNB1BQAp0uzDh5O8kPXQvkokxGK9k=; b=UArIQv1KarVWUC/WnjflI7POLzh5OZK2M3TzWhmaSSmeb2ZAMocGKCWA3IjDbellZosVioJMSdsw6fDgGZWG9YZ1PIRSNgsQMydhVNgUP9+ELysc6pkVohx/KAbgglGI6i1HKziuadGUhnSREluvlyzEVZYj/9Cv7twrDrn9LYM= 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 17540654838513.3517290956793886; Fri, 1 Aug 2025 09:24:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsWw-00019P-IP; Fri, 01 Aug 2025 12:22:51 -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 1uhrSM-0005oX-6g for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:03 -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 1uhrSK-0002m9-MC for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:01 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-552-ctDbHBBoOWS3dolWG9M1mA-1; Fri, 01 Aug 2025 11:13:57 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C3E361800873; Fri, 1 Aug 2025 15:13:55 +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 53F1F1800B4F; Fri, 1 Aug 2025 15:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061240; 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=pf4bGSr5xr6kmyWNB1BQAp0uzDh5O8kPXQvkokxGK9k=; b=X4LfNd/Wa9dS329TiGVkvjzk5hPkkqWZCX2YcYWekN6ImPQfMQ17ju78TX5JoAl/DZrnWF kaGXWb7IuhHZDc47PGYyNtWlJquDwMUIJgjrOAloERZc/BR8Lp2eBeC4uToGzuwyGxyT2l u5DaaRTnV1yXRYpCdp5iy7VHwPg5ft0= X-MC-Unique: ctDbHBBoOWS3dolWG9M1mA-1 X-Mimecast-MFC-AGG-ID: ctDbHBBoOWS3dolWG9M1mA_1754061235 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 18/24] tests/functional: Move rx test into target-specific folders Date: Fri, 1 Aug 2025 17:12:43 +0200 Message-ID: <20250801151251.751368-19-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065484904116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth Move the architecture specific test into an architecture specific subdirectory. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- tests/functional/meson.build | 5 +---- tests/functional/rx/meson.build | 5 +++++ tests/functional/{test_rx_gdbsim.py =3D> rx/test_gdbsim.py} | 0 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 tests/functional/rx/meson.build rename tests/functional/{test_rx_gdbsim.py =3D> rx/test_gdbsim.py} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index ee26bb82b58..d26210ee896 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1717,7 +1717,7 @@ R: Yoshinori Sato S: Orphan F: docs/system/target-rx.rst F: hw/rx/rx-gdbsim.c -F: tests/functional/test_rx_gdbsim.py +F: tests/functional/rx/test_gdbsim.py =20 SH4 Machines ------------ diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 2d8f67fd94f..7e7a6aa0c93 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -28,6 +28,7 @@ subdir('ppc') subdir('ppc64') subdir('riscv32') subdir('riscv64') +subdir('rx') =20 test_s390x_timeouts =3D { 's390x_ccw_virtio' : 420, @@ -58,10 +59,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_rx_system_thorough =3D [ - 'rx_gdbsim', -] - tests_s390x_system_thorough =3D [ 's390x_ccw_virtio', 's390x_pxelinux', diff --git a/tests/functional/rx/meson.build b/tests/functional/rx/meson.bu= ild new file mode 100644 index 00000000000..6af83a9f23f --- /dev/null +++ b/tests/functional/rx/meson.build @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_rx_system_thorough =3D [ + 'gdbsim', +] diff --git a/tests/functional/test_rx_gdbsim.py b/tests/functional/rx/test_= gdbsim.py similarity index 100% rename from tests/functional/test_rx_gdbsim.py rename to tests/functional/rx/test_gdbsim.py --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065495; cv=none; d=zohomail.com; s=zohoarc; b=KO7ozRvh2sZJJhQKSeJ6NFLNPjJ2rlkW7vuytjf3pLGNmpR9qU3D40v8c1zCKuFHgrYdiF587/3gqFB8O7LqW6kYcjxGPW3+WKSBTsUNTmAl56XuieG+tXKMtg1qC0rtpdN0ULQQMpHeJKsQSbir76Iu/458ahbFgM7ZlzHoLF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065495; 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=WY+vIyltFkXlD9WKFeA6xg0izmMlzUPBGOzQOV4g7Zc=; b=kdy6GAq9hpXdPj6vGFUfgNsybAXIBceQ6AQTfZxHVOEq624Rek8MtAzHlg1Rz+8xMs69vtV8tLROEMo4qwnuHKEikQWta66/5o2+NYBlLxeihLn5IgHlc+RvutPqY05KD1TyyWuzgIKghtZfQCwWNDx44pSfpT6C8xPIJBUY6Ks= 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 1754065495980812.972111885804; Fri, 1 Aug 2025 09:24:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsYY-0004yB-1d; Fri, 01 Aug 2025 12:24:30 -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 1uhrST-0006Wp-DB for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:10 -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 1uhrSR-0002nE-8a for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:09 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-464-Vn8bz_WmM8KtU97IbD2q_g-1; Fri, 01 Aug 2025 11:14:02 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5FCFD180034A; Fri, 1 Aug 2025 15:13:59 +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 8ED161800B4F; Fri, 1 Aug 2025 15:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061246; 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=WY+vIyltFkXlD9WKFeA6xg0izmMlzUPBGOzQOV4g7Zc=; b=FKQOONTTdmBpf8DKzmmiNMNZngK79xW9tMZJe1aJbD33Mb1dsJMGJSffCgDYZod1ADhini VRmk59zLUFg6c/DNsQndtrHpa0rLbYOpHML/ER/DNKiYcL5Mzx+99c3N2nwaGXlVkDfzxd wHwAPm4555IXjwS/hcIfrf5X/+aT0Ho= X-MC-Unique: Vn8bz_WmM8KtU97IbD2q_g-1 X-Mimecast-MFC-AGG-ID: Vn8bz_WmM8KtU97IbD2q_g_1754061239 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 19/24] tests/functional: Move s390x tests into target-specific folders Date: Fri, 1 Aug 2025 17:12:44 +0200 Message-ID: <20250801151251.751368-20-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065497251116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the s390x tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 6 +++--- tests/functional/meson.build | 13 +------------ tests/functional/s390x/meson.build | 13 +++++++++++++ .../test_ccw_virtio.py} | 0 .../test_pxelinux.py} | 0 .../{test_s390x_replay.py =3D> s390x/test_replay.py} | 0 .../test_topology.py} | 0 .../{test_s390x_tuxrun.py =3D> s390x/test_tuxrun.py} | 0 8 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 tests/functional/s390x/meson.build rename tests/functional/{test_s390x_ccw_virtio.py =3D> s390x/test_ccw_virt= io.py} (100%) rename tests/functional/{test_s390x_pxelinux.py =3D> s390x/test_pxelinux.p= y} (100%) rename tests/functional/{test_s390x_replay.py =3D> s390x/test_replay.py} (= 100%) rename tests/functional/{test_s390x_topology.py =3D> s390x/test_topology.p= y} (100%) rename tests/functional/{test_s390x_tuxrun.py =3D> s390x/test_tuxrun.py} (= 100%) diff --git a/MAINTAINERS b/MAINTAINERS index d26210ee896..1f6b85ee132 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1793,7 +1793,7 @@ S: Supported F: hw/s390x/ F: include/hw/s390x/ F: configs/devices/s390x-softmmu/default.mak -F: tests/functional/test_s390x_* +F: tests/functional/s390x T: git https://github.com/borntraeger/qemu.git s390-next L: qemu-s390x@nongnu.org =20 @@ -1807,7 +1807,7 @@ F: hw/s390x/ipl.* F: pc-bios/s390-ccw/ F: pc-bios/s390-ccw.img F: docs/devel/s390-dasd-ipl.rst -F: tests/functional/test_s390x_pxelinux.py +F: tests/functional/s390x/test_pxelinux.py T: git https://github.com/borntraeger/qemu.git s390-next L: qemu-s390x@nongnu.org =20 @@ -1861,7 +1861,7 @@ F: hw/s390x/cpu-topology.c F: target/s390x/kvm/stsi-topology.c F: docs/devel/s390-cpu-topology.rst F: docs/system/s390x/cpu-topology.rst -F: tests/functional/test_s390x_topology.py +F: tests/functional/s390x/test_topology.py =20 X86 Machines ------------ diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 7e7a6aa0c93..abaa4e00fca 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -29,10 +29,7 @@ subdir('ppc64') subdir('riscv32') subdir('riscv64') subdir('rx') - -test_s390x_timeouts =3D { - 's390x_ccw_virtio' : 420, -} +subdir('s390x') =20 test_sh4_timeouts =3D { 'sh4_tuxrun' : 240, @@ -59,14 +56,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_s390x_system_thorough =3D [ - 's390x_ccw_virtio', - 's390x_pxelinux', - 's390x_replay', - 's390x_topology', - 's390x_tuxrun', -] - tests_sh4_system_thorough =3D [ 'sh4_r2d', 'sh4_tuxrun', diff --git a/tests/functional/s390x/meson.build b/tests/functional/s390x/me= son.build new file mode 100644 index 00000000000..030b116039c --- /dev/null +++ b/tests/functional/s390x/meson.build @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_s390x_timeouts =3D { + 'ccw_virtio' : 420, +} + +tests_s390x_system_thorough =3D [ + 'ccw_virtio', + 'pxelinux', + 'replay', + 'topology', + 'tuxrun', +] diff --git a/tests/functional/test_s390x_ccw_virtio.py b/tests/functional/s= 390x/test_ccw_virtio.py similarity index 100% rename from tests/functional/test_s390x_ccw_virtio.py rename to tests/functional/s390x/test_ccw_virtio.py diff --git a/tests/functional/test_s390x_pxelinux.py b/tests/functional/s39= 0x/test_pxelinux.py similarity index 100% rename from tests/functional/test_s390x_pxelinux.py rename to tests/functional/s390x/test_pxelinux.py diff --git a/tests/functional/test_s390x_replay.py b/tests/functional/s390x= /test_replay.py similarity index 100% rename from tests/functional/test_s390x_replay.py rename to tests/functional/s390x/test_replay.py diff --git a/tests/functional/test_s390x_topology.py b/tests/functional/s39= 0x/test_topology.py similarity index 100% rename from tests/functional/test_s390x_topology.py rename to tests/functional/s390x/test_topology.py diff --git a/tests/functional/test_s390x_tuxrun.py b/tests/functional/s390x= /test_tuxrun.py similarity index 100% rename from tests/functional/test_s390x_tuxrun.py rename to tests/functional/s390x/test_tuxrun.py --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065663; cv=none; d=zohomail.com; s=zohoarc; b=J7OPnbpa6t0EW8PxRwjDcWGxTV3zPb7HsPvAb0khXNQ3gPEw6vMN/AnYEKyrHoTw7ycQDmFijLPi+uAVcqnQjZUptAP5uguKjV1bud3TfTT3LKPyckl5mxvrahwnv+RUj/eVLNu3WCLrsXZCBVlDQGDEzodAAfY7LIwQawW3qiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065663; 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=oipK1OeC3bdbJFBzivehJS+QgomO99gXEYY97DjM9B8=; b=NdAc+PFN1Yf6kL+wCrviZqa+Dl7RKHM/mkvBxJahJb0SYk7Noow8sceJ8gyezFf6R/y39sZvWXDyy3JsOXmaix82oUDKmxfn8AmD7sFuPnu3Ey2HEHvnbsUu3CEtl5pdxp70EKgPj9Mp0Y8HM9vKSPdHSe+ZfgXPxcTHBS1MXv0= 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 1754065663248715.836561166885; Fri, 1 Aug 2025 09:27:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsZw-00025J-TE; Fri, 01 Aug 2025 12:25:56 -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 1uhrST-0006Ub-4i for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:09 -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 1uhrSR-0002nC-7X for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:08 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-638-tJio6C2ZN-uUJFUlBfG99Q-1; Fri, 01 Aug 2025 11:14:03 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DE33F1800261; Fri, 1 Aug 2025 15:14:01 +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 EB7B8180035E; Fri, 1 Aug 2025 15:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061246; 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=oipK1OeC3bdbJFBzivehJS+QgomO99gXEYY97DjM9B8=; b=hwKz6z+wlnHbh3M3rNJow27ukYz9iQCZXuAXV4z/gsP6XWw/Y/PFfIGW/PlyLbEZmzSw4/ 2mMTFkR2s6f5WLO1UpM2hpr0OBBFcjE165pRwLzdCX0/ypr516dVWC4vsU0mw0yzZzEz0Z RnKnfLbLb6k+sFq0RuK8YplSi8sIGOY= X-MC-Unique: tJio6C2ZN-uUJFUlBfG99Q-1 X-Mimecast-MFC-AGG-ID: tJio6C2ZN-uUJFUlBfG99Q_1754061242 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 20/24] tests/functional: Move sh4/sh4eb tests into target-specific folders Date: Fri, 1 Aug 2025 17:12:45 +0200 Message-ID: <20250801151251.751368-21-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065665482124100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the sh4 tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 4 ++-- tests/functional/meson.build | 15 ++------------- tests/functional/sh4/meson.build | 10 ++++++++++ .../{test_sh4_r2d.py =3D> sh4/test_r2d.py} | 0 .../{test_sh4_tuxrun.py =3D> sh4/test_tuxrun.py} | 0 tests/functional/sh4eb/meson.build | 5 +++++ .../{test_sh4eb_r2d.py =3D> sh4eb/test_r2d.py} | 0 7 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 tests/functional/sh4/meson.build rename tests/functional/{test_sh4_r2d.py =3D> sh4/test_r2d.py} (100%) rename tests/functional/{test_sh4_tuxrun.py =3D> sh4/test_tuxrun.py} (100%) create mode 100644 tests/functional/sh4eb/meson.build rename tests/functional/{test_sh4eb_r2d.py =3D> sh4eb/test_r2d.py} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1f6b85ee132..a0174fca572 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1732,8 +1732,8 @@ F: hw/pci-host/sh_pci.c F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h F: include/hw/timer/tmu012.h -F: tests/functional/test_sh4*_r2d.py -F: tests/functional/test_sh4_tuxrun.py +F: tests/functional/sh4*/test_r2d.py +F: tests/functional/sh4/test_tuxrun.py =20 SPARC Machines -------------- diff --git a/tests/functional/meson.build b/tests/functional/meson.build index abaa4e00fca..ce713509e32 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -30,10 +30,8 @@ subdir('riscv32') subdir('riscv64') subdir('rx') subdir('s390x') - -test_sh4_timeouts =3D { - 'sh4_tuxrun' : 240, -} +subdir('sh4') +subdir('sh4eb') =20 test_x86_64_timeouts =3D { 'acpi_bits' : 420, @@ -56,15 +54,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_sh4_system_thorough =3D [ - 'sh4_r2d', - 'sh4_tuxrun', -] - -tests_sh4eb_system_thorough =3D [ - 'sh4eb_r2d', -] - tests_sparc_system_quick =3D [ 'sparc_migration', ] diff --git a/tests/functional/sh4/meson.build b/tests/functional/sh4/meson.= build new file mode 100644 index 00000000000..56f824e1e71 --- /dev/null +++ b/tests/functional/sh4/meson.build @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_sh4_timeouts =3D { + 'tuxrun' : 240, +} + +tests_sh4_system_thorough =3D [ + 'r2d', + 'tuxrun', +] diff --git a/tests/functional/test_sh4_r2d.py b/tests/functional/sh4/test_r= 2d.py similarity index 100% rename from tests/functional/test_sh4_r2d.py rename to tests/functional/sh4/test_r2d.py diff --git a/tests/functional/test_sh4_tuxrun.py b/tests/functional/sh4/tes= t_tuxrun.py similarity index 100% rename from tests/functional/test_sh4_tuxrun.py rename to tests/functional/sh4/test_tuxrun.py diff --git a/tests/functional/sh4eb/meson.build b/tests/functional/sh4eb/me= son.build new file mode 100644 index 00000000000..25e9a6e4041 --- /dev/null +++ b/tests/functional/sh4eb/meson.build @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_sh4eb_system_thorough =3D [ + 'r2d', +] diff --git a/tests/functional/test_sh4eb_r2d.py b/tests/functional/sh4eb/te= st_r2d.py similarity index 100% rename from tests/functional/test_sh4eb_r2d.py rename to tests/functional/sh4eb/test_r2d.py --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065541; cv=none; d=zohomail.com; s=zohoarc; b=Annv0YyoZf/1D8ZKePYooNxFR98UgjkCBXgVASa17svGaM4XxLdXF37gfPXhQgx2EpQspOxBc1qaH+E99JiaDQvXlYUsO6gDUEAWM05aLgpixU+vBSzCZDuROf0Trugo93jVrReU3vkcojTqnSOC3hrhTLu0oovmgpik3+h2DH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065541; 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=AZ49i/jqv2pl58RbAqwjGbyzX8Ybj0CT/9A7EcWYeRc=; b=Xizbln87YZaTCPqFMLVS5wrIW5Rk/+KGWjE6AiU/ZN71UVCdoYjh28D4/sTZ1eTbQpgk7UatnLeHB1hqCNoUf485+qzSWxDi42isCAu8+b+hSjerULpWIV8iwY/DUopXUzeCcTh3bG3dySmn10RVU1VcSpcu9aK2PdRSyYHZzuQ= 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 SMTP id 1754065541015903.1058074652403; Fri, 1 Aug 2025 09:25:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsYY-0004yK-2B; Fri, 01 Aug 2025 12:24:30 -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 1uhrSW-0006nP-A8 for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:12 -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 1uhrSU-0002nx-Ej for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:12 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-LkWERfZ0M8ekc0E-mKPKoA-1; Fri, 01 Aug 2025 11:14:06 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 46FFC180036E; Fri, 1 Aug 2025 15:14:05 +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 707431800B4F; Fri, 1 Aug 2025 15:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061249; 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=AZ49i/jqv2pl58RbAqwjGbyzX8Ybj0CT/9A7EcWYeRc=; b=AbbmoBpu8UuTrd82rZlyP8BT7D4xE2LWqSphf1En5FRjUGMw3e+5lH8MsmhebrCGphaaSR uYUxOhhU6S1afk/ET2SQFHKrC8fSRCshxRkp+iDnRTmztHFhEYpAiLDvSYYG1HUuuIoJ2y fWEhrZXn/0mDDpCtEa/0fNVqk9V+uDM= X-MC-Unique: LkWERfZ0M8ekc0E-mKPKoA-1 X-Mimecast-MFC-AGG-ID: LkWERfZ0M8ekc0E-mKPKoA_1754061245 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 21/24] tests/functional: Move sparc/sparc64 tests into target-specific folders Date: Fri, 1 Aug 2025 17:12:46 +0200 Message-ID: <20250801151251.751368-22-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065542010124100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the sparc tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 6 +++--- tests/functional/meson.build | 20 ++----------------- tests/functional/sparc/meson.build | 10 ++++++++++ .../test_migration.py} | 0 .../test_replay.py} | 0 .../test_sun4m.py} | 0 tests/functional/sparc64/meson.build | 10 ++++++++++ .../test_migration.py} | 0 .../test_sun4u.py} | 0 .../test_tuxrun.py} | 0 10 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 tests/functional/sparc/meson.build rename tests/functional/{test_sparc_migration.py =3D> sparc/test_migration= .py} (100%) rename tests/functional/{test_sparc_replay.py =3D> sparc/test_replay.py} (= 100%) rename tests/functional/{test_sparc_sun4m.py =3D> sparc/test_sun4m.py} (10= 0%) create mode 100644 tests/functional/sparc64/meson.build rename tests/functional/{test_sparc64_migration.py =3D> sparc64/test_migra= tion.py} (100%) rename tests/functional/{test_sparc64_sun4u.py =3D> sparc64/test_sun4u.py}= (100%) rename tests/functional/{test_sparc64_tuxrun.py =3D> sparc64/test_tuxrun.p= y} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index a0174fca572..1a9fd4a03f2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1751,7 +1751,7 @@ F: include/hw/nvram/sun_nvram.h F: include/hw/sparc/sparc32_dma.h F: include/hw/sparc/sun4m_iommu.h F: pc-bios/openbios-sparc32 -F: tests/functional/test_sparc_sun4m.py +F: tests/functional/sparc/test_sun4m.py =20 Sun4u M: Mark Cave-Ayland @@ -1764,8 +1764,8 @@ F: include/hw/pci-host/sabre.h F: hw/pci-bridge/simba.c F: include/hw/pci-bridge/simba.h F: pc-bios/openbios-sparc64 -F: tests/functional/test_sparc64_sun4u.py -F: tests/functional/test_sparc64_tuxrun.py +F: tests/functional/sparc64/test_sun4u.py +F: tests/functional/sparc64/test_tuxrun.py =20 Sun4v M: Artyom Tarasenko diff --git a/tests/functional/meson.build b/tests/functional/meson.build index ce713509e32..00d18dba3ce 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -32,6 +32,8 @@ subdir('rx') subdir('s390x') subdir('sh4') subdir('sh4eb') +subdir('sparc') +subdir('sparc64') =20 test_x86_64_timeouts =3D { 'acpi_bits' : 420, @@ -54,24 +56,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_sparc_system_quick =3D [ - 'sparc_migration', -] - -tests_sparc_system_thorough =3D [ - 'sparc_replay', - 'sparc_sun4m', -] - -tests_sparc64_system_quick =3D [ - 'sparc64_migration', -] - -tests_sparc64_system_thorough =3D [ - 'sparc64_sun4u', - 'sparc64_tuxrun', -] - tests_x86_64_system_quick =3D [ 'cpu_queries', 'mem_addr_space', diff --git a/tests/functional/sparc/meson.build b/tests/functional/sparc/me= son.build new file mode 100644 index 00000000000..88732becd81 --- /dev/null +++ b/tests/functional/sparc/meson.build @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_sparc_system_quick =3D [ + 'migration', +] + +tests_sparc_system_thorough =3D [ + 'replay', + 'sun4m', +] diff --git a/tests/functional/test_sparc_migration.py b/tests/functional/sp= arc/test_migration.py similarity index 100% rename from tests/functional/test_sparc_migration.py rename to tests/functional/sparc/test_migration.py diff --git a/tests/functional/test_sparc_replay.py b/tests/functional/sparc= /test_replay.py similarity index 100% rename from tests/functional/test_sparc_replay.py rename to tests/functional/sparc/test_replay.py diff --git a/tests/functional/test_sparc_sun4m.py b/tests/functional/sparc/= test_sun4m.py similarity index 100% rename from tests/functional/test_sparc_sun4m.py rename to tests/functional/sparc/test_sun4m.py diff --git a/tests/functional/sparc64/meson.build b/tests/functional/sparc6= 4/meson.build new file mode 100644 index 00000000000..2e04e7d4f3d --- /dev/null +++ b/tests/functional/sparc64/meson.build @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_sparc64_system_quick =3D [ + 'migration', +] + +tests_sparc64_system_thorough =3D [ + 'sun4u', + 'tuxrun', +] diff --git a/tests/functional/test_sparc64_migration.py b/tests/functional/= sparc64/test_migration.py similarity index 100% rename from tests/functional/test_sparc64_migration.py rename to tests/functional/sparc64/test_migration.py diff --git a/tests/functional/test_sparc64_sun4u.py b/tests/functional/spar= c64/test_sun4u.py similarity index 100% rename from tests/functional/test_sparc64_sun4u.py rename to tests/functional/sparc64/test_sun4u.py diff --git a/tests/functional/test_sparc64_tuxrun.py b/tests/functional/spa= rc64/test_tuxrun.py similarity index 100% rename from tests/functional/test_sparc64_tuxrun.py rename to tests/functional/sparc64/test_tuxrun.py --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065836; cv=none; d=zohomail.com; s=zohoarc; b=EunIyOuK1JakWjPMZ8Rp94nCVowI6Igp/KNmkGVV+V15Y0rtJ7KPQQ8b8puOmSZ/3F66TY75bYYX58wrS/ZwYZEX9NWTK4GEbJ6mzY/vdf2pKuYhUumEf338wgnLSX12V1Gpwguv2AeQB7XNpUEbNxcMKE5Fao9n/sgKrFAPyqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065836; 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=t83uMD9jEBkQWI1Nf8s3qDgwTL44RKgWBeKLSYfhRHw=; b=N/MKaqeBYXi8f+poSoIo1qPeb1fChoJWdGCDLSS/Qpei2DdW3NaT2UfEXg+veUiBymzNDQV+yKvvibKNRjtmbeHdlNthqdpAzHbEvCiXvk6pyMsnKnIVQd04uc+saMk0hd7l/Gpua6qOB2pBFchGm+hhYpI//85IkSbobxZ8aOU= 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 1754065836478190.47437310120597; Fri, 1 Aug 2025 09:30:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsYx-0006oB-Is; Fri, 01 Aug 2025 12:24:55 -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 1uhrSb-0007Dn-Ul for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:19 -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 1uhrSZ-0002op-7x for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:17 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-303-Drf2nZffN12x-tysv9ooCg-1; Fri, 01 Aug 2025 11:14:09 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A5B4B1800165; Fri, 1 Aug 2025 15:14:08 +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 C76481800B6A; Fri, 1 Aug 2025 15:14:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061254; 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=t83uMD9jEBkQWI1Nf8s3qDgwTL44RKgWBeKLSYfhRHw=; b=hCrP/qS5X3dCxfhbPx3SR0NxiOanWC7e8c62fdlFgmTaXJ6XBuJ1I7XXDBiqj599QEEQki HSjthCUvZhje53BZVM3F5jwC9q1Pf/TsPsyTccPFamlolTCV2trI9wympYlqYqTzkY7yMu Ht/TvY1ltB8aC9zm/8F4JjK2iIll6CI= X-MC-Unique: Drf2nZffN12x-tysv9ooCg-1 X-Mimecast-MFC-AGG-ID: Drf2nZffN12x-tysv9ooCg_1754061248 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 22/24] tests/functional: Move x86_64 tests into target-specific folder Date: Fri, 1 Aug 2025 17:12:47 +0200 Message-ID: <20250801151251.751368-23-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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065839063124100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the x86_64 tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 30 +++++++-------- tests/functional/meson.build | 37 +------------------ tests/functional/x86_64/meson.build | 37 +++++++++++++++++++ .../functional/{ =3D> x86_64}/test_acpi_bits.py | 0 .../test_cpu_model_versions.py} | 0 .../{ =3D> x86_64}/test_cpu_queries.py | 0 .../test_hotplug_blk.py} | 0 .../test_hotplug_cpu.py} | 0 .../{ =3D> x86_64}/test_intel_iommu.py | 0 .../test_kvm_xen.py} | 0 .../{ =3D> x86_64}/test_linux_initrd.py | 0 .../{ =3D> x86_64}/test_mem_addr_space.py | 0 tests/functional/{ =3D> x86_64}/test_memlock.py | 0 .../test_migration.py} | 0 .../test_multiprocess.py} | 0 .../{ =3D> x86_64}/test_netdev_ethtool.py | 0 .../{ =3D> x86_64}/test_pc_cpu_hotplug_props.py | 0 .../test_replay.py} | 0 .../test_reverse_debug.py} | 0 .../test_tuxrun.py} | 0 .../{ =3D> x86_64}/test_virtio_balloon.py | 0 .../{ =3D> x86_64}/test_virtio_gpu.py | 0 .../{ =3D> x86_64}/test_virtio_version.py | 0 23 files changed, 53 insertions(+), 51 deletions(-) create mode 100644 tests/functional/x86_64/meson.build rename tests/functional/{ =3D> x86_64}/test_acpi_bits.py (100%) rename tests/functional/{test_x86_cpu_model_versions.py =3D> x86_64/test_c= pu_model_versions.py} (100%) rename tests/functional/{ =3D> x86_64}/test_cpu_queries.py (100%) rename tests/functional/{test_x86_64_hotplug_blk.py =3D> x86_64/test_hotpl= ug_blk.py} (100%) rename tests/functional/{test_x86_64_hotplug_cpu.py =3D> x86_64/test_hotpl= ug_cpu.py} (100%) rename tests/functional/{ =3D> x86_64}/test_intel_iommu.py (100%) rename tests/functional/{test_x86_64_kvm_xen.py =3D> x86_64/test_kvm_xen.p= y} (100%) rename tests/functional/{ =3D> x86_64}/test_linux_initrd.py (100%) rename tests/functional/{ =3D> x86_64}/test_mem_addr_space.py (100%) rename tests/functional/{ =3D> x86_64}/test_memlock.py (100%) rename tests/functional/{test_x86_64_migration.py =3D> x86_64/test_migrati= on.py} (100%) rename tests/functional/{test_x86_64_multiprocess.py =3D> x86_64/test_mult= iprocess.py} (100%) rename tests/functional/{ =3D> x86_64}/test_netdev_ethtool.py (100%) rename tests/functional/{ =3D> x86_64}/test_pc_cpu_hotplug_props.py (100%) rename tests/functional/{test_x86_64_replay.py =3D> x86_64/test_replay.py}= (100%) rename tests/functional/{test_x86_64_reverse_debug.py =3D> x86_64/test_rev= erse_debug.py} (100%) rename tests/functional/{test_x86_64_tuxrun.py =3D> x86_64/test_tuxrun.py}= (100%) rename tests/functional/{ =3D> x86_64}/test_virtio_balloon.py (100%) rename tests/functional/{ =3D> x86_64}/test_virtio_gpu.py (100%) rename tests/functional/{ =3D> x86_64}/test_virtio_version.py (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1a9fd4a03f2..20538ba9fe7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -481,7 +481,7 @@ F: docs/system/i386/sgx.rst F: target/i386/kvm/ F: target/i386/sev* F: scripts/kvm/vmxcap -F: tests/functional/test_x86_64_hotplug_cpu.py +F: tests/functional/x86_64/test_hotplug_cpu.py =20 Xen emulation on X86 KVM CPUs M: David Woodhouse @@ -490,7 +490,7 @@ S: Supported F: include/system/kvm_xen.h F: target/i386/kvm/xen* F: hw/i386/kvm/xen* -F: tests/functional/test_x86_64_kvm_xen.py +F: tests/functional/x86_64/test_kvm_xen.py =20 Guest CPU Cores (other accelerators) ------------------------------------ @@ -1890,11 +1890,11 @@ F: include/hw/isa/apm.h F: tests/unit/test-x86-topo.c F: tests/qtest/test-x86-cpuid-compat.c F: tests/functional/i386/test_tuxrun.py -F: tests/functional/test_linux_initrd.py -F: tests/functional/test_mem_addr_space.py -F: tests/functional/test_pc_cpu_hotplug_props.py -F: tests/functional/test_x86_64_tuxrun.py -F: tests/functional/test_x86_cpu_model_versions.py +F: tests/functional/x86_64/test_linux_initrd.py +F: tests/functional/x86_64/test_mem_addr_space.py +F: tests/functional/x86_64/test_pc_cpu_hotplug_props.py +F: tests/functional/x86_64/test_tuxrun.py +F: tests/functional/x86_64/test_cpu_model_versions.py =20 PC Chipset M: Michael S. Tsirkin @@ -1970,7 +1970,7 @@ F: include/hw/boards.h F: include/hw/core/cpu.h F: include/hw/cpu/cluster.h F: include/system/numa.h -F: tests/functional/test_cpu_queries.py +F: tests/functional/x86_64/test_cpu_queries.py F: tests/functional/test_empty_cpu_model.py F: tests/unit/test-smp-parse.c T: git https://gitlab.com/ehabkost/qemu.git machine-next @@ -2155,7 +2155,7 @@ M: Ani Sinha M: Michael S. Tsirkin S: Supported F: tests/functional/acpi-bits/* -F: tests/functional/test_acpi_bits.py +F: tests/functional/x86_64/test_acpi_bits.py F: docs/devel/testing/acpi-bits.rst =20 ACPI/HEST/GHES @@ -2339,7 +2339,7 @@ F: net/vhost-user.c F: include/hw/virtio/ F: docs/devel/virtio* F: docs/devel/migration/virtio.rst -F: tests/functional/test_virtio_version.py +F: tests/functional/x86_64/test_virtio_version.py =20 virtio-balloon M: Michael S. Tsirkin @@ -2351,7 +2351,7 @@ F: include/hw/virtio/virtio-balloon.h F: system/balloon.c F: include/system/balloon.h F: tests/qtest/virtio-balloon-test.c -F: tests/functional/test_virtio_balloon.py +F: tests/functional/x86_64/test_virtio_balloon.py =20 virtio-9p M: Christian Schoenebeck @@ -2374,7 +2374,7 @@ F: hw/block/virtio-blk.c F: hw/block/dataplane/* F: include/hw/virtio/virtio-blk-common.h F: tests/qtest/virtio-blk-test.c -F: tests/functional/test_x86_64_hotplug_blk.py +F: tests/functional/x86_64/test_hotplug_blk.py T: git https://github.com/stefanha/qemu.git block =20 virtio-ccw @@ -2598,7 +2598,7 @@ R: Sriram Yagnaraman S: Odd Fixes F: docs/system/devices/igb.rst F: hw/net/igb* -F: tests/functional/test_netdev_ethtool.py +F: tests/functional/x86_64/test_netdev_ethtool.py F: tests/qtest/igb-test.c F: tests/qtest/libqos/igb.c =20 @@ -3850,7 +3850,7 @@ S: Supported F: hw/i386/intel_iommu.c F: hw/i386/intel_iommu_internal.h F: include/hw/i386/intel_iommu.h -F: tests/functional/test_intel_iommu.py +F: tests/functional/x86_64/test_intel_iommu.py F: tests/qtest/intel-iommu-test.c =20 AMD-Vi Emulation @@ -4324,7 +4324,7 @@ F: scripts/ci/ F: tests/docker/ F: tests/vm/ F: tests/lcitool/ -F: tests/functional/test_*_tuxrun.py +F: tests/functional/*/test_tuxrun.py F: scripts/archive-source.sh F: docs/devel/testing/ci* F: docs/devel/testing/main.rst diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 00d18dba3ce..34e30239a6b 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -34,15 +34,7 @@ subdir('sh4') subdir('sh4eb') subdir('sparc') subdir('sparc64') - -test_x86_64_timeouts =3D { - 'acpi_bits' : 420, - 'intel_iommu': 300, - 'netdev_ethtool' : 180, - 'virtio_balloon': 120, - 'x86_64_kvm_xen' : 180, - 'x86_64_replay' : 480, -} +subdir('x86_64') =20 tests_generic_system =3D [ 'empty_cpu_model', @@ -56,33 +48,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_x86_64_system_quick =3D [ - 'cpu_queries', - 'mem_addr_space', - 'x86_64_migration', - 'pc_cpu_hotplug_props', - 'virtio_version', - 'x86_cpu_model_versions', - 'vnc', - 'memlock', -] - -tests_x86_64_system_thorough =3D [ - 'acpi_bits', - 'intel_iommu', - 'linux_initrd', - 'x86_64_multiprocess', - 'netdev_ethtool', - 'virtio_balloon', - 'virtio_gpu', - 'x86_64_hotplug_blk', - 'x86_64_hotplug_cpu', - 'x86_64_kvm_xen', - 'x86_64_replay', - 'x86_64_reverse_debug', - 'x86_64_tuxrun', -] - tests_xtensa_system_thorough =3D [ 'xtensa_lx60', 'xtensa_replay', diff --git a/tests/functional/x86_64/meson.build b/tests/functional/x86_64/= meson.build new file mode 100644 index 00000000000..696a9ecab42 --- /dev/null +++ b/tests/functional/x86_64/meson.build @@ -0,0 +1,37 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_x86_64_timeouts =3D { + 'acpi_bits' : 420, + 'intel_iommu': 300, + 'kvm_xen' : 180, + 'netdev_ethtool' : 180, + 'replay' : 480, + 'virtio_balloon': 120, +} + +tests_x86_64_system_quick =3D [ + 'cpu_model_versions', + 'cpu_queries', + 'mem_addr_space', + 'migration', + 'pc_cpu_hotplug_props', + 'virtio_version', + 'vnc', + 'memlock', +] + +tests_x86_64_system_thorough =3D [ + 'acpi_bits', + 'hotplug_blk', + 'hotplug_cpu', + 'intel_iommu', + 'kvm_xen', + 'linux_initrd', + 'multiprocess', + 'netdev_ethtool', + 'replay', + 'reverse_debug', + 'tuxrun', + 'virtio_balloon', + 'virtio_gpu', +] diff --git a/tests/functional/test_acpi_bits.py b/tests/functional/x86_64/t= est_acpi_bits.py similarity index 100% rename from tests/functional/test_acpi_bits.py rename to tests/functional/x86_64/test_acpi_bits.py diff --git a/tests/functional/test_x86_cpu_model_versions.py b/tests/functi= onal/x86_64/test_cpu_model_versions.py similarity index 100% rename from tests/functional/test_x86_cpu_model_versions.py rename to tests/functional/x86_64/test_cpu_model_versions.py diff --git a/tests/functional/test_cpu_queries.py b/tests/functional/x86_64= /test_cpu_queries.py similarity index 100% rename from tests/functional/test_cpu_queries.py rename to tests/functional/x86_64/test_cpu_queries.py diff --git a/tests/functional/test_x86_64_hotplug_blk.py b/tests/functional= /x86_64/test_hotplug_blk.py similarity index 100% rename from tests/functional/test_x86_64_hotplug_blk.py rename to tests/functional/x86_64/test_hotplug_blk.py diff --git a/tests/functional/test_x86_64_hotplug_cpu.py b/tests/functional= /x86_64/test_hotplug_cpu.py similarity index 100% rename from tests/functional/test_x86_64_hotplug_cpu.py rename to tests/functional/x86_64/test_hotplug_cpu.py diff --git a/tests/functional/test_intel_iommu.py b/tests/functional/x86_64= /test_intel_iommu.py similarity index 100% rename from tests/functional/test_intel_iommu.py rename to tests/functional/x86_64/test_intel_iommu.py diff --git a/tests/functional/test_x86_64_kvm_xen.py b/tests/functional/x86= _64/test_kvm_xen.py similarity index 100% rename from tests/functional/test_x86_64_kvm_xen.py rename to tests/functional/x86_64/test_kvm_xen.py diff --git a/tests/functional/test_linux_initrd.py b/tests/functional/x86_6= 4/test_linux_initrd.py similarity index 100% rename from tests/functional/test_linux_initrd.py rename to tests/functional/x86_64/test_linux_initrd.py diff --git a/tests/functional/test_mem_addr_space.py b/tests/functional/x86= _64/test_mem_addr_space.py similarity index 100% rename from tests/functional/test_mem_addr_space.py rename to tests/functional/x86_64/test_mem_addr_space.py diff --git a/tests/functional/test_memlock.py b/tests/functional/x86_64/tes= t_memlock.py similarity index 100% rename from tests/functional/test_memlock.py rename to tests/functional/x86_64/test_memlock.py diff --git a/tests/functional/test_x86_64_migration.py b/tests/functional/x= 86_64/test_migration.py similarity index 100% rename from tests/functional/test_x86_64_migration.py rename to tests/functional/x86_64/test_migration.py diff --git a/tests/functional/test_x86_64_multiprocess.py b/tests/functiona= l/x86_64/test_multiprocess.py similarity index 100% rename from tests/functional/test_x86_64_multiprocess.py rename to tests/functional/x86_64/test_multiprocess.py diff --git a/tests/functional/test_netdev_ethtool.py b/tests/functional/x86= _64/test_netdev_ethtool.py similarity index 100% rename from tests/functional/test_netdev_ethtool.py rename to tests/functional/x86_64/test_netdev_ethtool.py diff --git a/tests/functional/test_pc_cpu_hotplug_props.py b/tests/function= al/x86_64/test_pc_cpu_hotplug_props.py similarity index 100% rename from tests/functional/test_pc_cpu_hotplug_props.py rename to tests/functional/x86_64/test_pc_cpu_hotplug_props.py diff --git a/tests/functional/test_x86_64_replay.py b/tests/functional/x86_= 64/test_replay.py similarity index 100% rename from tests/functional/test_x86_64_replay.py rename to tests/functional/x86_64/test_replay.py diff --git a/tests/functional/test_x86_64_reverse_debug.py b/tests/function= al/x86_64/test_reverse_debug.py similarity index 100% rename from tests/functional/test_x86_64_reverse_debug.py rename to tests/functional/x86_64/test_reverse_debug.py diff --git a/tests/functional/test_x86_64_tuxrun.py b/tests/functional/x86_= 64/test_tuxrun.py similarity index 100% rename from tests/functional/test_x86_64_tuxrun.py rename to tests/functional/x86_64/test_tuxrun.py diff --git a/tests/functional/test_virtio_balloon.py b/tests/functional/x86= _64/test_virtio_balloon.py similarity index 100% rename from tests/functional/test_virtio_balloon.py rename to tests/functional/x86_64/test_virtio_balloon.py diff --git a/tests/functional/test_virtio_gpu.py b/tests/functional/x86_64/= test_virtio_gpu.py similarity index 100% rename from tests/functional/test_virtio_gpu.py rename to tests/functional/x86_64/test_virtio_gpu.py diff --git a/tests/functional/test_virtio_version.py b/tests/functional/x86= _64/test_virtio_version.py similarity index 100% rename from tests/functional/test_virtio_version.py rename to tests/functional/x86_64/test_virtio_version.py --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065740; cv=none; d=zohomail.com; s=zohoarc; b=KE7cPbsZUod87wKD44mHHSB16hkLQke5WQto+EXucKKURCfPqJX+KF+nzhyaAkPQ4TYq7kl8BM6VmSnlpJDXAdZd6jtP+xW1FXuWyVr7Rh1XydqV/HZi6xFslsEO+tJ+CvZBgb+x3Mt14CbXdBQnPuyhM5AFse1CCD9OnEv0HfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065740; 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=TtDazUYKTzp/eZR6h0fFuYXWD4fPgjOLCjNxVftPF8c=; b=D3AbCgjUm7H9WV3GDrCXOIQNSCNwVRzRwGodQvBXZ1O/hOrKXGaG9VXoKHCrctfzm4MyUYiN+moGYUEAco6b/r1G8MeQgip1LYdOpdmLxLz5Q0KC3GvghKFT5HZdJ4LOwSmTGYVINTN8Krfyl9Qu+7OvsnuU90fwBG0sq05WRWk= 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 1754065740901166.14201836546783; Fri, 1 Aug 2025 09:29:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsax-0004pI-6n; Fri, 01 Aug 2025 12:27:00 -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 1uhrSc-0007Ed-5R for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:19 -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 1uhrSa-0002p0-Fr for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:17 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-369-nzHm2MK3M2KQszRpJSeUWQ-1; Fri, 01 Aug 2025 11:14:12 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 32D17180034A; Fri, 1 Aug 2025 15:14:11 +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 2FA191800B4F; Fri, 1 Aug 2025 15:14:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061255; 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=TtDazUYKTzp/eZR6h0fFuYXWD4fPgjOLCjNxVftPF8c=; b=hwc+yjGSa0srRcZOhRxB3oFaVrI6D+m9zvV971TMAiYYhiLFl2P4AWw10qk8Sob4lzZZIY QkP/NVZDO6H2h5SBLHQAGFGU/GAgyk7CaKvHMDCCm734VdLggsCYePIw6pue6OnNg+gqEw F7uAL93GUcXWprVw5YxJjboKHhM/2Dc= X-MC-Unique: nzHm2MK3M2KQszRpJSeUWQ-1 X-Mimecast-MFC-AGG-ID: nzHm2MK3M2KQszRpJSeUWQ_1754061251 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 23/24] tests/functional: Move xtensa tests into target-specific folder Date: Fri, 1 Aug 2025 17:12:48 +0200 Message-ID: <20250801151251.751368-24-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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754065741852116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the xtensa tests into a target-specific subfolder. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- tests/functional/meson.build | 6 +----- tests/functional/xtensa/meson.build | 6 ++++++ .../functional/{test_xtensa_lx60.py =3D> xtensa/test_lx60.py} | 0 .../{test_xtensa_replay.py =3D> xtensa/test_replay.py} | 0 5 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 tests/functional/xtensa/meson.build rename tests/functional/{test_xtensa_lx60.py =3D> xtensa/test_lx60.py} (10= 0%) rename tests/functional/{test_xtensa_replay.py =3D> xtensa/test_replay.py}= (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 20538ba9fe7..821a7a07ed6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2000,7 +2000,7 @@ S: Maintained F: hw/xtensa/xtfpga.c F: hw/net/opencores_eth.c F: include/hw/xtensa/mx_pic.h -F: tests/functional/test_xtensa_lx60.py +F: tests/functional/xtensa/test_lx60.py =20 Devices ------- diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 34e30239a6b..b1eec16add8 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -35,6 +35,7 @@ subdir('sh4eb') subdir('sparc') subdir('sparc64') subdir('x86_64') +subdir('xtensa') =20 tests_generic_system =3D [ 'empty_cpu_model', @@ -48,11 +49,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_xtensa_system_thorough =3D [ - 'xtensa_lx60', - 'xtensa_replay', -] - precache_all =3D [] foreach speed : ['quick', 'thorough'] foreach dir : target_dirs diff --git a/tests/functional/xtensa/meson.build b/tests/functional/xtensa/= meson.build new file mode 100644 index 00000000000..d61d82a1356 --- /dev/null +++ b/tests/functional/xtensa/meson.build @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_xtensa_system_thorough =3D [ + 'lx60', + 'replay', +] diff --git a/tests/functional/test_xtensa_lx60.py b/tests/functional/xtensa= /test_lx60.py similarity index 100% rename from tests/functional/test_xtensa_lx60.py rename to tests/functional/xtensa/test_lx60.py diff --git a/tests/functional/test_xtensa_replay.py b/tests/functional/xten= sa/test_replay.py similarity index 100% rename from tests/functional/test_xtensa_replay.py rename to tests/functional/xtensa/test_replay.py --=20 2.50.1 From nobody Sat Nov 15 06:33:15 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=1754065741; cv=none; d=zohomail.com; s=zohoarc; b=Bh9IklmsuIkOai89iQNahK9j5xsu7z9PfSLwuk2pUU12f//L0DHCQKPuh7NldDBFTlt70KdCvGbBTFaE+5wCXVNV3xPeSZFyBNP9FmNg6aYrB2RZlK6M8ia4sxRtzBP7Y6WQRkPyOSHtgkaT7KK1ighb7Rht2OmWxEG6UDmWNdk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754065741; 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=7M6lfprvgFAXg+quMJI8LoG9A9DKhI8YaGJtVnzbz54=; b=Sc6EItp6VqoXQzlCt7cSnS8ojtkYU0A30I/2Zal6SHdQawrPd1fkE6vFtVqrDjZIkmzEJ7FPv1pFxy5vpmBiMREHMgK+bwnDIkxA3Wa6Hnmuq4Dn/6+mqcx7RXtS0EH3jH+NxK0CmCYmeAfB6ngmIt8RmiHUdcPNXlZicRO93wo= 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 1754065741038512.5648763038581; Fri, 1 Aug 2025 09:29:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhsZr-000153-M6; Fri, 01 Aug 2025 12:25:51 -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 1uhrSe-0007RY-7Y for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:20 -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 1uhrSc-0002pK-Bq for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:14:19 -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-486-Sx-IOR0kO1eukR5cHQEjJw-1; Fri, 01 Aug 2025 11:14:14 -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 B19AC19560AA; Fri, 1 Aug 2025 15:14:13 +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 B3D901800B4F; Fri, 1 Aug 2025 15:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754061257; 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=7M6lfprvgFAXg+quMJI8LoG9A9DKhI8YaGJtVnzbz54=; b=YhRqIGmhRVuNaSRFN+UeTojrg3GnP+EiOxbTv2XwL/25esrv3JlYCYny7eZQ+ltye8TwLw kjfImD8260v5myPLcOt6rS7alklBohG4bX9oo4A0DHvx99v0z+M4r4CaAay9/J74toD4LW 5eGNmuTQxqJqzFmMF6wKoOZWE0kJC7A= X-MC-Unique: Sx-IOR0kO1eukR5cHQEjJw-1 X-Mimecast-MFC-AGG-ID: Sx-IOR0kO1eukR5cHQEjJw_1754061253 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 24/24] tests/functional: Move the generic tests to a subfolder Date: Fri, 1 Aug 2025 17:12:49 +0200 Message-ID: <20250801151251.751368-25-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: 1754065741975116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth This also removes the line for using tests from the main folder since we do not have any tests left here. And while we're at it, also mark the vnc test as generic now since it is not specific to x86. Signed-off-by: Thomas Huth Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 8 ++++---- tests/functional/generic/meson.build | 14 ++++++++++++++ .../{ =3D> generic}/test_empty_cpu_model.py | 0 .../{ =3D> generic}/test_info_usernet.py | 0 tests/functional/{ =3D> generic}/test_version.py | 0 tests/functional/{ =3D> generic}/test_vnc.py | 0 tests/functional/meson.build | 17 ++--------------- tests/functional/x86_64/meson.build | 1 - 8 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 tests/functional/generic/meson.build rename tests/functional/{ =3D> generic}/test_empty_cpu_model.py (100%) rename tests/functional/{ =3D> generic}/test_info_usernet.py (100%) rename tests/functional/{ =3D> generic}/test_version.py (100%) rename tests/functional/{ =3D> generic}/test_vnc.py (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 821a7a07ed6..06f82a309fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1971,7 +1971,7 @@ F: include/hw/core/cpu.h F: include/hw/cpu/cluster.h F: include/system/numa.h F: tests/functional/x86_64/test_cpu_queries.py -F: tests/functional/test_empty_cpu_model.py +F: tests/functional/generic/test_empty_cpu_model.py F: tests/unit/test-smp-parse.c T: git https://gitlab.com/ehabkost/qemu.git machine-next =20 @@ -2192,7 +2192,7 @@ S: Odd Fixes F: hw/net/ F: include/hw/net/ F: tests/qtest/virtio-net-test.c -F: tests/functional/test_info_usernet.py +F: tests/functional/generic/test_info_usernet.py F: docs/system/virtio-net-failover.rst T: git https://github.com/jasowang/qemu.git net =20 @@ -3126,7 +3126,7 @@ S: Supported F: include/qemu/option.h F: tests/unit/test-keyval.c F: tests/unit/test-qemu-opts.c -F: tests/functional/test_version.py +F: tests/functional/generic/test_version.py F: util/keyval.c F: util/qemu-option.c =20 @@ -3244,7 +3244,7 @@ F: include/ui/ F: qapi/ui.json F: util/drm.c F: docs/devel/ui.rst -F: tests/functional/test_vnc.py +F: tests/functional/generic/test_vnc.py =20 Cocoa graphics M: Peter Maydell diff --git a/tests/functional/generic/meson.build b/tests/functional/generi= c/meson.build new file mode 100644 index 00000000000..013cc96fbf8 --- /dev/null +++ b/tests/functional/generic/meson.build @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +tests_generic_system =3D [ + 'empty_cpu_model', + 'info_usernet', + 'version', + 'vnc', +] + +tests_generic_linuxuser =3D [ +] + +tests_generic_bsduser =3D [ +] diff --git a/tests/functional/test_empty_cpu_model.py b/tests/functional/ge= neric/test_empty_cpu_model.py similarity index 100% rename from tests/functional/test_empty_cpu_model.py rename to tests/functional/generic/test_empty_cpu_model.py diff --git a/tests/functional/test_info_usernet.py b/tests/functional/gener= ic/test_info_usernet.py similarity index 100% rename from tests/functional/test_info_usernet.py rename to tests/functional/generic/test_info_usernet.py diff --git a/tests/functional/test_version.py b/tests/functional/generic/te= st_version.py similarity index 100% rename from tests/functional/test_version.py rename to tests/functional/generic/test_version.py diff --git a/tests/functional/test_vnc.py b/tests/functional/generic/test_v= nc.py similarity index 100% rename from tests/functional/test_vnc.py rename to tests/functional/generic/test_vnc.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index b1eec16add8..2a0c5aa1418 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -36,18 +36,7 @@ subdir('sparc') subdir('sparc64') subdir('x86_64') subdir('xtensa') - -tests_generic_system =3D [ - 'empty_cpu_model', - 'info_usernet', - 'version', -] - -tests_generic_linuxuser =3D [ -] - -tests_generic_bsduser =3D [ -] +subdir('generic') =20 precache_all =3D [] foreach speed : ['quick', 'thorough'] @@ -90,9 +79,7 @@ foreach speed : ['quick', 'thorough'] =20 foreach test : target_tests testname =3D '@0@-@1@'.format(target_base, test) - if fs.exists('test_' + test + '.py') - testfile =3D 'test_' + test + '.py' - elif fs.exists('generic' / 'test_' + test + '.py') + if fs.exists('generic' / 'test_' + test + '.py') testfile =3D 'generic' / 'test_' + test + '.py' else testfile =3D target_base / 'test_' + test + '.py' diff --git a/tests/functional/x86_64/meson.build b/tests/functional/x86_64/= meson.build index 696a9ecab42..d0b4667bb8a 100644 --- a/tests/functional/x86_64/meson.build +++ b/tests/functional/x86_64/meson.build @@ -16,7 +16,6 @@ tests_x86_64_system_quick =3D [ 'migration', 'pc_cpu_hotplug_props', 'virtio_version', - 'vnc', 'memlock', ] =20 --=20 2.50.1