From patchwork Tue Feb 19 14:47:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kodanev X-Patchwork-Id: 1044722 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="aS4rPc2s"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 443k802TpCz9s5c for ; Wed, 20 Feb 2019 01:46:24 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 4BB703EA49F for ; Tue, 19 Feb 2019 15:46:21 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) by picard.linux.it (Postfix) with ESMTP id 0DA9F294AC5 for ; Tue, 19 Feb 2019 15:46:13 +0100 (CET) Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 1758E1000DA0 for ; Tue, 19 Feb 2019 15:46:11 +0100 (CET) Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x1JEi9g8181272 for ; Tue, 19 Feb 2019 14:46:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=G/UXpEApcgVB1xlCzATSaoCpTgCdhSeR6Exg1aGMAtA=; b=aS4rPc2sn/uSI8HwoRiJdvCt3zyPycHyUOvZy7GXEXl2QrLIe/6E89yuKNE0Kp8KIfHJ WWrTmD+Vr5GtGhsPChxUM5RgVmcLM5FndnT/XuMQG9E+HDnjZRj2D3RznHWreybdkh10 ctTzs5YmR281Y7qQwT1snGoC+bQcwE7JLsW9aDiGPsIieSBkqwUlQScVno48cj/nHImA WTrrxhNSxLvtZ01/kt6CX9qK+H3oVOxK8ittklBl4mabL6ZwqX/vYFtYXIsIKXzT96eh h1NMaOwm5Ieub1C3NOxAzdb94rqqyqmRj3ZcSQojrskbnOXD1uXlDq09f1SEVXNTJ27D CA== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2130.oracle.com with ESMTP id 2qp9xtum7e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Feb 2019 14:46:11 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x1JEk5mK006690 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Feb 2019 14:46:05 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x1JEk557027021 for ; Tue, 19 Feb 2019 14:46:05 GMT Received: from ak.ru.oracle.com (/10.162.80.29) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 19 Feb 2019 06:46:04 -0800 From: Alexey Kodanev To: ltp@lists.linux.it Date: Tue, 19 Feb 2019 17:47:52 +0300 Message-Id: <1550587673-7995-4-git-send-email-alexey.kodanev@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1550587673-7995-1-git-send-email-alexey.kodanev@oracle.com> References: <1550587673-7995-1-git-send-email-alexey.kodanev@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9171 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=966 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902190111 X-Virus-Scanned: clamav-milter 0.99.2 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, LOTS_OF_MONEY, SPF_HELO_PASS, SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH 3/4] network: use TST_NET_MAX_PKT X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Alexey Kodanev Reviewed-by: Petr Vorel --- testcases/lib/tst_test.sh | 1 + testcases/network/mpls/mpls02.sh | 2 +- testcases/network/mpls/mpls_lib.sh | 2 +- testcases/network/tcp_cc/tcp_cc_lib.sh | 4 ++-- testcases/network/virt/virt_lib.sh | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh index 3d2f5af..f36051f 100644 --- a/testcases/lib/tst_test.sh +++ b/testcases/lib/tst_test.sh @@ -404,6 +404,7 @@ tst_run() NEEDS_DRIVERS);; IPV6|IPVER|TEST_DATA|TEST_DATA_IFS);; RETRY_FUNC|RETRY_FN_EXP_BACKOFF);; + NET_MAX_PKT);; *) tst_res TWARN "Reserved variable TST_$_tst_i used!";; esac done diff --git a/testcases/network/mpls/mpls02.sh b/testcases/network/mpls/mpls02.sh index 745a414..c263f8a 100755 --- a/testcases/network/mpls/mpls02.sh +++ b/testcases/network/mpls/mpls02.sh @@ -40,7 +40,7 @@ setup() do_test() { local type=$2 - local max_size=10000 + local max_size=$TST_NET_MAX_PKT if [ "$type" = "icmp" ]; then tst_ping $ip_loc $ip_rmt 10 100 1000 2000 $max_size diff --git a/testcases/network/mpls/mpls_lib.sh b/testcases/network/mpls/mpls_lib.sh index c64b46c..84b3236 100755 --- a/testcases/network/mpls/mpls_lib.sh +++ b/testcases/network/mpls/mpls_lib.sh @@ -84,7 +84,7 @@ mpls_virt_setup() mpls_virt_test() { local type=$2 - local max_size=10000 + local max_size=$TST_NET_MAX_PKT if [ "$type" = "icmp" ]; then tst_ping $ip_virt_local $ip_virt_remote 10 100 1000 2000 $max_size diff --git a/testcases/network/tcp_cc/tcp_cc_lib.sh b/testcases/network/tcp_cc/tcp_cc_lib.sh index 6d41bcf..163ac02 100755 --- a/testcases/network/tcp_cc/tcp_cc_lib.sh +++ b/testcases/network/tcp_cc/tcp_cc_lib.sh @@ -92,12 +92,12 @@ tcp_cc_test01() set_cong_alg "$def_alg" - tst_netload -H $(tst_ipaddr rhost) -A 15000 + tst_netload -H $(tst_ipaddr rhost) -A $TST_NET_MAX_PKT local res0="$(cat tst_netload.res)" set_cong_alg "$alg" - tst_netload -H $(tst_ipaddr rhost) -A 15000 + tst_netload -H $(tst_ipaddr rhost) -A $TST_NET_MAX_PKT local res1="$(cat tst_netload.res)" local per=$(( $res0 * 100 / $res1 - 100 )) diff --git a/testcases/network/virt/virt_lib.sh b/testcases/network/virt/virt_lib.sh index eb9d052..92942d3 100644 --- a/testcases/network/virt/virt_lib.sh +++ b/testcases/network/virt/virt_lib.sh @@ -327,7 +327,7 @@ virt_check_cmd() virt_netperf_msg_sizes() { - local sizes="100 1000 2000 10000" + local sizes="100 1000 2000 $TST_NET_MAX_PKT" local s for s in $sizes; do