From nobody Wed Jan 15 09:51:25 2025 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704733591757677.3042497379851; Mon, 8 Jan 2024 09:06:31 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6292C185A; Mon, 8 Jan 2024 12:06:30 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0287D1B2E; Mon, 8 Jan 2024 11:09:11 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5C92D1A0E; Mon, 8 Jan 2024 11:08:06 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 906D11A7F for ; Mon, 8 Jan 2024 11:06:20 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-aoV0aWOfPnuMTwkJaGM3gg-1; Mon, 08 Jan 2024 11:06:18 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 93477185A780 for ; Mon, 8 Jan 2024 16:06:18 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15049C15E6A for ; Mon, 8 Jan 2024 16:06:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: aoV0aWOfPnuMTwkJaGM3gg-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 22/23] meson: tests: Allow 'timeout' override for all tests Date: Mon, 8 Jan 2024 17:05:52 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: DJLCVFGW2NJH3PHXXXNNK5XOMASQM4CF X-Message-ID-Hash: DJLCVFGW2NJH3PHXXXNNK5XOMASQM4CF X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1704733592668100001 Don't special-case qemuxml2argvtest's handling of timeout but rather allow each test array entry to have it's own. Signed-off-by: Peter Krempa --- tests/meson.build | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/meson.build b/tests/meson.build index 4a4042376a..2f0b5e39b7 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -455,7 +455,7 @@ if conf.has('WITH_QEMU') { 'name': 'qemusecuritytest', 'sources': [ 'qemusecuritytest.c', 'qemu= securitymock.c' ], 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ t= est_utils_qemu_lib ] }, { 'name': 'qemuxmlactivetest', 'link_with': [ test_qemu_driver_lib ], = 'link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] }, { 'name': 'qemuvhostusertest', 'link_with': [ test_qemu_driver_lib ], = 'link_whole': [ test_file_wrapper_lib ] }, - { 'name': 'qemuxml2argvtest', 'link_with': [ test_qemu_driver_lib, tes= t_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib, test_file_= wrapper_lib ] }, + { 'name': 'qemuxml2argvtest', 'timeout': 90, 'link_with': [ test_qemu_= driver_lib, test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_= lib, test_file_wrapper_lib ] }, ] if conf.has('WITH_NBDKIT') tests +=3D [ @@ -595,17 +595,11 @@ foreach data : tests ], export_dynamic: true, ) - if data['name'] =3D=3D 'qemuxml2argvtest' - timeout =3D 90 - else - # default meson timeout - timeout =3D 30 - endif test( data['name'], test_bin, env: tests_env, - timeout: timeout, + timeout: data.get('timeout', 30), depends: tests_deps, suite: 'bin' ) --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org