From nobody Sun May 5 10:08:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611770642; cv=none; d=zohomail.com; s=zohoarc; b=Oo8mYgl72FOnFwPH/ugkVW1Lha1QitMbnhmA0ndLbsbkT5j3gNsjadgx0EJ8QlsFKM9Je9kzBTAs8CEKItS+QXe63iCo587AbyGFBarlI21Oxj+Lld+MUeYPsXyD1YuaGXLOSA1qT59d5Bz2cg7AKaMLah1myUQ74ibPQCrSnz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611770642; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=lGfNAxiaHyxRARbiFpwegdXuG7poO9RhCweySbvABas=; b=iVhZjTHlUlOPMHPErTghUbE6K5qOYKR1ob+0v460nSJBZj8oYmQZ5+M1sNhSaN6qAoqN4ocmy/NQgNOIOQz8E3Od6ejghWx/JTnpPF64XkqcDn+wIlQTzMDiOIyQvllOnL/XUtKCGIQMpFx4/xuFPJ8DrKX9377GTzt3min4Cjk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611770642233414.34225078493114; Wed, 27 Jan 2021 10:04:02 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-375-7H5TbpvbNGSgRAmmtK0tPA-1; Wed, 27 Jan 2021 13:03:57 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E1C631800D42; Wed, 27 Jan 2021 18:03:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ECDDC1A8A1; Wed, 27 Jan 2021 18:03:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 213984A7C7; Wed, 27 Jan 2021 18:03:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10RI04VC022733 for ; Wed, 27 Jan 2021 13:00:04 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7389C5D6A1; Wed, 27 Jan 2021 18:00:04 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id E686B5D766 for ; Wed, 27 Jan 2021 18:00:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611770641; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lGfNAxiaHyxRARbiFpwegdXuG7poO9RhCweySbvABas=; b=Z9pR4b8Y5Q6zVt5kCj5tMzwku2EVMMsN0x/FTIv09t65+I9Ok4QiOD/UgED0hFhbk1S1JK PbedTk0fkCLg11rTZ2tRdzIwBzYUTzZv0bTL1LQabyeZZdEYM8kL5Gqb7D6YOYuU/zcPAQ ifQTSugJGBVNGclveW0UNSxA49CKFcQ= X-MC-Unique: 7H5TbpvbNGSgRAmmtK0tPA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] Increase timeout for tests and syntax-check Date: Wed, 27 Jan 2021 18:59:58 +0100 Message-Id: <091a6104dca8956eb569cd168f89643ba1c52682.1611769724.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Since we've switched to meson our tests run with a timeout (meson uses 30 seconds as the default). However, not every machine that builds libvirt is fast enough to run every test under 30 seconds (each test binary has its own timeout, but still). For instance when building a package for distro on a farm that's under load. Or on a generally slow ARM hardware. While each developer can tune their command line for building by adding --timeout-multiplier=3D10, this is hard to do for aforementioned build farms. It's time to admit that not everybody has the latest, top shelf CPU and increase the timeout. Signed-off-by: Michal Privoznik --- Successfully tested on my RasPi 2B, where the top three longest test were: qemuxml2argvtest OK 142.43s virschematest OK 40.82s virnettlssessiontest OK 38.64s and syntax-check: sc_spacing-check OK 50.26 sc_avoid_if_before_free OK 42.30s sc_prohibit_cross_inclusion OK 40.51s build-aux/meson.build | 1 + tests/meson.build | 14 ++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index c506feefd2..e7b2db8759 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -44,6 +44,7 @@ if git potfiles_dep, ], suite: 'syntax-check', + timeout: 120, ) endforeach endif diff --git a/tests/meson.build b/tests/meson.build index 0de0783839..702090d594 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -546,6 +546,10 @@ if conf.has('WITH_YAJL') ] endif =20 +# Increase the default timeout because some tests may run longer, +# esp. on slower systems. +timeout =3D 180 + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( @@ -577,12 +581,6 @@ 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) endforeach =20 @@ -683,7 +681,7 @@ endif =20 foreach name : test_scripts script =3D find_program(name) - test(name, script, env: tests_env) + test(name, script, env: tests_env, timeout: timeout) endforeach =20 add_test_setup( @@ -703,6 +701,6 @@ add_test_setup( '--suppressions=3D@0@'.format(meson.current_source_dir() / '.valgrind.= supp'), '--error-exitcode=3D1', ], - # default timeout in meson is 30s + # Tests take a lot longer when run under Valgrind timeout_multiplier: 4, ) --=20 2.26.2