From patchwork Sat Jul 22 00:36:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 124178 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp561399vqg; Fri, 21 Jul 2023 18:26:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlEpXFQTikDip+9k7wRVvRG5slZXwUkvCZnS0IAORPehIRWRI3flIZjAkLp5RTXXc330jzUT X-Received: by 2002:a17:903:248:b0:1b9:cf52:2bcf with SMTP id j8-20020a170903024800b001b9cf522bcfmr4601808plh.0.1689989174147; Fri, 21 Jul 2023 18:26:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689989174; cv=none; d=google.com; s=arc-20160816; b=KWKummju44xxk09fRRuOeJdrpvReOl9i0uPg23ZbGSGvz4gAZkaOK7V+5Gu0WLSt4z hP+ssuE+JfNXIBRrLZuuU+c7aWDkR/7eWpc2Sw+AetX1w60Z+7fUGhZH8I5uBVxOj+Su bh+GAbnAgt11bY7Bo7xyAPzyXoNb/RaJS7tZB9OgHYINUAl3lCXxtMs/PAXOzvfrZB6J M9OMUZ4orbjn1ZijUjcwaNiEWwvf+DCmBPit+twG8q/8SCFzn74aHam4jdtn5Mf5Boqo YzR8bIggedPrGjFlzHvy7mo+p8ys8ub8UiW5HK/D1Sqn2ocQhfmFa4nYiGgplTYd69PD QooQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=lgnJXz9UxDC5ao8DOEQ5d0nw1NedsP2bsadmXVynyMo=; fh=9eNe4yDz43TVLfdy4jKRk1MUjI4Q+A+ZURr2UccJmnI=; b=vWXO5sG1rnPOS6obLhGzYlcItpRimD+NRpJ9Hs+8yk0nOc89cVniIcKO0dAxbUuYg5 RmGdGnP50m8232+Zc82cXxArSTamGFyQU8hq07b1IAvOgqitDkCW7XGp4MMRFwAy3vw6 xiuCk75wk0q7O+/DkKfRpfLrHaCsMES8Xn4rinciKQX8g/i7f8zhTN2VZKH/5DKAau6f nwpHcHsjMvJ3rVBpE0TQmNtFpnjHeKxeyVKeR3Uu+eBlsndWlpu/GtH1SPxmW7spUR2U VOFea2XmWKqZ/TIE11LlMj9m/Pzx797xCbtxgviJWHqaAaGEkd2PLF+ND5dNUTSnMfBN sBaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b="AC2oJSH/"; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=Ui6S7uvd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lc15-20020a170902fa8f00b001b6aeea4a58si3978324plb.53.2023.07.21.18.26.01; Fri, 21 Jul 2023 18:26:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b="AC2oJSH/"; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=Ui6S7uvd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231365AbjGVAhu (ORCPT + 99 others); Fri, 21 Jul 2023 20:37:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231313AbjGVAhb (ORCPT ); Fri, 21 Jul 2023 20:37:31 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [161.53.235.3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17F263C2B; Fri, 21 Jul 2023 17:37:29 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 9C81C60171; Sat, 22 Jul 2023 02:37:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986247; bh=0rIok0EQjGTKvrvF2VSOh1b7Lbci4BJ+WsapvWPqS0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AC2oJSH/7x1aPR0Ere43VQEq6IaMuX7vPYg/F1HX8dPzHq7swg73PqxAnW/j0EnRV J8EJ1cGXYulr5N9otXP1xsSFE9z9pSpoeR92NDVzmoDRJlaU2trfR62v9ZWWacUzCP 1m2UVbJBbFpu2uHzCqUOsjSSmOvqiWWZg6NRjgFTvb2INXMGMjebpb+ImFxU4HAlx6 1KErleLgXm5SydI2SLwIST2/Kz0VSLd5J++RtaN/3hDyctJ5elic7dlCBTqIQzpcKd KE+p6wJMhEjdj2oVai8ya4nW5x2kWYkWVonjzMgYT/unwsnl00Ra8Jg0BfsBUWAnja TMnvA29AzEoUQ== X-Virus-Scanned: Debian amavisd-new at domac.alu.hr Received: from domac.alu.hr ([127.0.0.1]) by localhost (domac.alu.hr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fNK3DkGWk327; Sat, 22 Jul 2023 02:37:25 +0200 (CEST) Received: from defiant.. (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 8F2F360187; Sat, 22 Jul 2023 02:37:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986239; bh=0rIok0EQjGTKvrvF2VSOh1b7Lbci4BJ+WsapvWPqS0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ui6S7uvdNgWhgmba5K9OGGRa5oyfotQUulpVDWyVewiPvWs1Bo0usDI1euBMsMheh HsouynCu6slqll51WV1iJZPKE7HogdWh5BqasQD4w3Deej4BbY+vdUYoCFzrDtb0qf VfrVakBtXb5tCgcAkt7B/RLsVaZCvHbTH3/P00qVxWQ1YaHQI8LYdmYoAhbBL5CwrW Z7wYrgaZBqZoWq8yhGZhvEuNDlqEhd+OggJuIJ2a7GIadDATRqUlFK6dBDs+iU67Qv G9b20xWgk+I3c7byt4+b84YDfTgBYAsOtK/KAy5kIDD9CS41hdaU63LJ7EG60tiLfp vxa8R1aHr6s+w== From: Mirsad Todorovac To: Ido Schimmel , "GitAuthor: Mirsad Todorovac" , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , David Ahern Subject: [PATCH v1 10/11] selftests: forwarding: router_mpath_nh.sh: add cleanup for SIGTERM sent by timeout Date: Sat, 22 Jul 2023 02:36:09 +0200 Message-Id: <20230722003609.380549-10-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> References: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772082088300383199 X-GMAIL-MSGID: 1772082088300383199 Add trap and cleanup for SIGTERM sent by timeout and SIGINT from keyboard, for the test times out and leaves incoherent network stack. Fixes: cab14d1087d9b ("selftests: Add version of router_multipath.sh using nexthop objects") Cc: David Ahern Cc: Ido Schimmel Cc: netdev@vger.kernel.org --- tools/testing/selftests/net/forwarding/router_mpath_nh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/router_mpath_nh.sh b/tools/testing/selftests/net/forwarding/router_mpath_nh.sh index a0d612e04990..0580519ab6d1 100755 --- a/tools/testing/selftests/net/forwarding/router_mpath_nh.sh +++ b/tools/testing/selftests/net/forwarding/router_mpath_nh.sh @@ -414,7 +414,7 @@ if [ $? -ne 0 ]; then exit $ksft_skip fi -trap cleanup EXIT +trap cleanup INT TERM EXIT setup_prepare setup_wait