[LTP] [PATCH v4 07/10] tst_netload(): Rename option -d => -f

Petr Vorel pvorel@suse.cz
Thu Dec 14 16:19:51 CET 2023


-D will be used for enabling debug info, thus netstress.c -D parameter
needs to be renamed to -d.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 testcases/lib/tst_net.sh                   | 6 +++---
 testcases/network/busy_poll/busy_poll01.sh | 2 +-
 testcases/network/busy_poll/busy_poll02.sh | 2 +-
 testcases/network/busy_poll/busy_poll03.sh | 2 +-
 testcases/network/virt/virt_lib.sh         | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh
index 6168db86b..0718a8ad1 100644
--- a/testcases/lib/tst_net.sh
+++ b/testcases/lib/tst_net.sh
@@ -745,12 +745,12 @@ tst_netload()
 	fi
 
 	OPTIND=0
-	while getopts :a:H:d:n:N:r:R:S:b:t:T:fFe:m:A:D: opt; do
+	while getopts :a:f:H:n:N:r:R:S:b:t:T:fFe:m:A:D: opt; do
 		case "$opt" in
 		a) c_num="$OPTARG" ;;
 		H) c_opts="${c_opts}-H $OPTARG "
 		   hostopt="$OPTARG" ;;
-		d) rfile="$OPTARG" ;;
+		f) rfile="$OPTARG" ;;
 		n) c_opts="${c_opts}-n $OPTARG " ;;
 		N) c_opts="${c_opts}-N $OPTARG " ;;
 		r) c_requests="$OPTARG" ;;
@@ -790,7 +790,7 @@ tst_netload()
 	fi
 
 	s_opts="${cs_opts}${s_opts}-R $s_replies -B $TST_TMPDIR"
-	c_opts="${cs_opts}${c_opts}-a $c_num -r $((c_requests / run_cnt)) -d $PWD/$rfile"
+	c_opts="${cs_opts}${c_opts}-a $c_num -r $((c_requests / run_cnt)) -f $PWD/$rfile"
 
 	tst_res_ TINFO "run server 'netstress $s_opts'"
 	tst_res_ TINFO "run client 'netstress -l $c_opts' $run_cnt times"
diff --git a/testcases/network/busy_poll/busy_poll01.sh b/testcases/network/busy_poll/busy_poll01.sh
index 65f4db3fe..fa4e57d11 100755
--- a/testcases/network/busy_poll/busy_poll01.sh
+++ b/testcases/network/busy_poll/busy_poll01.sh
@@ -39,7 +39,7 @@ test()
 	for x in 50 0; do
 		tst_res TINFO "set low latency busy poll to $x"
 		set_busy_poll $x
-		tst_netload -H $(tst_ipaddr rhost) -n 10 -N 10 -d res_$x
+		tst_netload -H $(tst_ipaddr rhost) -n 10 -N 10 -f res_$x
 	done
 
 	tst_netload_compare $(cat res_0) $(cat res_50) 1
diff --git a/testcases/network/busy_poll/busy_poll02.sh b/testcases/network/busy_poll/busy_poll02.sh
index ebae4d2f5..363562112 100755
--- a/testcases/network/busy_poll/busy_poll02.sh
+++ b/testcases/network/busy_poll/busy_poll02.sh
@@ -31,7 +31,7 @@ test()
 	for x in 50 0; do
 		tst_res TINFO "set low latency busy poll to $x per socket"
 		set_busy_poll $x
-		tst_netload -H $(tst_ipaddr rhost) -n 10 -N 10 -d res_$x -b $x
+		tst_netload -H $(tst_ipaddr rhost) -n 10 -N 10 -f res_$x -b $x
 	done
 
 	tst_netload_compare $(cat res_0) $(cat res_50) 1
diff --git a/testcases/network/busy_poll/busy_poll03.sh b/testcases/network/busy_poll/busy_poll03.sh
index 04d5978f7..4fe958db9 100755
--- a/testcases/network/busy_poll/busy_poll03.sh
+++ b/testcases/network/busy_poll/busy_poll03.sh
@@ -33,7 +33,7 @@ test()
 	for x in 50 0; do
 		tst_res TINFO "set low latency busy poll to $x per $2 socket"
 		set_busy_poll $x
-		tst_netload -H $(tst_ipaddr rhost) -n 10 -N 10 -d res_$x \
+		tst_netload -H $(tst_ipaddr rhost) -n 10 -N 10 -f res_$x \
 			    -b $x -T $2
 	done
 
diff --git a/testcases/network/virt/virt_lib.sh b/testcases/network/virt/virt_lib.sh
index e919bc3a5..dd7ac895b 100644
--- a/testcases/network/virt/virt_lib.sh
+++ b/testcases/network/virt/virt_lib.sh
@@ -284,10 +284,10 @@ virt_compare_netperf()
 	local expect_res="${1:-pass}"
 	local opts="$2"
 
-	tst_netload -H $ip_virt_remote $opts -d res_ipv4 -e $expect_res \
+	tst_netload -H $ip_virt_remote $opts -f res_ipv4 -e $expect_res \
 		-D ltp_v0 || ret1="fail"
 
-	tst_netload -H ${ip6_virt_remote} $opts -d res_ipv6 -e $expect_res \
+	tst_netload -H ${ip6_virt_remote} $opts -f res_ipv6 -e $expect_res \
 		-D ltp_v0 || ret2="fail"
 
 	[ "$ret1" = "fail" -o "$ret2" = "fail" ] && return
@@ -295,7 +295,7 @@ virt_compare_netperf()
 	local vt="$(cat res_ipv4)"
 	local vt6="$(cat res_ipv6)"
 
-	tst_netload -H $(tst_ipaddr rhost) $opts -d res_lan
+	tst_netload -H $(tst_ipaddr rhost) $opts -f res_lan
 
 	local lt="$(cat res_lan)"
 	tst_res TINFO "time lan IPv${TST_IPVER}($lt) $virt_type IPv4($vt) and IPv6($vt6) ms"
-- 
2.43.0



More information about the ltp mailing list