Received: by 2002:a05:6358:701b:b0:131:369:b2a3 with SMTP id 27csp595497rwo; Fri, 21 Jul 2023 18:03:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlEZfvRvx2OI9mJrGmLiQ+ni27T+j7FkJo5AmKosqcPQ2yQ5yezuiAe/GiUM8pGj86hi5CwN X-Received: by 2002:aa7:db50:0:b0:51e:f83:6de3 with SMTP id n16-20020aa7db50000000b0051e0f836de3mr2644319edt.17.1689987806486; Fri, 21 Jul 2023 18:03:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689987806; cv=none; d=google.com; s=arc-20160816; b=BEPQIIIqugn5c+GKov8bbQUxWFKiZHhccDSbo5Hzu4CR5EYozZgIW2wUfc0pFcqFuh Fqo+uUy/21uRIMShNyAC+q8HET8adJ9IKW3IcuNHvdWsTLjPmoQuLJNh8/nG8XMn4edV HZ2lrjqOAh11YpiQD9scjg/lpL9/0y2qwjd9WEvvQlRGYXA6oLmMIc0aY4mbYhN1+U0Y lXQmIuwwykHc8yBBVeqKJIwE5PvR3oKdPh5UjMDg9PrWO6S+fEWOYys2U6tyIF5DDEeW zFmEnGTQ1xUMP9N3rG1/V3/3s/+EMjVczYKYYuqxDbdQaTwZ7FDr2LB6UGvQazTEU+Eq R5Ig== 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=e/YgXGgDmCZiADPnsxrg4iTBRynG672CDqehy9ju1Is=; fh=+RLa/lR/Y4Ewu083Dn92qlquCcVI+eAd0l+/UvctN2M=; b=aPW6LEWrtZbJQ6by1MTO1zPMm7MfNM6BS+j6YgZ7nykjckZLjcNQQwGUezHUhl8qo2 jH40rZepYRF/AIYn1RceSNG+Y+Z1aLOKeZ6BeWlrk0iR0vI5i3S4NUznVIsG5u0hizBZ +qVJ82nCOXH1284VBIl0x8zfiiDLCNfNWU/76URZ6QftFdMcsItD5zg+Wu8tntgKpomh YHGuF2Z20nyr53L5+ceZkefhfHuG2H7UsLsCko6A6z81XXRsBTuhTj0wa4U0E+Yw1yOw RUXCmkuqfv+HYDFD451IyvaXchdAwphiA9lPX9A4hPOUfPbHCyuNhV2ddAsca7Rmabmb R+ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b="hdep9Oq/"; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=UrfRg3Qh; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n20-20020aa7d054000000b0051ff2b7561fsi2833756edo.140.2023.07.21.18.03.02; Fri, 21 Jul 2023 18:03:26 -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="hdep9Oq/"; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=UrfRg3Qh; 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 S231375AbjGVAhz (ORCPT + 99 others); Fri, 21 Jul 2023 20:37:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231316AbjGVAhg (ORCPT ); Fri, 21 Jul 2023 20:37:36 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [161.53.235.3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F3D93A84; Fri, 21 Jul 2023 17:37:31 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id AA7CA6016E; Sat, 22 Jul 2023 02:37:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986249; bh=sWsZGt692J5HLzblOPdvGK1H4fS6uyGBmVHdVo25xyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hdep9Oq/WlJCI2xzqQkNIZ0+u3/SEiLmfoKCDOS28kJgR5y8OU85NG+BbmnYIgFcF MCC9ntPCe420CWIQkibZcDUqs/M9i2GtdZl9rgJnqJlPhfholm3FZPOKt88SvGoLLM B68fD8b/q/SCUpII8uMu/1WK+i5UKu3W131LVI9nyY8eqGYF/ba1Jva0AmCYzH18es kIdNvp2Dj/boLPKtcvFNilUfjeZ/9aAtUxJNeeXO7EfvYzv/onDUfcRucl1zLUzfzh AsY8FiNd8W1wlYgVp+NvXyfhxFOPU2MRlB4WlM7OGeIpzM0NmmSQqXyuPAErKY+jS8 kbtJO+LvNI/mw== 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 79G8b3vzwaBk; Sat, 22 Jul 2023 02:37:27 +0200 (CEST) Received: from defiant.. (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 9E54760189; 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=sWsZGt692J5HLzblOPdvGK1H4fS6uyGBmVHdVo25xyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UrfRg3QhteGDLZWiP859NVNSPoQl3xNBdNBJ8rgEZuost82DAK24QzpCOGEJgrSr9 DOxaiPsAv7JQQqKIEZmjXDhXaJT3/iT1/nH0l3Vf6fT94s+QzkzuI0JDk18DXJrGFo QcaNf2S69CaaMWh6Wg1E4x1BQ9lbc9UUstoTiBN8whBDIeqPCagev2zmjuQe4mZLQd Q8zYpECXNnS/s/XkzN8Gr2YX/CpOhBNmBMCJq2VCj3gKagRFF/idVOs77vn7NNEpMC 45VdBX1gD1f6QBrn/mHeZQm+PCkm0gN0h6NhAQXIokQmKxgJhAsWKQMus/Yw+PU7UM lRZqR4Z8zep8w== 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 11/11] selftests: forwarding: router_multipath.sh: add cleanup for SIGTERM sent by timeout Date: Sat, 22 Jul 2023 02:36:10 +0200 Message-Id: <20230722003609.380549-11-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 Content-Transfer-Encoding: 8bit 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 Add trap and cleanup for SIGTERM sent by timeout and SIGINT from keyboard, for the test times out and leaves incoherent network stack. Fixes: 937eeb3482748 ("selftests: forwarding: Create test topology for multipath routing") Cc: Ido Schimmel Cc: netdev@vger.kernel.org --- tools/testing/selftests/net/forwarding/router_multipath.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/router_multipath.sh b/tools/testing/selftests/net/forwarding/router_multipath.sh index 464821c587a5..7b3cfe577e00 100755 --- a/tools/testing/selftests/net/forwarding/router_multipath.sh +++ b/tools/testing/selftests/net/forwarding/router_multipath.sh @@ -332,7 +332,7 @@ ping_ipv6() ping6_test $h1 2001:db8:2::2 } -trap cleanup EXIT +trap cleanup INT TERM EXIT setup_prepare setup_wait -- 2.34.1