From patchwork Thu Jan 26 11:22:31 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: 647095 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp186386pvb; Thu, 26 Jan 2023 03:25:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXtfWxEpjbkL/zumvfQyrVFJ1HgUm/zdxqwSTpFMLXokmE2pqScK2PJqNHyP2yiHKdsBiGa/ X-Received: by 2002:a05:622a:6028:b0:3b6:3aad:afe0 with SMTP id he40-20020a05622a602800b003b63aadafe0mr47669532qtb.11.1674732350418; Thu, 26 Jan 2023 03:25:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732350; cv=none; d=google.com; s=arc-20160816; b=VVXx6gyq0YlMBsuZm9CrgcIHocMNUzDK3jX+E3EceIeygCyRgS19Jk2U5JEr8DdE08 DfUWKOw7BDmSLxomnULzqIFELyyJhrTkfOMbGuo2Jk2HuNtZR4ZO6+g2KEghKNoFurku N9q06QatppXTUX8SarDZ4OynRikuNiL3KQfiHFS2HUBx83LHCmxh/TkFbMgHC0+X7Xnq RrGWL482nNgQKMAhViFVJDvlYZBDglnQ9Fv7IGHgucf+enmBZ4Ij5GiLIZE2neBhrnX8 PXvsdHuWqoW1Ogm36WD+Ckl1sHLTs+j24D4TPaodOFrBcBKNzTvSpwX+pX/VRT/lrz8b kREw== 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=5jrg3BCHzkEEvgvsCu9pnvQ76HLYPlXnAsGxfTUecSw=; b=w9wbJLvccsPiMuzlDd96TNmGh9ZC97I8mVXr0yBeJ2JVjDO+9w/HOTC2FfaQFPJTbp AITNHGllX/3XLo37RYykC+/BnOJ71BkhkiznfYC1rbx+G6HkfoaiMxFhg55FFSbP/G+6 KNk8l62/Z0A1R0dtqNVex+owiwUW+AG8290OCIJM8DTraU4oVecBiXR6I4wr4CXHkeAA W8xFEaBMEqfrpujhHI7khMpr7WIwk5dEPB5wqYu0wbcX7QOYmFIrpdceow5awF7Gotba ji3DD1PT27b68QTEHj8I+XhLuq8VVvdy+VOonokqDIVyiXht32KxCS8HS+Qy+jA33453 5QvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=x2FPYywr; 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 b6-20020ac85bc6000000b003ace032d9a3si553854qtb.378.2023.01.26.03.25.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:25:50 -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=x2FPYywr; 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 1pL0LY-0003F1-BF; Thu, 26 Jan 2023 06:23:13 -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 1pL0LQ-0002Yn-DY for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:04 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LN-0003t6-Iu for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:04 -0500 Received: by mail-wm1-x336.google.com with SMTP id c10-20020a05600c0a4a00b003db0636ff84so915885wmq.0 for ; Thu, 26 Jan 2023 03:23:01 -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=5jrg3BCHzkEEvgvsCu9pnvQ76HLYPlXnAsGxfTUecSw=; b=x2FPYywrJhUCdrSwcEWiF782PV18BCk2bpZOLXwsoj3RZtLuW0GV2WKkMGTPqxpTpi UPQuH8lj8srKT2AQ8M9mzQc2+9aYQuKmp4FUtwMtqvWz7CFZvSDKzs+sR39fJKSAhfeR QqMYkPPIX2Tv1JOwoJhGi1x+E6wtWyhBWPc+HOicHjDNG0kS+GtVMwlR01p2bUo7T+ZL XJVrF0O7srM3phbem1cbSuva6xIsJNiNF6YSMp0FRUsqBoZYCF6VG75gu6FQ4ioM9GuO 6c1SdxBBCDguUaUrkR/jSByKfMvFBmed5YlxNpnQ5NrjUjDUVP35sgpay0V6JrEjm7Ti ZbjQ== 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=5jrg3BCHzkEEvgvsCu9pnvQ76HLYPlXnAsGxfTUecSw=; b=s/x08p9MjacMdrB9/BVBHJWJlEnXeIuLVMPFMXXMfgoUV71N7mrV5LJ03UrRecqxpt NeAbiKiBDSdSOZ9RRzDZKyyco9BLekbBkijHcoFFNiXWHn6Tw3lF3xBoY0DfMAD1kDiL leXA8jB+pI3AXK60n45IuSIIsg7nBY0qMikYMcFiQFHobwNz3E6tZMBaTcWKU3v42S0D swJFffu5BJFnTjqYXPZYY4VnlNggYZQz8k8Kn65GtANSc4yBHmQn0sMbMjQhr25/wAuV Le/d9SFVeMS73E+TfTrbYcXOeqK6QuxLFxtfEvgS/NcPs70q1RUmja8fdMc77gPuylyc yPiA== X-Gm-Message-State: AFqh2koEZDfzZ9e4GZ+9PxkuEHv2aHxP53B7vHPenp9t9okPrHYDCusw xG2tI+dvQPZ3Hx+NPmGbo1nRmw== X-Received: by 2002:a05:600c:5116:b0:3da:212d:9dc0 with SMTP id o22-20020a05600c511600b003da212d9dc0mr35406295wms.14.1674732179850; Thu, 26 Jan 2023 03:22:59 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u11-20020a05600c19cb00b003d9fb04f658sm4801290wmq.4.2023.01.26.03.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A042D1FFC1; Thu, 26 Jan 2023 11:22:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 16/35] tests/tcg: Use SIGKILL for timeout Date: Thu, 26 Jan 2023 11:22:31 +0000 Message-Id: <20230126112250.2584701-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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=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+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é Message-Id: <20230124180127.1881110-17-alex.bennee@linaro.org> 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