From patchwork Tue Jan 24 18:01:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 646060 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp346495pvb; Tue, 24 Jan 2023 10:18:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXt3FNIfCuY9A8BSGLLwZTnWYeC64mgRLmdyAKhIlPmwKz+KzqwyOoom3W0UTtFTS+h9sQAp X-Received: by 2002:ac8:7ee6:0:b0:3a8:28fb:b076 with SMTP id r6-20020ac87ee6000000b003a828fbb076mr38399513qtc.31.1674584303552; Tue, 24 Jan 2023 10:18:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674584303; cv=none; d=google.com; s=arc-20160816; b=dwWW7yBqi2YJAXPF+VKOB1b4WBneZvzBCXNFl75684Cc+QlSEaqwr15IVs22D67NO6 zrffbonu7H5AdNtMG/JCeASZwQ7splRAZhGVky0NhFhUibzo0tRoSt4w1WXd3/JkQEXW dtRzG2I3zN6mM4kaM93EtsdF0Ew8ZhpQYKJo2M9P+g1jicoVp1ZXAsHUyxCwkiP52/cQ eNbQHFHvgnPfSYzQx31EWMBVHlnlD0IPCBBczFMJzWgNVsmjQQO4cSuAhaeg1t8IcxkD K4mGDSqszYfJyijcSCkRpydWbemWuVIb093VQEYzm8OCPtUo9y+YSAQCeZLk6dYhjdmK pncg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4qbDvp85POUXncnPDWXMO/+Z4Ga30ccTwEsD+MJEPGw=; b=Vq18CM/C3uTLXdp6omnMtC8M8kO83lvlGXDZtOzn+ZsHS4Yhp6P/9/Fy1TqvqHMCex g+ivAipDxVGXpqhIc+gSafVlaXuLyxXkOF3njEraR8Gu51hO8x4hRzf7Sh7M4c4+MwOs CAdpRNh3m7BBanjhKA19XLendAQaKRWMARzvbE/oHBMYedXtuMHuuRO/Dn9Vzgp38ums 3m8IjUsC28EkSvNVgqja/2w6yFWH9fiFgL3dsggdtV373pDGBdLtpP0SRdd1hSQcA8X3 kSJMsjBVZHf/DQrN+RTPFy8lRZM1dX+/iIEDUkNJa3AEiD4KjyQTomAF7dZGc3/4wWko n6Hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qhRRcx+d; 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=pass (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 v7-20020ac85787000000b003a554e26c7csi2350933qta.403.2023.01.24.10.18.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jan 2023 10:18:23 -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=pass header.i=@linaro.org header.s=google header.b=qhRRcx+d; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKNr0-0003us-0B; Tue, 24 Jan 2023 13:17:06 -0500 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 1pKNqu-0003nH-KH for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:17:01 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pKNqs-00010J-EN for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:16:59 -0500 Received: by mail-wm1-x32f.google.com with SMTP id e19-20020a05600c439300b003db1cac0c1fso11952797wmn.5 for ; Tue, 24 Jan 2023 10:16:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=4qbDvp85POUXncnPDWXMO/+Z4Ga30ccTwEsD+MJEPGw=; b=qhRRcx+dTdi54MuSsh+GW9AMtIbwoWrD2y4ee+nM1qYydSdi7VwsBX5UfSiCRV4HBm aaqs4WaeG1ySmzR17n48EXN7ySSYzEQWBqY6buANvYzEMz/eswGbllFVElt5rrgdmKx9 tV2wA9C6tj0FcLlRZ9sx0u8UVVyv0okpaIO7I5rngWAs+aTtgPkSzErOb6mdDAJ8crNe bla3ukCdlmrMq/C0nfcOE4nIyYQVup3DDto7tiKIxop2G94wpUTlgNnvJc/Gyik2kD9l 24X9nOxEJ+f2APe43tYppLIqpNzoSuVwlYDkmFAtlDPwy0ALEDAwDIddxdQxrr4ykhs1 fz0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=4qbDvp85POUXncnPDWXMO/+Z4Ga30ccTwEsD+MJEPGw=; b=pl8FWl6ZDanapouLP5Bbq7eAztaM6t/RipOqhIFXEmuOJoO1YSMmpReoIuRhCG8IIe 1L0so2vFTTJ3juzn8O8vY7S4WT6l0PsjCYgVomn8TTvt/FivqLBBGfkedP8pLydbHkNo ok8Ip7FikhUfoCFv10FqvTLbGuzafzY07L4cOqKfp2mdy3RfTEzn1Pgi4tWq20bM49tU PDgJZs9BcDoyDddsVkZtqkmvVHjpKatMM8VwMs8Pm5IbAttLgtSNwvBH9xlWA9IYhgRu BKZoVUtq250Yf0LSybjBQZLcBf3B4ByK1G97Qg2rZ/0zndAs/KDR81WkoyAdNYdyeaSI Ps3A== X-Gm-Message-State: AFqh2kreTPEDz9UuQs8RMwu7oj/SD3zp4TPOLKg0OrEJHWscxW+v1ux0 KgPc7UT5AW/FP6whrT+cFwphhA== X-Received: by 2002:a05:600c:2d84:b0:3d9:e8b3:57f9 with SMTP id i4-20020a05600c2d8400b003d9e8b357f9mr29158303wmg.8.1674584216676; Tue, 24 Jan 2023 10:16:56 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t13-20020a1c770d000000b003db0ee277b2sm14076015wmi.5.2023.01.24.10.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 10:16:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A3D351FFC6; Tue, 24 Jan 2023 18:01:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Ed Maste , Thomas Huth , Alexandre Iooss , Markus Armbruster , Jagannathan Raman , John G Johnson , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Bandan Das , Elena Ufimtseva , Michael Roth , Eduardo Habkost , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Qiuhao Li , Stefan Hajnoczi , Alexander Bulekov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , Darren Kenny , qemu-arm@nongnu.org, Yanan Wang , Cleber Rosa , Wainer dos Santos Moschetta , Marcel Apfelbaum , Li-Wen Hsu , Peter Maydell Subject: [PATCH v2 16/35] tests/tcg: Use SIGKILL for timeout Date: Tue, 24 Jan 2023 18:01:08 +0000 Message-Id: <20230124180127.1881110-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230124180127.1881110-1-alex.bennee@linaro.org> References: <20230124180127.1881110-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson linux-user blocks all signals while attempting to handle guest signals (e.g. ABRT), which means that the default TERM sent by timeout has no effect -- KILL instead. Signed-off-by: Richard Henderson Message-Id: <20230117035701.168514-2-richard.henderson@linaro.org> [AJB: expanded commit message from cover letter] Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/tcg/Makefile.target | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 14bc013181..a3b0aaf8af 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -54,10 +54,10 @@ cc-option = if $(call cc-test, $1); then \ # $1 = test name, $2 = cmd, $3 = desc ifeq ($(filter %-softmmu, $(TARGET)),) -run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2 > $1.out, \ +run-test = $(call quiet-command, timeout -s KILL --foreground $(TIMEOUT) $2 > $1.out, \ TEST,$(or $3, $*, $<) on $(TARGET_NAME)) else -run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2, \ +run-test = $(call quiet-command, timeout -s KILL --foreground $(TIMEOUT) $2, \ TEST,$(or $3, $*, $<) on $(TARGET_NAME)) endif