From nobody Sat Nov 15 06:54:43 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=1755602932; cv=none; d=zohomail.com; s=zohoarc; b=cIJMkRLJVr4sWRbFX45UrriSKg7DkRTok3+Uwt+MjHgkBKv2ZI0jPJ1QcGguGl1eLPkMOmwXM26/ypp1lnvMrRr7aK3mvNadnM6yIw3SXitCvdkdz6H2iR7bRA/fDBqT/TEOvgR6ef147N8Cg1mPtHEYpGKw3hAqsgxCQm7tCss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755602932; 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=8l2R7W4LUembdbVan5v0URDxhLeiJoNlEa4ADj/xD+U=; b=Brns8ZpQVBdYAnqEUKOEL8C3VyS/uAJNn4PqNNfXEUUv5ZxCG66oKLdGYl7FXDX+tX2ZApjfFA6HLTfUm4y67AycA18z9Tx+q1RpZ430nKnJ29ZuM0u10sEX5DmchJ9eShSegSUu9i7RBx0Q3C3X+ehyq4Okq3dATUoCx/8WxXQ= 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 1755602931987726.96684315648; Tue, 19 Aug 2025 04:28:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uoKS3-0003F9-61; Tue, 19 Aug 2025 07:24:27 -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 1uoKS1-0003Eu-SD for qemu-devel@nongnu.org; Tue, 19 Aug 2025 07:24:25 -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 1uoKS0-0007Al-2b for qemu-devel@nongnu.org; Tue, 19 Aug 2025 07:24:25 -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-446-0tkQteZqNrG7Gvg6hwtOnw-1; Tue, 19 Aug 2025 07:24:19 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 DE7AD1800293; Tue, 19 Aug 2025 11:24:17 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.251]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B8AF630001A8; Tue, 19 Aug 2025 11:24:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755602662; 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=8l2R7W4LUembdbVan5v0URDxhLeiJoNlEa4ADj/xD+U=; b=KR/6zkeb+E3dBFXEsJHzTY9N+F4KjZUFXmlKtZTgiEEICu3+w1q50i4819S2qU6CtUjMeW 7dzjcIzDHP2tjw8cGKnjqTPgiLvzbYEq3yvVwLT7ArcB1PnvwwzoxNl1rW1MbunzWHigTS tcYNlfNCm9/iKpdnUK7lupxnx/6NvfU= X-MC-Unique: 0tkQteZqNrG7Gvg6hwtOnw-1 X-Mimecast-MFC-AGG-ID: 0tkQteZqNrG7Gvg6hwtOnw_1755602658 From: Thomas Huth To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 03/25] tests/functional/meson.build: Split timeout settings by target Date: Tue, 19 Aug 2025 13:23:40 +0200 Message-ID: <20250819112403.432587-4-thuth@redhat.com> In-Reply-To: <20250819112403.432587-1-thuth@redhat.com> References: <20250819112403.432587-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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: 1755602934424116600 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 --- 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.50.1