From mboxrd@z Thu Jan 1 00:00:00 1970 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 picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 104BFC433EF for ; Mon, 27 Jun 2022 07:27:46 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 3615B3C8FF0 for ; Mon, 27 Jun 2022 09:27:44 +0200 (CEST) Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 3735B3C14B2 for ; Mon, 27 Jun 2022 09:27:32 +0200 (CEST) Received: from mail.jv-coder.de (mail.jv-coder.de [5.9.79.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 5FBD61000465 for ; Mon, 27 Jun 2022 09:27:31 +0200 (CEST) Received: from ubuntu.localdomain (unknown [37.24.96.116]) by mail.jv-coder.de (Postfix) with ESMTPSA id 93A609FF8E; Mon, 27 Jun 2022 07:27:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jv-coder.de; s=dkim; t=1656314850; bh=u5ndKJAr6Xib1GaIdTBFEQFJ0V0dWMhVWaL0cPIBA+w=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=emTP8P8u+8FBxOv9ug1jFoBYu3fW5h0aNcbyLMlv0iFTOSp9MNOziU6f1YanKNdCH dNjvaFTJrfMAbNHfh1Ky28Gb28qvy+mjj+wP21uV6ixd+JVBkzfwktEAIOp1/fHKk8 66QSNp6v0VX0vSvmzN2hGdkPU+P+YlHdX8yw3zI4= From: Joerg Vehlow To: ltp@lists.linux.it, pvorel@suse.cz Date: Mon, 27 Jun 2022 09:27:09 +0200 Message-Id: <20220627072709.709035-1-lkml@jv-coder.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH] net_stress: Fix usage of variables from tst_net.sh X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joerg Vehlow Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" From: Joerg Vehlow These tests use variables (NS_TIMES, IP_TOTAL, ROUTE_TOTAL and IF_UPDOWN_TIMES) from tst_net.sh, before sourcing it. Fixes: 04021637f4749a4797bf105862c45fe07374a161 ("tst_test.sh: Cleanup getopts usage") Signed-off-by: Joerg Vehlow --- testcases/network/stress/interface/if-addr-adddel.sh | 7 ++++--- testcases/network/stress/interface/if-addr-addlarge.sh | 7 ++++--- testcases/network/stress/interface/if-route-adddel.sh | 5 +++-- testcases/network/stress/interface/if-route-addlarge.sh | 5 +++-- testcases/network/stress/interface/if-updown.sh | 5 +++-- testcases/network/stress/interface/if4-addr-change.sh | 4 +++- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/testcases/network/stress/interface/if-addr-adddel.sh b/testcases/network/stress/interface/if-addr-adddel.sh index cb453e612..0750501f0 100755 --- a/testcases/network/stress/interface/if-addr-adddel.sh +++ b/testcases/network/stress/interface/if-addr-adddel.sh @@ -7,9 +7,6 @@ IF_CMD='ifconfig' -# The interval of the check interface activity -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} - test_body() { local cmd="$CMD" @@ -89,4 +86,8 @@ test_body() } . if-lib.sh + +# The interval of the check interface activity +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} + tst_run diff --git a/testcases/network/stress/interface/if-addr-addlarge.sh b/testcases/network/stress/interface/if-addr-addlarge.sh index 3c876c17d..d0759c86b 100755 --- a/testcases/network/stress/interface/if-addr-addlarge.sh +++ b/testcases/network/stress/interface/if-addr-addlarge.sh @@ -7,9 +7,6 @@ IF_CMD='ifconfig' -# The interval of the check interface activity -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))} - test_body() { local cmd="$CMD" @@ -110,4 +107,8 @@ test_body() } . if-lib.sh + +# The interval of the check interface activity +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))} + tst_run diff --git a/testcases/network/stress/interface/if-route-adddel.sh b/testcases/network/stress/interface/if-route-adddel.sh index b50da268a..51445e4f7 100755 --- a/testcases/network/stress/interface/if-route-adddel.sh +++ b/testcases/network/stress/interface/if-route-adddel.sh @@ -7,8 +7,6 @@ IF_CMD='route' -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} - test_body() { local cmd="$CMD" @@ -64,4 +62,7 @@ test_body() } . if-lib.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} + tst_run diff --git a/testcases/network/stress/interface/if-route-addlarge.sh b/testcases/network/stress/interface/if-route-addlarge.sh index 7d09d1216..355b6b4ab 100755 --- a/testcases/network/stress/interface/if-route-addlarge.sh +++ b/testcases/network/stress/interface/if-route-addlarge.sh @@ -7,8 +7,6 @@ IF_CMD='route' -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))} - test_body() { local cmd="$CMD" @@ -76,4 +74,7 @@ test_body() } . if-lib.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))} + tst_run diff --git a/testcases/network/stress/interface/if-updown.sh b/testcases/network/stress/interface/if-updown.sh index 9a5709c85..71c78d785 100755 --- a/testcases/network/stress/interface/if-updown.sh +++ b/testcases/network/stress/interface/if-updown.sh @@ -8,8 +8,6 @@ IF_CMD='ifconfig' TST_CLEANUP="if_cleanup_restore" -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))} - test_body() { local cmd="$CMD" @@ -47,4 +45,7 @@ test_body() } . if-lib.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))} + tst_run diff --git a/testcases/network/stress/interface/if4-addr-change.sh b/testcases/network/stress/interface/if4-addr-change.sh index b9ece2af9..f162e6a51 100755 --- a/testcases/network/stress/interface/if4-addr-change.sh +++ b/testcases/network/stress/interface/if4-addr-change.sh @@ -9,7 +9,6 @@ TST_CLEANUP="do_cleanup" TST_TESTFUNC="test_body" TST_NEEDS_CMDS="ifconfig" -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} # Maximum host portion of the IPv4 address on the local host LHOST_IPV4_HOST_MAX="254" @@ -61,4 +60,7 @@ test_body() } . tst_net.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} + tst_run -- 2.25.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp