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=1756973758; cv=none; d=zohomail.com; s=zohoarc; b=GfylMJnEXuhdagrXkHgfF2kXK1uPKG4PqmTePb0WEhu1a7dWUF1ABRt5K2aYaEY034bb/Zgr/6Rt9R+ze+yrarQG3SkUzsbTC11VHHNjp6dX6xjP655p725tjZNpswNyrS/yzIw+LReahKUiDry7y2/TJcBJSpJ5v1A3YSLNeno= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756973758; 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=KFEhhh8NSACPPy03lAUeW1WvXOIqiNIP9Gmw/5CKVpI=; b=Mp7m7GgKtOzdnc/3wFdrTASQoOUdtRh1r9oXJBXvowJcA298yG3AN0jkwvW6B9t1qNcdBxEFbjIMMcR9DJq8uZIgdQLPjSkjZNmzuAruyuKTWPjC8jY0ekm3EZ+FmGMG7Mb7LgywXbLNO/9QPwRFpgk5BXiGz+TleJchZzWY7Ls= 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 1756973758895631.9743862970155; Thu, 4 Sep 2025 01:15:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu55w-0007TI-Cy; Thu, 04 Sep 2025 04:13:24 -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 1uu54g-0006N4-5q for qemu-devel@nongnu.org; Thu, 04 Sep 2025 04:12:06 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu54K-00043D-UC for qemu-devel@nongnu.org; Thu, 04 Sep 2025 04:12:05 -0400 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-afcb7ace3baso137843366b.3 for ; Thu, 04 Sep 2025 01:11:44 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-61cfc4e50fbsm13438274a12.38.2025.09.04.01.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 01:11:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id F0D1B5FA1B; Thu, 04 Sep 2025 09:11:29 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756973503; x=1757578303; 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=KFEhhh8NSACPPy03lAUeW1WvXOIqiNIP9Gmw/5CKVpI=; b=pzzLfY7qD0RusmvLWQi6qIhUK5qTZsgYjX90c6w9sYL/esVsGSUkzXzx7KaxQU7BtW K5oeSQT/cL6nFA0fhgbaWuVZ2no3RwcrVuqTRiDe+bJ4c2Q6D0z/4xTJaQVpL4fchrFf EqBlig8boICIE7nUoodDs5pS2WwudMzre2Yo6DPiyn10nhC62GflOvV1BH5klfXwhwn5 6liX4HuWMjmWIEqVfRS9Hd7wi10Y4MTCM1KCVNvD0ZY7ROPXytjYm/IY+awMEgacwZ3J gy1NycRCgUu6p01kSm0hhtGLH0xxK8luqkAWuAsiABpabKMooNOzBlYSbhcv32O1vKb3 RwUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756973503; x=1757578303; 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=KFEhhh8NSACPPy03lAUeW1WvXOIqiNIP9Gmw/5CKVpI=; b=tw2ufiXRDTaVRIRFmwhXIueG7qaKT4MJZvTAKeL9VkZSFvvmktPnzisAoXq5sobFEH nuRzSe0JGcofQ4Y0kjb8us5JCza1kBSztbVPRrexpDvXMUNPZ2LOoS9sRLKN1NAQBgNQ omzMUKxHesBw3K6hFcS333sKKTjBjP7MW8smQvAXK/O1F4fhsKeAvdBdhIfDqaVMt2z0 QxpD7OaJPlGrWmN9WWVgCHH6nmv/bUPXUYnmHJSLcTEzxqNUNJwLvRG67CPZH6Gvhnck LyDNmggeOE1oihhChZOOfNJzdOnAsAfHu7pkgcNvp39AVqe+8RoMcJvdKFbUr6M0SZOV QWfg== X-Gm-Message-State: AOJu0Yxk4eFZtIZz9kS0keI3ERiIIgUmr/Fd8joOQnpIpLBXughw+19h QfNcshd/BiEDGpoQhg2F4jdJ7Kd8WueKtLKoT9LNZ6Jm3DCiyieupH2U14pgN09GBWo= X-Gm-Gg: ASbGnctmDXtDurZnhcLJv9IKmPm1WsuJwspmhQp+iOEb1cdZliuYPDbwA2wZwyY46vh 8PL7sCjbUNfuWznXja6o1Y+cg9Kiy2K3Kyk0eVHN6wHLwlS5OsWXDZx08BTWKURQX2jRiPqMNWM T62GBgayJRlao67rAxRsH2EshsxhRtChbi4wAb7dxdGqqTvCK8VpD2BijniX/lmPFWiWDsQbb1x NBD6hAEAF0Ib7f+a+++dIO4a3bKwALJZMHgNor/TcHtfGePeR6VKUceHshecfYO9pY57Xt9JXx3 fxFtama9Xrolp6aaOfSijpPKi9OkKgqVgEMMLN0oGvBg0/I/CHo32vWuPyJn9xzixPX8uZ/s599 a4pZ0CLE6pUW9Og9uju8d5ZUS4Fp66dXhzA== X-Google-Smtp-Source: AGHT+IFlmoTtWtJZg3Geb0kfl+Z+ucuFEHRktCaxjXa7c0bTRextSI2xhSOy4rmatDTUkMpDVjITog== X-Received: by 2002:a17:907:3e8f:b0:b04:6c19:ed8d with SMTP id a640c23a62f3a-b046c19eea9mr457804566b.26.1756973503102; Thu, 04 Sep 2025 01:11:43 -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 015/281] tests/functional/meson.build: Split timeout settings by target Date: Thu, 4 Sep 2025 09:06:49 +0100 Message-ID: <20250904081128.1942269-16-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-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::636; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x636.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: 1756973759827116600 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. Reviewed-by: Pierrick Bouvier Signed-off-by: Thomas Huth Message-ID: <20250819112403.432587-4-thuth@redhat.com> --- 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 38ae0d6cd3b..356aad12dee 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, @@ -404,6 +437,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 @@ -419,8 +457,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.47.2