Commit f5853171 authored by Davide Caratti's avatar Davide Caratti Committed by Jakub Kicinski
Browse files

selftests: forwarding: tc_actions: cleanup temporary files when test is aborted 



remove temporary files created by 'mirred_egress_to_ingress_tcp' test
in the cleanup() handler. Also, change variable names to avoid clashing
with globals from lib.sh.

Suggested-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavide Caratti <dcaratti@redhat.com>
Link: https://lore.kernel.org/r/091649045a017fc00095ecbb75884e5681f7025f.1676368027.git.dcaratti@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1b8d1c50

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

+10 −6
Original line number Diff line number Diff line
@@ -201,10 +201,10 @@ mirred_egress_to_ingress_test() 


mirred_egress_to_ingress_tcp_test()

{

	local tmpfile=$(mktemp) tmpfile1=$(mktemp)

	mirred_e2i_tf1=$(mktemp) mirred_e2i_tf2=$(mktemp)



	RET=0

	dd conv=sparse status=none if=/dev/zero bs=1M count=2 of=$tmpfile

	dd conv=sparse status=none if=/dev/zero bs=1M count=2 of=$mirred_e2i_tf1

	tc filter add dev $h1 protocol ip pref 100 handle 100 egress flower \

		$tcflags ip_proto tcp src_ip 192.0.2.1 dst_ip 192.0.2.2 \

			action ct commit nat src addr 192.0.2.2 pipe \
@@ -220,11 +220,11 @@ mirred_egress_to_ingress_tcp_test() 
		ip_proto icmp \

			action drop



	ip vrf exec v$h1 nc --recv-only -w10 -l -p 12345 -o $tmpfile1  &

	ip vrf exec v$h1 nc --recv-only -w10 -l -p 12345 -o $mirred_e2i_tf2  &

	local rpid=$!

	ip vrf exec v$h1 nc -w1 --send-only 192.0.2.2 12345 <$tmpfile

	ip vrf exec v$h1 nc -w1 --send-only 192.0.2.2 12345 <$mirred_e2i_tf1

	wait -n $rpid

	cmp -s $tmpfile $tmpfile1

	cmp -s $mirred_e2i_tf1 $mirred_e2i_tf2

	check_err $? "server output check failed"



	$MZ $h1 -c 10 -p 64 -a $h1mac -b $h1mac -A 192.0.2.1 -B 192.0.2.1 \
@@ -241,7 +241,7 @@ mirred_egress_to_ingress_tcp_test() 
	tc filter del dev $h1 egress protocol ip pref 101 handle 101 flower

	tc filter del dev $h1 ingress protocol ip pref 102 handle 102 flower



	rm -f $tmpfile $tmpfile1

	rm -f $mirred_e2i_tf1 $mirred_e2i_tf2

	log_test "mirred_egress_to_ingress_tcp ($tcflags)"

}
@@ -270,6 +270,8 @@ setup_prepare() 


cleanup()

{

	local tf



	pre_cleanup



	switch_destroy
@@ -280,6 +282,8 @@ cleanup() 


	ip link set $swp2 address $swp2origmac

	ip link set $swp1 address $swp1origmac



	for tf in $mirred_e2i_tf1 $mirred_e2i_tf2; do rm -f $tf; done

}



mirred_egress_redirect_test()