From patchwork Thu Dec 30 23:54:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 528968 Delivered-To: patch@linaro.org Received: by 2002:ac0:b243:0:0:0:0:0 with SMTP id s3csp5082501imc; Thu, 30 Dec 2021 15:55:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJxpySehBuCD62OtJzfebIGcXRhNyD6iD2RZMV03VC6mxw4z7pzIQRdaCqs1+ZuPhpV54C9B X-Received: by 2002:a25:7dc4:: with SMTP id y187mr42203960ybc.165.1640908519319; Thu, 30 Dec 2021 15:55:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640908519; cv=none; d=google.com; s=arc-20160816; b=cMCJsvM2TopE24yq9SnMU++uEBC2cChRJZiqsCqZf9SVkOyZGmT5yH9YvAW5Q3ELY5 iRsSR65MYi40MsazKl+UrkbJ43OFrrA6USxHa+ZMjJY7KXB658gGDAvTaY4Z5f/dB5qd CJrdksd3b1Oe4QQwQopPjSYoWjFo7hujiCdRQbAWC8pMxXP3t52SUBW9BxI8d6g5ivVr 1g5eakAs/0OxH5aaZ98SVSVVVKbzrxTV0WRzaWMFOPGURDjhfjlscUo7D0DSMvER9Z6P 4FF2Ely1CLe0+d0Sqq5/rtcYD5W+GwzghCEVlZqcv0VYS2AZnBurGemgc2Los3ov+Zxt /h1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=ce4EdEvJ54s5dx2BGommxFo4mh0NFq12faqUaOkjkjI=; b=ssTa+j4w4cBZnEcMDuD8kO+SOv2/Zc55JWelfpq/EMiMca47VwiHGqAcq/EgzQDFpk 2dFaR7YAYttwRUcZsIxmXnuARPbRvZyeRxU1TiuD1TzAoIIUqXbATNEZpUFiS4tGhiVc uFL5D2DvWnO/jfybsCXdVMoMOREbyuyiaGG52A+fnK4MqJ1AMHgyJ6EbGroA4I4hAMtz 0Wmo/qjv+cbBdu6qlnSa6oBR1GrxqPpNMvVMAt2IPG1geNLFwNAqWnia2hP2CUWt0qs5 tSgSIrFofFxz+3oxvvZIo+qjjUNFAuXlwHiUEgh4LRmCoJcva7n5rvxiUwfN1+QHaixu I1gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CjdDUc46; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r9si19232934ybb.634.2021.12.30.15.55.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Dec 2021 15:55:19 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CjdDUc46; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n35GQ-0008OA-NI for patch@linaro.org; Thu, 30 Dec 2021 18:55:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n35Fd-0008O0-GV for qemu-devel@nongnu.org; Thu, 30 Dec 2021 18:54:29 -0500 Received: from [2607:f8b0:4864:20::102f] (port=44549 helo=mail-pj1-x102f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n35Fc-00079f-0I for qemu-devel@nongnu.org; Thu, 30 Dec 2021 18:54:29 -0500 Received: by mail-pj1-x102f.google.com with SMTP id n30-20020a17090a5aa100b001b2b6509685so7059415pji.3 for ; Thu, 30 Dec 2021 15:54:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ce4EdEvJ54s5dx2BGommxFo4mh0NFq12faqUaOkjkjI=; b=CjdDUc46QN6KgW53A6Tml8tIFPrg68RvGuAgCzZu5rwvLzkKouZVXXn+3LQaLQvBNb FZVqZ8KRv8Lcsid1qD08pDWBaEwYkQJXgPHgMmjfU4E0Ov1mFfgHBXpSUQtqomCnXgSB bA0g+pZjFZsWnr/ZXCDQ49clpxHMzTprFda6zp6N7PqkPfqqqkj2lgh6YQA2onGBHppB CajPAt1pm9djUzsYhljUQc6oF9Kp9ivHT4UggA7uRvjB9sorGP/HI6fP8IxLmWwHwWu6 LxL5vt57zna894xrotv7tBHl5YrSspvfSzQxoVgRwHY9nSl4zq2ysWD1ijKgKEnihGCe YMqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ce4EdEvJ54s5dx2BGommxFo4mh0NFq12faqUaOkjkjI=; b=2cUbvMdCy67xplP7e+G5ShLa7QHp91h7BHtspV8oubOsf1VYAK4vhidTjI5ufcqHAb 4UtYCUhOI0nC2vID+3Y6LMXe6s3ZS0xwUVPBlM6WfhUmfwi/5k8FIUrvp46v+kOkKISF jGs3K7yeajbyVlMsxXjsm8mVkr3cAEsaTAgJVIM4IZhz43hbhKu+r0MSvDz4xNfBDIw4 7ETCR0og/WcKueibJ8qTVA+/n0Z1d54QKWFRYL1zlohGncBdwtW7Z2bxhlLiQOehu3gU wFzqYeqau1pE8ZzRQLcPxNiQaqtPnJKT82mZDeGQmY3V+F8m2NAm8DZzpWHYzqq+yy+R 2l5Q== X-Gm-Message-State: AOAM530FGREbOqLk+Gq8HKCSCXmyl8VnIZbSU06cHNlnHC6yeJIpzOzt 2pqtji5cyKzexMgpTezEoD61qZwT+XyHtg== X-Received: by 2002:a17:902:b189:b0:143:8079:3d3b with SMTP id s9-20020a170902b18900b0014380793d3bmr33508867plr.71.1640908466250; Thu, 30 Dec 2021 15:54:26 -0800 (PST) Received: from stoup.hsd1.or.comcast.net ([2601:1c0:6101:be80:23dc:65c4:ecfd:93ff]) by smtp.gmail.com with ESMTPSA id u71sm23421858pgd.68.2021.12.30.15.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 15:54:25 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH] tests/tcg: Unconditionally use 90 second timeout Date: Thu, 30 Dec 2021 15:54:24 -0800 Message-Id: <20211230235424.49155-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102f (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102f.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: pbonzini@redhat.com, alex.bennee@linaro.org, f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The cross-i386-tci test has timeouts because we're no longer actually applying the timeout that we desired. Hack around it. Fixes: 23a77b2d18b8 ("build-system: clean up TCG/TCI configury") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- tests/tcg/Makefile.target | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) --- This fixes the persistant timeouts that we've been seeing in gitlab for the cross-i386-tci target. --- diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 63cf1b2573..0f8645f782 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -82,13 +82,12 @@ QEMU_OPTS= # If TCG debugging, or TCI is enabled things are a lot slower -ifneq ($(CONFIG_TCG_INTERPRETER),) +# ??? Makefile no longer has any indication that TCI is enabled, +# but for the record: +# 15s original default +# 60s with --enable-debug +# 90s with --enable-tcg-interpreter TIMEOUT=90 -else ifneq ($(CONFIG_DEBUG_TCG),) -TIMEOUT=60 -else -TIMEOUT=15 -endif ifdef CONFIG_USER_ONLY # The order we include is important. We include multiarch first and @@ -144,7 +143,6 @@ PLUGINS=$(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c))) $(foreach p,$(PLUGINS), \ $(foreach t,$(TESTS),\ $(eval run-plugin-$(t)-with-$(p): $t $p) \ - $(eval run-plugin-$(t)-with-$(p): TIMEOUT=60) \ $(eval RUN_TESTS+=run-plugin-$(t)-with-$(p)))) endif