From nobody Sat Sep 6 16:55:36 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756974365; cv=none; d=zohomail.com; s=zohoarc; b=NzmYkvla+7UPDBQYtqnm9lVghXxpNqr3tR9JfB440spiLogLCAa4tID6ViXV9ytmAR7FABJ+N7C+nqHjoTjjo3qu3q5wl3wNzR2pa604sZ9R1Cph5ZhrYPrfB1ort19c/XR9GyI00uUNMOEKEtvr/oL2paV8JMnVzixulH9lAwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756974365; 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=qtgYk8tL09X7evEehKpRVdQ+nFs0oLJoTM08eLIHHIc=; b=OrwbDY/26U6UxQw5QaSzbKIlRe1qE8KQZwFlvzH1PSA3vmmsaxGyJHSJR9B61birshpacqhVuervGCqHMOYdb5JKkfxdvV5XqYALoKdWNdsgPPiEBuvkkLLPAn2vx3HbWmKrZqj8ooyEzq7aY2A+mnUrVT3qEjzlLvug0X1WtHA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756974365471759.7335618294576; Thu, 4 Sep 2025 01:26:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu58n-0003H3-44; Thu, 04 Sep 2025 04:16:21 -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 1uu550-0006Wh-7l for qemu-devel@nongnu.org; Thu, 04 Sep 2025 04:12:29 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu54V-00049h-6O for qemu-devel@nongnu.org; Thu, 04 Sep 2025 04:12:25 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-afeec747e60so137366766b.0 for ; Thu, 04 Sep 2025 01:11:54 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b017e4b9ed7sm1280476466b.90.2025.09.04.01.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 01:11:49 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 02D196000B; Thu, 04 Sep 2025 09:11:32 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756973513; x=1757578313; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qtgYk8tL09X7evEehKpRVdQ+nFs0oLJoTM08eLIHHIc=; b=f8UdJ4yA7QIyJlZ/xSU9PRHA1RfjCZLZ1pO4SoGUSiGbInnsupUv2ROht8EDM6LZwd NtbMMdqJ9IA6OSBMyOJmWMs1iNKd9OcMdkHqHxR4t8gHHDzsjRQX8MfOICRVm5sDH9Dj DO7MwUSIWpNUrxel3bKb34ohR+1XniY1dJQ+UM/LWmyt7ZbMH0ftlY3Yw2AbpOv/14w1 r3LEie+Czje8TUT5J5+dTQANX7ZUeG51JSVmKivvnDOnFRzLz5ZJ241nuxIFItbfnmqq 29ngHZSyY/W4QRdotkwNJMC80i0OGxqMr1lOzWL8Wzuy62nZyNtchVllUno4MxpDoUuj nUwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756973513; x=1757578313; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qtgYk8tL09X7evEehKpRVdQ+nFs0oLJoTM08eLIHHIc=; b=n6B3HxbK0b1vs61vRA58o55XWbsc2RY5jplUgCtDNsmrWeECfLDjot0ouQwIuSu64V ewb93x+AgyIsA+D/fvUWVRjkQZ6P8vSS3K/j6z+y++CFzZ6EIZb9dAvagEnUfGNdHlnQ TZc5qLmCHM2s1riRzXSIjmN0yXO2raTnpVQFnN5gMxn9j9SxA9wwanNsMmu/JvNeoIXu +R+N1OT1Zo2bn6mO5/72aq1SS8qPAS4b9ZP4j1dbsmyeAFTbN/AHwdG5DAVbeOPeH433 NG+BJXNhIMsyYj9grHcJJF7+sSI/HYYX+QVg6nSZUgAfrLKR1If3GUrdZLIRXiX24wbR VeEA== X-Gm-Message-State: AOJu0YwrX7cuk5m0fnafhI5HcdZOIvhd0RX46kLlbPvCAiYGGZN/QnD0 REFoSUmnLNFg2NRlTVF74lAd0OMKizHPBa2lhMbmbxoFLhQDyscePbJJ8ocaKh6k8Vp8tLKMDKb HrJ9jQYNOYQ== X-Gm-Gg: ASbGnct2mseF1qHW8PuvGrarGNemyaKumKgKAVO2leqkQutuueY32VPt0SdrGEN00CB l0KGmS+KrrVYGsq+Qnwdfl/+iMAkGb7FhQBZV4Z/ZFSeA5W+WIDzUPf+35jctbTtvkKjFXaTLS2 UOFVkR5iCNES/P5g7nASuPOgXKM+6Rl415xqnWNln+Euxb3oik5OyWAs8aCBU6CN8KselTCgz6G Nls0JxcPwhbLpkcaUEYy5EKGqMTp/wD8fJH8M+HqTL3GD/CQ+GOjctyGTt4NLBGp1VE1SBmyCIL AsBSc4t/lPXclGoSGJI4VfUARwckB8HxgjWJ/8d8I7jz+1KX77hq7kMkvPqkZkXezgdm2m640cq 9ZgCjjmQHaqel84/z24lUITo+6KtQg4xqsjCD+kaccnFw X-Google-Smtp-Source: AGHT+IGYskyBYR3n5Q9uI+8AP0+1GXixN328LvmrggmBgoiP7mVHjL06ko8pn8Trl6ZXEys7FI6f0Q== X-Received: by 2002:a17:907:daa:b0:b04:8420:b6ef with SMTP id a640c23a62f3a-b048420c5b0mr91846366b.61.1756973513129; Thu, 04 Sep 2025 01:11:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Reinoud Zandijk , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Huacai Chen , Zhao Liu , Paolo Bonzini , Alistair Francis , qemu-arm@nongnu.org, Fam Zheng , Helge Deller , Matthew Rosato , Fabiano Rosas , qemu-rust@nongnu.org, Bibo Mao , qemu-riscv@nongnu.org, Thanos Makatos , Liu Zhiwei , Riku Voipio , Cameron Esfahani , Alexander Graf , Laurent Vivier , Harsh Prateek Bora , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-ppc@nongnu.org, Stafford Horne , Sunil Muthuswamy , Jagannathan Raman , Igor Mammedov , Brian Cain , Phil Dennis-Jordan , devel@lists.libvirt.org, Mads Ynddal , Elena Ufimtseva , Peter Xu , Jason Herne , Michael Rolnik , Weiwei Li , Laurent Vivier , Ilya Leoshkevich , qemu-block@nongnu.org, Peter Maydell , Kostiantyn Kostiuk , Kyle Evans , David Hildenbrand , "Edgar E. Iglesias" , Warner Losh , Daniel Henrique Barboza , John Snow , Yoshinori Sato , Aleksandar Rikalo , Alistair Francis , Marcelo Tosatti , Yonggang Luo , Radoslaw Biernacki , Artyom Tarasenko , Yanan Wang , Eduardo Habkost , Aurelien Jarno , Richard Henderson , qemu-s390x@nongnu.org, Alex Williamson , "Michael S. Tsirkin" , Ani Sinha , Roman Bolshakov , Manos Pitsidianakis , Chinmay Rath , Thomas Huth , Cleber Rosa , kvm@vger.kernel.org, Song Gao , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Eric Farman , Palmer Dabbelt , Leif Lindholm , Christian Borntraeger , Michael Roth , Mauro Carvalho Chehab , Jiaxun Yang , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Mark Cave-Ayland , Marcel Apfelbaum , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Nicholas Piggin , John Levon , Pierrick Bouvier Subject: [PATCH v2 031/281] tests/functional: Move s390x tests into target-specific folders Date: Thu, 4 Sep 2025 09:07:05 +0100 Message-ID: <20250904081128.1942269-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250904081128.1942269-1-alex.bennee@linaro.org> References: <20250904081128.1942269-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1756974367814124100 From: Thomas Huth The tests/functional folder has become quite crowded, thus move the s390x tests into a target-specific subfolder. Reviewed-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth Message-ID: <20250819112403.432587-20-thuth@redhat.com> --- 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 c6410a5f5fd..4a55a20f6a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1797,7 +1797,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 @@ -1811,7 +1811,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 @@ -1865,7 +1865,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.47.2