From patchwork Wed May 16 16:18:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 914762 X-Patchwork-Delegate: petr.vorel@gmail.com 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=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40mKPF2242z9s3B for ; Thu, 17 May 2018 02:18:41 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id BD1F13E71C7 for ; Wed, 16 May 2018 18:18:38 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id 3C8361A9583 for ; Wed, 16 May 2018 18:18:34 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id C4021201125 for ; Wed, 16 May 2018 18:18:29 +0200 (CEST) Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 75AA7AEA4; Wed, 16 May 2018 16:18:29 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Wed, 16 May 2018 18:18:20 +0200 Message-Id: <20180516161820.3077-3-pvorel@suse.cz> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180516161820.3077-1-pvorel@suse.cz> References: <20180516161820.3077-1-pvorel@suse.cz> X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [RFC PATCH v2 2/2] net/{stress, virt}: Use TST_TEST_DATA and TST_TEST_DATA_IFS 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: Petr Vorel --- lib/newlib_tests/Makefile | 19 ------------------- testcases/network/stress/dccp/dccp_ipsec.sh | 5 +---- testcases/network/stress/dccp/dccp_ipsec_vti.sh | 5 +---- testcases/network/stress/ipsec/ipsec_lib.sh | 3 ++- testcases/network/stress/sctp/sctp_ipsec.sh | 6 ++---- testcases/network/stress/sctp/sctp_ipsec_vti.sh | 7 ++----- testcases/network/stress/tcp/tcp_ipsec.sh | 6 ++---- testcases/network/stress/tcp/tcp_ipsec_vti.sh | 5 +---- testcases/network/stress/udp/udp_ipsec.sh | 7 ++----- testcases/network/stress/udp/udp_ipsec_vti.sh | 7 ++----- 10 files changed, 15 insertions(+), 55 deletions(-) delete mode 100644 lib/newlib_tests/Makefile diff --git a/lib/newlib_tests/Makefile b/lib/newlib_tests/Makefile deleted file mode 100644 index afa09373e..000000000 --- a/lib/newlib_tests/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -top_srcdir ?= ../.. - -include $(top_srcdir)/include/mk/env_pre.mk - -CFLAGS += -W -Wall -LDLIBS += -lltp - -test08: CFLAGS+=-pthread -test09: CFLAGS+=-pthread -test15: CFLAGS+=-pthread -test16: CFLAGS+=-pthread -test16: LDLIBS+=-lrt - -ifeq ($(ANDROID),1) -FILTER_OUT_MAKE_TARGETS += test08 -endif - - -include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/network/stress/dccp/dccp_ipsec.sh b/testcases/network/stress/dccp/dccp_ipsec.sh index dae530fa3..edd1917bb 100755 --- a/testcases/network/stress/dccp/dccp_ipsec.sh +++ b/testcases/network/stress/dccp/dccp_ipsec.sh @@ -21,10 +21,7 @@ do_setup() do_test() { - for p in $IPSEC_SIZE_ARRAY; do - tst_netload -H $(tst_ipaddr rhost) -T dccp -n $p -N $p \ - -r $IPSEC_REQUESTS - done + tst_netload -H $(tst_ipaddr rhost) -T dccp -n $2 -N $2 -r $IPSEC_REQUESTS } tst_run diff --git a/testcases/network/stress/dccp/dccp_ipsec_vti.sh b/testcases/network/stress/dccp/dccp_ipsec_vti.sh index 787460aab..ee2b0d4ca 100755 --- a/testcases/network/stress/dccp/dccp_ipsec_vti.sh +++ b/testcases/network/stress/dccp/dccp_ipsec_vti.sh @@ -12,10 +12,7 @@ TST_CLEANUP=tst_ipsec_cleanup do_test() { - for p in $IPSEC_SIZE_ARRAY; do - tst_netload -H $ip_rmt_tun -T dccp -n $p -N $p \ - -r $IPSEC_REQUESTS - done + tst_netload -H $ip_rmt_tun -T dccp -n $2 -N $2 -r $IPSEC_REQUESTS } tst_run diff --git a/testcases/network/stress/ipsec/ipsec_lib.sh b/testcases/network/stress/ipsec/ipsec_lib.sh index bfb022bd0..5e6c68278 100644 --- a/testcases/network/stress/ipsec/ipsec_lib.sh +++ b/testcases/network/stress/ipsec/ipsec_lib.sh @@ -48,7 +48,8 @@ ipsec_lib_parse_args() r) IPSEC_REQUESTS="$2" ;; esac - IPSEC_SIZE_ARRAY="$(echo $IPSEC_SIZE_ARRAY | sed 's/:/ /g')" + TST_TEST_DATA="$IPSEC_SIZE_ARRAY" + TST_TEST_DATA_IFS=":" } TST_OPTS="l:m:p:s:S:k:A:e:a:c:r:" diff --git a/testcases/network/stress/sctp/sctp_ipsec.sh b/testcases/network/stress/sctp/sctp_ipsec.sh index 2dc025352..46f43ea9d 100755 --- a/testcases/network/stress/sctp/sctp_ipsec.sh +++ b/testcases/network/stress/sctp/sctp_ipsec.sh @@ -21,10 +21,8 @@ do_setup() do_test() { - for p in $IPSEC_SIZE_ARRAY; do - tst_netload -H $(tst_ipaddr rhost) -T sctp -n $p -N $p \ - -r $IPSEC_REQUESTS -S $(tst_ipaddr) - done + tst_netload -H $(tst_ipaddr rhost) -T sctp -n $2 -N $2 \ + -r $IPSEC_REQUESTS -S $(tst_ipaddr) } tst_run diff --git a/testcases/network/stress/sctp/sctp_ipsec_vti.sh b/testcases/network/stress/sctp/sctp_ipsec_vti.sh index 160b618e7..d0f24c727 100755 --- a/testcases/network/stress/sctp/sctp_ipsec_vti.sh +++ b/testcases/network/stress/sctp/sctp_ipsec_vti.sh @@ -7,16 +7,13 @@ TST_NEEDS_TMPDIR=1 TST_SETUP=tst_ipsec_setup_vti TST_CLEANUP=tst_ipsec_cleanup - TST_TESTFUNC=do_test . ipsec_lib.sh do_test() { - for p in $IPSEC_SIZE_ARRAY; do - tst_netload -H $ip_rmt_tun -T sctp -n $p -N $p \ - -r $IPSEC_REQUESTS -S $ip_loc_tun - done + tst_netload -H $ip_rmt_tun -T sctp -n $2 -N $2 -r $IPSEC_REQUESTS \ + -S $ip_loc_tun } tst_run diff --git a/testcases/network/stress/tcp/tcp_ipsec.sh b/testcases/network/stress/tcp/tcp_ipsec.sh index edea89361..d5254c394 100755 --- a/testcases/network/stress/tcp/tcp_ipsec.sh +++ b/testcases/network/stress/tcp/tcp_ipsec.sh @@ -23,10 +23,8 @@ do_setup() do_test() { - for p in $IPSEC_SIZE_ARRAY; do - tst_netload -H $(tst_ipaddr rhost) -n $p -N $p \ - -r $IPSEC_REQUESTS -R $max_requests - done + tst_netload -H $(tst_ipaddr rhost) -n $2 -N $2 -r $IPSEC_REQUESTS \ + -R $max_requests } tst_run diff --git a/testcases/network/stress/tcp/tcp_ipsec_vti.sh b/testcases/network/stress/tcp/tcp_ipsec_vti.sh index 78329f995..2172662eb 100755 --- a/testcases/network/stress/tcp/tcp_ipsec_vti.sh +++ b/testcases/network/stress/tcp/tcp_ipsec_vti.sh @@ -14,10 +14,7 @@ max_requests=10 do_test() { - for p in $IPSEC_SIZE_ARRAY; do - tst_netload -H $ip_rmt_tun -n $p -N $p \ - -r $IPSEC_REQUESTS -R $max_requests - done + tst_netload -H $ip_rmt_tun -n $2 -N $2 -r $IPSEC_REQUESTS -R $max_requests } tst_run diff --git a/testcases/network/stress/udp/udp_ipsec.sh b/testcases/network/stress/udp/udp_ipsec.sh index 063a18705..2a0dee4cd 100755 --- a/testcases/network/stress/udp/udp_ipsec.sh +++ b/testcases/network/stress/udp/udp_ipsec.sh @@ -22,12 +22,9 @@ do_setup() do_test() { local type="udp" - [ $1 -gt 3 ] && type="udp_lite" + [ $2 -gt 3 ] && type="udp_lite" - for p in $IPSEC_SIZE_ARRAY; do - tst_netload -H $(tst_ipaddr rhost) -T $type -n $p -N $p \ - -r $IPSEC_REQUESTS - done + tst_netload -H $(tst_ipaddr rhost) -T $type -n $2 -N $2 -r $IPSEC_REQUESTS } tst_run diff --git a/testcases/network/stress/udp/udp_ipsec_vti.sh b/testcases/network/stress/udp/udp_ipsec_vti.sh index a0a8e03fc..7de8761d7 100755 --- a/testcases/network/stress/udp/udp_ipsec_vti.sh +++ b/testcases/network/stress/udp/udp_ipsec_vti.sh @@ -13,12 +13,9 @@ TST_CLEANUP=tst_ipsec_setup_vti do_test() { local type="udp" - [ $1 -gt 3 ] && type="udp_lite" + [ $2 -gt 3 ] && type="udp_lite" - for p in $IPSEC_SIZE_ARRAY; do - tst_netload -H $ip_rmt_tun -T $type -n $p -N $p \ - -r $IPSEC_REQUESTS - done + tst_netload -H $ip_rmt_tun -T $type -n $2 -N $2 -r $IPSEC_REQUESTS } tst_run