Commit d5fbb2eb authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

selftests: libs: Expand "$@" where possible 



In some functions, argument-forwarding through "$@" without listing the
individual arguments explicitly is fundamental to the operation of a
function. E.g. xfail_on_veth() should be able to run various tests in the
fail-to-xfail regime, and usage of "$@" is appropriate as an abstraction
mechanism. For functions such as simple_if_init(), $@ is a handy way to
pass an array.

In other functions, it's merely a mechanism to save some typing, which
however ends up obscuring the real arguments and makes life hard for those
that end up reading the code.

This patch adds some of the implicit function arguments and correspondingly
expands $@'s. In several cases this will come in handy as following patches
adjust the parameter lists.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarDanielle Ratson <danieller@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c977ac49

tools/testing/selftests/net/forwarding/lib.sh

+56 −11
Original line number Diff line number Diff line
@@ -1257,22 +1257,34 @@ __icmp_capture_add_del() 


icmp_capture_install()

{

	__icmp_capture_add_del add 100 "" "$@"

	local tundev=$1; shift

	local filter=$1; shift



	__icmp_capture_add_del add 100 "" "$tundev" "$filter"

}



icmp_capture_uninstall()

{

	__icmp_capture_add_del del 100 "" "$@"

	local tundev=$1; shift

	local filter=$1; shift



	__icmp_capture_add_del del 100 "" "$tundev" "$filter"

}



icmp6_capture_install()

{

	__icmp_capture_add_del add 100 v6 "$@"

	local tundev=$1; shift

	local filter=$1; shift



	__icmp_capture_add_del add 100 v6 "$tundev" "$filter"

}



icmp6_capture_uninstall()

{

	__icmp_capture_add_del del 100 v6 "$@"

	local tundev=$1; shift

	local filter=$1; shift



	__icmp_capture_add_del del 100 v6 "$tundev" "$filter"

}



__vlan_capture_add_del()
@@ -1290,12 +1302,18 @@ __vlan_capture_add_del() 


vlan_capture_install()

{

	__vlan_capture_add_del add 100 "$@"

	local dev=$1; shift

	local filter=$1; shift



	__vlan_capture_add_del add 100 "$dev" "$filter"

}



vlan_capture_uninstall()

{

	__vlan_capture_add_del del 100 "$@"

	local dev=$1; shift

	local filter=$1; shift



	__vlan_capture_add_del del 100 "$dev" "$filter"

}



__dscp_capture_add_del()
@@ -1655,34 +1673,61 @@ __start_traffic() 
	local sip=$1; shift

	local dip=$1; shift

	local dmac=$1; shift

	local -a mz_args=("$@")



	$MZ $h_in -p $pktsize -A $sip -B $dip -c 0 \

		-a own -b $dmac -t "$proto" -q "$@" &

		-a own -b $dmac -t "$proto" -q "${mz_args[@]}" &

	sleep 1

}



start_traffic_pktsize()

{

	local pktsize=$1; shift

	local h_in=$1; shift

	local sip=$1; shift

	local dip=$1; shift

	local dmac=$1; shift

	local -a mz_args=("$@")



	__start_traffic $pktsize udp "$@"

	__start_traffic $pktsize udp "$h_in" "$sip" "$dip" "$dmac" \

			"${mz_args[@]}"

}



start_tcp_traffic_pktsize()

{

	local pktsize=$1; shift

	local h_in=$1; shift

	local sip=$1; shift

	local dip=$1; shift

	local dmac=$1; shift

	local -a mz_args=("$@")



	__start_traffic $pktsize tcp "$@"

	__start_traffic $pktsize tcp "$h_in" "$sip" "$dip" "$dmac" \

			"${mz_args[@]}"

}



start_traffic()

{

	start_traffic_pktsize 8000 "$@"

	local h_in=$1; shift

	local sip=$1; shift

	local dip=$1; shift

	local dmac=$1; shift

	local -a mz_args=("$@")



	start_traffic_pktsize 8000 "$h_in" "$sip" "$dip" "$dmac" \

			      "${mz_args[@]}"

}



start_tcp_traffic()

{

	start_tcp_traffic_pktsize 8000 "$@"

	local h_in=$1; shift

	local sip=$1; shift

	local dip=$1; shift

	local dmac=$1; shift

	local -a mz_args=("$@")



	start_tcp_traffic_pktsize 8000 "$h_in" "$sip" "$dip" "$dmac" \

				  "${mz_args[@]}"

}



stop_traffic()

tools/testing/selftests/net/forwarding/mirror_gre_flower.sh

+11 −2
Original line number Diff line number Diff line
@@ -64,12 +64,21 @@ cleanup() 


test_span_gre_dir_acl()

{

	test_span_gre_dir_ips "$@" 192.0.2.3 192.0.2.4

	local tundev=$1; shift

	local direction=$1; shift

	local forward_type=$1; shift

	local backward_type=$1; shift



	test_span_gre_dir_ips "$tundev" "$direction" "$forward_type" \

			      "$backward_type" 192.0.2.3 192.0.2.4

}



fail_test_span_gre_dir_acl()

{

	fail_test_span_gre_dir_ips "$@" 192.0.2.3 192.0.2.4

	local tundev=$1; shift

	local direction=$1; shift



	fail_test_span_gre_dir_ips "$tundev" "$direction" 192.0.2.3 192.0.2.4

}



full_test_span_gre_dir_acl()

tools/testing/selftests/net/forwarding/mirror_gre_lib.sh

+54 −9
Original line number Diff line number Diff line
@@ -5,22 +5,34 @@ source "$net_forwarding_dir/mirror_lib.sh" 
quick_test_span_gre_dir_ips()

{

	local tundev=$1; shift

	local direction=$1; shift

	local ip1=$1; shift

	local ip2=$1; shift



	do_test_span_dir_ips 10 h3-$tundev "$@"

	do_test_span_dir_ips 10 h3-$tundev "$direction" "$ip1" "$ip2"

}



fail_test_span_gre_dir_ips()

{

	local tundev=$1; shift

	local direction=$1; shift

	local ip1=$1; shift

	local ip2=$1; shift



	do_test_span_dir_ips 0 h3-$tundev "$@"

	do_test_span_dir_ips 0 h3-$tundev "$direction" "$ip1" "$ip2"

}



test_span_gre_dir_ips()

{

	local tundev=$1; shift

	local direction=$1; shift

	local forward_type=$1; shift

	local backward_type=$1; shift

	local ip1=$1; shift

	local ip2=$1; shift



	test_span_dir_ips h3-$tundev "$@"

	test_span_dir_ips h3-$tundev "$direction" "$forward_type" \

			  "$backward_type" "$ip1" "$ip2"

}



full_test_span_gre_dir_ips()
@@ -74,27 +86,55 @@ full_test_span_gre_dir_vlan_ips() 


quick_test_span_gre_dir()

{

	quick_test_span_gre_dir_ips "$@" 192.0.2.1 192.0.2.2

	local tundev=$1; shift

	local direction=$1; shift



	quick_test_span_gre_dir_ips "$tundev" "$direction" 192.0.2.1 192.0.2.2

}



fail_test_span_gre_dir()

{

	fail_test_span_gre_dir_ips "$@" 192.0.2.1 192.0.2.2

	local tundev=$1; shift

	local direction=$1; shift



	fail_test_span_gre_dir_ips "$tundev" "$direction" 192.0.2.1 192.0.2.2

}



test_span_gre_dir()

{

	test_span_gre_dir_ips "$@" 192.0.2.1 192.0.2.2

	local tundev=$1; shift

	local direction=$1; shift

	local forward_type=$1; shift

	local backward_type=$1; shift



	test_span_gre_dir_ips "$tundev" "$direction" "$forward_type" \

			      "$backward_type" 192.0.2.1 192.0.2.2

}



full_test_span_gre_dir()

{

	full_test_span_gre_dir_ips "$@" 192.0.2.1 192.0.2.2

	local tundev=$1; shift

	local direction=$1; shift

	local forward_type=$1; shift

	local backward_type=$1; shift

	local what=$1; shift



	full_test_span_gre_dir_ips "$tundev" "$direction" "$forward_type" \

				   "$backward_type" "$what" 192.0.2.1 192.0.2.2

}



full_test_span_gre_dir_vlan()

