From patchwork Sat Jul 22 00:36:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 705692 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75005C001E0 for ; Sat, 22 Jul 2023 00:37:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230185AbjGVAhc (ORCPT ); Fri, 21 Jul 2023 20:37:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229861AbjGVAh3 (ORCPT ); Fri, 21 Jul 2023 20:37:29 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [161.53.235.3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A046A3A92; Fri, 21 Jul 2023 17:37:24 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 5D9066016E; Sat, 22 Jul 2023 02:37:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986243; bh=7W3ynW0vvotn+/mE5zS4UF/4GcS0BEQbaUjU76Bkz1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b5gOO2Q9p7k87Wp9EEjtvpQQWxYc0wAjuibY4frrWvHjvG1UCZTJ7EFBEDrz2RxXI S9i2ZkUmaSkdeNcCr6iiCBvoSmT01WadWGy/RyjLTHyyGWdB9eqHZZT2jbk6s20dO+ 7enGMFNyktcGKpyUiNqjIW8UbtDbQr3NVRQoeoMs3Vtbh5j/XpaAVfWTjd2P0jwAuv p5NrWFWEEofjZQvkEkJTkOyxr8l2pnG+ax5Lt90bvgJ/1Li1AWb8MKxlHZGPnSPSdD AZeYnGfbUJ9N1Xtsh6z2ZhSCLCxvpekChqJdXwyuHMNfP3rrREzn4x83xN0i7i6rsb pWHFmrfbcAyDQ== 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 64sfHafPNM-S; Sat, 22 Jul 2023 02:37:21 +0200 (CEST) Received: from defiant.. (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 42FD660177; 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=7W3ynW0vvotn+/mE5zS4UF/4GcS0BEQbaUjU76Bkz1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dOy9XdPhdOHptX5peyzm3KrhunrfImNtT4XOenc1nyLGcd/AhGbHl4JROIiSLtOT+ nyYt0KoiK6ZM0ZbuQNGSX3qVi2rfoHWDQb5ykDgcdgMB+oz5AXhacAdfif/P618tHJ FYIDLfowL6Wz+mlLLnj/6zKjCAPM0vF7LiHh46Oj3zF5NzCTDJtTQHF4aAEBnK4c2w SrgS1O2mWBVUwBz4q6imxQmCvyOlb9vYS+cHetVLpVDLd7UpTtOZFnt0aG4z2cirDW 53L8kNpGYtr5aIksBtypO4urBA+NwXJXsP/yWARWlTjpqkfoPYThcjxWEzTjVVyLFX rTBuq0GBNWJiw== 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 Subject: [PATCH v1 05/11] selftests: forwarding: gre_multipath_nh.sh: add cleanup for SIGTERM sent by timeout Date: Sat, 22 Jul 2023 02:36:04 +0200 Message-Id: <20230722003609.380549-5-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 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add trap and cleanup for SIGTERM sent by timeout and SIGINT from keyboard, for the test times out and leaves incoherent network stack. Fixes: e035146d65603 ("selftests: forwarding: Add multipath tunneling nexthop test") Cc: Ido Schimmel Cc: netdev@vger.kernel.org --- tools/testing/selftests/net/forwarding/gre_multipath_nh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/gre_multipath_nh.sh b/tools/testing/selftests/net/forwarding/gre_multipath_nh.sh index d03aa2cab9fd..8338b8693387 100755 --- a/tools/testing/selftests/net/forwarding/gre_multipath_nh.sh +++ b/tools/testing/selftests/net/forwarding/gre_multipath_nh.sh @@ -347,7 +347,7 @@ multipath_ipv6_l4() multipath6_l4_test "Weighted MP 11:45" 11 45 } -trap cleanup EXIT +trap cleanup INT TERM EXIT setup_prepare setup_wait