From: Petr Vorel <pvorel@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH 1/4] net/multicast: Create mcast_setup_normal()
Date: Fri, 5 Feb 2021 16:10:12 +0100 [thread overview]
Message-ID: <20210205151015.7465-1-pvorel@suse.cz> (raw)
to reduce duplicity
+ define TST_SETUP in tests
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
.../grp-operation/mcast-group-multiple-socket.sh | 1 +
.../multicast/grp-operation/mcast-group-same-group.sh | 6 +-----
.../multicast/grp-operation/mcast-group-single-socket.sh | 1 +
.../multicast/grp-operation/mcast-group-source-filter.sh | 6 +-----
.../network/stress/multicast/grp-operation/mcast-lib.sh | 6 +++++-
.../stress/multicast/packet-flood/mcast-pktfld01.sh | 9 +++------
.../stress/multicast/packet-flood/mcast-pktfld02.sh | 9 +++------
.../stress/multicast/query-flood/mcast-queryfld01.sh | 6 +-----
.../stress/multicast/query-flood/mcast-queryfld02.sh | 6 +-----
.../stress/multicast/query-flood/mcast-queryfld03.sh | 6 +-----
.../stress/multicast/query-flood/mcast-queryfld04.sh | 6 +-----
.../stress/multicast/query-flood/mcast-queryfld05.sh | 6 +-----
.../stress/multicast/query-flood/mcast-queryfld06.sh | 8 ++------
13 files changed, 22 insertions(+), 54 deletions(-)
diff --git a/testcases/network/stress/multicast/grp-operation/mcast-group-multiple-socket.sh b/testcases/network/stress/multicast/grp-operation/mcast-group-multiple-socket.sh
index 7b79b42df..2780a8d7c 100644
--- a/testcases/network/stress/multicast/grp-operation/mcast-group-multiple-socket.sh
+++ b/testcases/network/stress/multicast/grp-operation/mcast-group-multiple-socket.sh
@@ -19,6 +19,7 @@
#
# Author: Mitsuru Chinen <mitch@jp.ibm.com>
+TST_SETUP="do_setup"
. mcast-lib.sh
do_setup()
diff --git a/testcases/network/stress/multicast/grp-operation/mcast-group-same-group.sh b/testcases/network/stress/multicast/grp-operation/mcast-group-same-group.sh
index e10f16c09..01fc95a1a 100644
--- a/testcases/network/stress/multicast/grp-operation/mcast-group-same-group.sh
+++ b/testcases/network/stress/multicast/grp-operation/mcast-group-same-group.sh
@@ -19,13 +19,9 @@
#
# Author: Mitsuru Chinen <mitch@jp.ibm.com>
+TST_SETUP="mcast_setup_normal"
. mcast-lib.sh
-do_setup()
-{
- mcast_setup $MCASTNUM_NORMAL
-}
-
do_test()
{
tst_res TINFO "joining and leaving the same IPv$TST_IPVER multicast group on $MCASTNUM_NORMAL sockets in $NS_TIMES times"
diff --git a/testcases/network/stress/multicast/grp-operation/mcast-group-single-socket.sh b/testcases/network/stress/multicast/grp-operation/mcast-group-single-socket.sh
index ff58152cb..6e26ff52d 100644
--- a/testcases/network/stress/multicast/grp-operation/mcast-group-single-socket.sh
+++ b/testcases/network/stress/multicast/grp-operation/mcast-group-single-socket.sh
@@ -19,6 +19,7 @@
#
# Author: Mitsuru Chinen <mitch@jp.ibm.com>
+TST_SETUP="do_setup"
. mcast-lib.sh
do_setup()
diff --git a/testcases/network/stress/multicast/grp-operation/mcast-group-source-filter.sh b/testcases/network/stress/multicast/grp-operation/mcast-group-source-filter.sh
index df70344da..65fff0f63 100644
--- a/testcases/network/stress/multicast/grp-operation/mcast-group-source-filter.sh
+++ b/testcases/network/stress/multicast/grp-operation/mcast-group-source-filter.sh
@@ -19,13 +19,9 @@
#
# Author: Mitsuru Chinen <mitch@jp.ibm.com>
+TST_SETUP="mcast_setup_normal"
. mcast-lib.sh
-do_setup()
-{
- mcast_setup $MCASTNUM_NORMAL
-}
-
do_test()
{
tst_res TINFO "joining and leaving the same IPv$TST_IPVER multicast group with a different source filters on $MCASTNUM_NORMAL sockets in $NS_TIMES times"
diff --git a/testcases/network/stress/multicast/grp-operation/mcast-lib.sh b/testcases/network/stress/multicast/grp-operation/mcast-lib.sh
index 381ab6bdf..52a90ca50 100644
--- a/testcases/network/stress/multicast/grp-operation/mcast-lib.sh
+++ b/testcases/network/stress/multicast/grp-operation/mcast-lib.sh
@@ -6,7 +6,6 @@
#
# Setup script for multicast stress tests.
-TST_SETUP="do_setup"
TST_CLEANUP="mcast_cleanup"
TST_TESTFUNC="do_test"
TST_NEEDS_TMPDIR=1
@@ -59,6 +58,11 @@ mcast_setup()
[ "$TST_IPV6" ] && mcast_setup6 || mcast_setup4 $max
}
+mcast_setup_normal()
+{
+ mcast_setup $MCASTNUM_NORMAL
+}
+
mcast_cleanup4()
{
[ -n "$SYSFS_IGMP_MAX_MEMBERSHIPS" ] && sysctl -q -w net.ipv4.igmp_max_memberships=$SYSFS_IGMP_MAX_MEMBERSHIPS
diff --git a/testcases/network/stress/multicast/packet-flood/mcast-pktfld01.sh b/testcases/network/stress/multicast/packet-flood/mcast-pktfld01.sh
index 57eddb7f2..29798c84c 100755
--- a/testcases/network/stress/multicast/packet-flood/mcast-pktfld01.sh
+++ b/testcases/network/stress/multicast/packet-flood/mcast-pktfld01.sh
@@ -8,14 +8,11 @@
# a single socket, then receiving a large number of UDP packets at the socket
TST_NEEDS_ROOT=1
+TST_SETUP="mcast_setup_normal"
. mcast-lib.sh
-do_setup()
-{
- mcast_setup $MCASTNUM_NORMAL
- MCAST_LCMD=ns-mcast_receiver
- MCAST_RCMD=ns-udpsender
-}
+MCAST_LCMD="ns-mcast_receiver"
+MCAST_RCMD="ns-udpsender"
do_test()
{
diff --git a/testcases/network/stress/multicast/packet-flood/mcast-pktfld02.sh b/testcases/network/stress/multicast/packet-flood/mcast-pktfld02.sh
index 76d184995..2c356917a 100755
--- a/testcases/network/stress/multicast/packet-flood/mcast-pktfld02.sh
+++ b/testcases/network/stress/multicast/packet-flood/mcast-pktfld02.sh
@@ -9,14 +9,11 @@
# packets at each socket
TST_NEEDS_ROOT=1
+TST_SETUP="mcast_setup_normal"
. mcast-lib.sh
-do_setup()
-{
- mcast_setup $MCASTNUM_NORMAL
- MCAST_LCMD=ns-mcast_receiver
- MCAST_RCMD=ns-udpsender
-}
+MCAST_LCMD="ns-mcast_receiver"
+MCAST_RCMD="ns-udpsender"
do_test()
{
diff --git a/testcases/network/stress/multicast/query-flood/mcast-queryfld01.sh b/testcases/network/stress/multicast/query-flood/mcast-queryfld01.sh
index c88f079a1..d472a0c54 100755
--- a/testcases/network/stress/multicast/query-flood/mcast-queryfld01.sh
+++ b/testcases/network/stress/multicast/query-flood/mcast-queryfld01.sh
@@ -9,13 +9,9 @@
TST_NEEDS_ROOT=1
TST_NEEDS_TMPDIR=1
+TST_SETUP="mcast_setup_normal"
. mcast-lib.sh
-do_setup()
-{
- mcast_setup $MCASTNUM_NORMAL
-}
-
do_test()
{
tst_res TINFO "joining an IPv${TST_IPVER} multicast group on a single socket, then receiving a large number of General Queries in $NS_DURATION seconds"
diff --git a/testcases/network/stress/multicast/query-flood/mcast-queryfld02.sh b/testcases/network/stress/multicast/query-flood/mcast-queryfld02.sh
index 1c977d18b..199a8a016 100755
--- a/testcases/network/stress/multicast/query-flood/mcast-queryfld02.sh
+++ b/testcases/network/stress/multicast/query-flood/mcast-queryfld02.sh
@@ -10,13 +10,9 @@
TST_NEEDS_ROOT=1
TST_NEEDS_TMPDIR=1
+TST_SETUP="mcast_setup_normal"
. mcast-lib.sh
-do_setup()
-{
- mcast_setup $MCASTNUM_NORMAL
-}
-
do_test()
{
tst_res TINFO "joining an IPv${TST_IPVER} multicast group on a single socket, then receiving a large number of Multicast Address Specific Query in $NS_DURATION seconds"
diff --git a/testcases/network/stress/multicast/query-flood/mcast-queryfld03.sh b/testcases/network/stress/multicast/query-flood/mcast-queryfld03.sh
index 9d3d318d0..2ea22605f 100755
--- a/testcases/network/stress/multicast/query-flood/mcast-queryfld03.sh
+++ b/testcases/network/stress/multicast/query-flood/mcast-queryfld03.sh
@@ -10,17 +10,13 @@
TST_NEEDS_ROOT=1
TST_NEEDS_TMPDIR=1
+TST_SETUP="mcast_setup_normal"
. mcast-lib.sh
SRC_ADDR_IPV4="10.10.10.1"
SRC_ADDR_IPV6="fec0:100:100:100::1"
FILTER_MODE="include"
-do_setup()
-{
- mcast_setup $MCASTNUM_NORMAL
-}
-
do_test()
{
tst_res TINFO "joining an IPv${TST_IPVER} multicast group on a single socket, then receiving a large number of Multicast Address and Source Specific Queries in $NS_DURATION seconds"
diff --git a/testcases/network/stress/multicast/query-flood/mcast-queryfld04.sh b/testcases/network/stress/multicast/query-flood/mcast-queryfld04.sh
index 6e276901e..dd341d7a3 100755
--- a/testcases/network/stress/multicast/query-flood/mcast-queryfld04.sh
+++ b/testcases/network/stress/multicast/query-flood/mcast-queryfld04.sh
@@ -9,13 +9,9 @@
TST_NEEDS_ROOT=1
TST_NEEDS_TMPDIR=1
+TST_SETUP="mcast_setup_normal"
. mcast-lib.sh
-do_setup()
-{
- mcast_setup $MCASTNUM_NORMAL
-}
-
do_test()
{
tst_res TINFO "joining $MCASTNUM_NORMAL IPv${TST_IPVER} multicast groups on separate socket, then receiving a large number of General Queries in $NS_DURATION seconds"
diff --git a/testcases/network/stress/multicast/query-flood/mcast-queryfld05.sh b/testcases/network/stress/multicast/query-flood/mcast-queryfld05.sh
index d6879841d..c73fca460 100755
--- a/testcases/network/stress/multicast/query-flood/mcast-queryfld05.sh
+++ b/testcases/network/stress/multicast/query-flood/mcast-queryfld05.sh
@@ -10,13 +10,9 @@
TST_NEEDS_ROOT=1
TST_NEEDS_TMPDIR=1
+TST_SETUP="mcast_setup_normal"
. mcast-lib.sh
-do_setup()
-{
- mcast_setup $MCASTNUM_NORMAL
-}
-
do_test()
{
tst_res TINFO "joining $MCASTNUM_NORMAL IPv${TST_IPVER} multicast groups on separate sockets, then receiving a large number of Multicast Address Specific Queries in $NS_DURATION seconds"
diff --git a/testcases/network/stress/multicast/query-flood/mcast-queryfld06.sh b/testcases/network/stress/multicast/query-flood/mcast-queryfld06.sh
index 43798f231..ee7b5016f 100755
--- a/testcases/network/stress/multicast/query-flood/mcast-queryfld06.sh
+++ b/testcases/network/stress/multicast/query-flood/mcast-queryfld06.sh
@@ -10,22 +10,18 @@
TST_NEEDS_ROOT=1
TST_NEEDS_TMPDIR=1
+TST_SETUP="mcast_setup_normal"
. mcast-lib.sh
SRC_ADDR_IPV4=10.10.10.1
SRC_ADDR_IPV6=fec0:100:100:100::1
FILTER_MODE="include"
-do_setup()
-{
- mcast_setup $MCASTNUM_NORMAL
-}
-
do_test()
{
tst_res TINFO "joining $MCASTNUM_NORMAL IPv${TST_IPVER} multicast groups on separate sockets, then receiving a large number of Multicast Address and Source Specific Queries in $NS_DURATION seconds"
- local prefix="$MCAST_IPV4_ADDR_PREFIX"
+ local prefix="$MCAST_IPV4_ADDR_PREFIX"
local src_addr="$SRC_ADDR_IPV4"
if [ "$TST_IPV6" ]; then
prefix="$MCAST_IPV6_ADDR_PREFIX"
--
2.30.0
next reply other threads:[~2021-02-05 15:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 15:10 Petr Vorel [this message]
2021-02-05 15:10 ` [LTP] [PATCH 2/4] net/multicast: Move API variables from setup to tests Petr Vorel
2021-02-05 15:10 ` [LTP] [PATCH 3/4] net/multicast: Remove duplicity Petr Vorel
2021-02-05 15:10 ` [LTP] [PATCH 4/4] net/multicast: Use SPDX-License-Identifier Petr Vorel
2021-02-06 19:14 ` [LTP] [PATCH 1/4] net/multicast: Create mcast_setup_normal() Petr Vorel
2021-02-10 11:56 ` Alexey Kodanev
2021-02-10 13:08 ` Petr Vorel
2021-02-12 19:26 ` Petr Vorel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210205151015.7465-1-pvorel@suse.cz \
--to=pvorel@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.