{

	full_test_span_gre_dir_vlan_ips "$@" 192.0.2.1 192.0.2.2

	local tundev=$1; shift

	local direction=$1; shift

	local vlan_match=$1; shift

	local forward_type=$1; shift

	local backward_type=$1; shift

	local what=$1; shift



	full_test_span_gre_dir_vlan_ips "$tundev" "$direction" "$vlan_match" \

					"$forward_type" "$backward_type" \

					"$what" 192.0.2.1 192.0.2.2

}



full_test_span_gre_stp_ips()
@@ -126,5 +166,10 @@ full_test_span_gre_stp_ips() 


full_test_span_gre_stp()

{

	full_test_span_gre_stp_ips "$@" 192.0.2.1 192.0.2.2

	local tundev=$1; shift

	local nbpdev=$1; shift

	local what=$1; shift



	full_test_span_gre_stp_ips "$tundev" "$nbpdev" "$what" \

				   192.0.2.1 192.0.2.2

}

tools/testing/selftests/net/forwarding/mirror_lib.sh

+55 −8
Original line number Diff line number Diff line
@@ -71,12 +71,22 @@ do_test_span_dir_ips() 


quick_test_span_dir_ips()

{

	do_test_span_dir_ips 10 "$@"

	local dev=$1; shift

	local direction=$1; shift

	local ip1=$1; shift

	local ip2=$1; shift



	do_test_span_dir_ips 10 "$dev" "$direction" "$ip1" "$ip2"

}



fail_test_span_dir_ips()

{

	do_test_span_dir_ips 0 "$@"

	local dev=$1; shift

	local direction=$1; shift

	local ip1=$1; shift

	local ip2=$1; shift



	do_test_span_dir_ips 0 "$dev" "$direction" "$ip1" "$ip2"

}



test_span_dir_ips()
@@ -101,12 +111,21 @@ test_span_dir_ips() 


fail_test_span_dir()

{

	fail_test_span_dir_ips "$@" 192.0.2.1 192.0.2.2

	local dev=$1; shift

	local direction=$1; shift



	fail_test_span_dir_ips "$dev" "$direction" 192.0.2.1 192.0.2.2

}



test_span_dir()

{

	test_span_dir_ips "$@" 192.0.2.1 192.0.2.2

	local dev=$1; shift

	local direction=$1; shift

	local forward_type=$1; shift

	local backward_type=$1; shift



	test_span_dir_ips "$dev" "$direction" "$forward_type" "$backward_type" \

			  192.0.2.1 192.0.2.2

}



do_test_span_vlan_dir_ips()
@@ -130,20 +149,48 @@ do_test_span_vlan_dir_ips() 


quick_test_span_vlan_dir_ips()

{

	do_test_span_vlan_dir_ips 10 "$@"

	local dev=$1; shift

	local vid=$1; shift

	local direction=$1; shift

	local ul_proto=$1; shift

	local ip1=$1; shift

	local ip2=$1; shift



	do_test_span_vlan_dir_ips 10 "$dev" "$vid" "$direction" "$ul_proto" \

				  "$ip1" "$ip2"

}



fail_test_span_vlan_dir_ips()

{

	do_test_span_vlan_dir_ips 0 "$@"

	local dev=$1; shift

	local vid=$1; shift

	local direction=$1; shift

	local ul_proto=$1; shift

	local ip1=$1; shift

	local ip2=$1; shift



	do_test_span_vlan_dir_ips 0 "$dev" "$vid" "$direction" "$ul_proto" \

				  "$ip1" "$ip2"

}



quick_test_span_vlan_dir()

{

	quick_test_span_vlan_dir_ips "$@" 192.0.2.1 192.0.2.2

	local dev=$1; shift

	local vid=$1; shift

	local direction=$1; shift

	local ul_proto=$1; shift



	quick_test_span_vlan_dir_ips "$dev" "$vid" "$direction" "$ul_proto" \

				     192.0.2.1 192.0.2.2

}



fail_test_span_vlan_dir()

{

	fail_test_span_vlan_dir_ips "$@" 192.0.2.1 192.0.2.2

	local dev=$1; shift

	local vid=$1; shift

	local direction=$1; shift

	local ul_proto=$1; shift



	fail_test_span_vlan_dir_ips "$dev" "$vid" "$direction" "$ul_proto" \

				    192.0.2.1 192.0.2.2

}