9 files changed, 31 insertions, 31 deletions

diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh
index 4c7dbaa022a80..30ae79c93c8d0 100755
--- a/tests/sys/netinet/carp.sh
+++ b/tests/sys/netinet/carp.sh
@@ -137,7 +137,7 @@ basic_v6_body()
 	    carp_basic_v6_three ${epair_two}b
 
 	atf_check -s exit:0 -o ignore jexec carp_basic_v6_one \
-	    ping6 -c 3 2001:db8::0:1
+	    ping -6 -c 3 2001:db8::0:1
 }
 
 basic_v6_cleanup()
diff --git a/tests/sys/netinet6/exthdr.sh b/tests/sys/netinet6/exthdr.sh
index 1a12bb2ccd891..3912f1dc5d5ad 100755
--- a/tests/sys/netinet6/exthdr.sh
+++ b/tests/sys/netinet6/exthdr.sh
@@ -74,7 +74,7 @@ exthdr_body() {
 	pyname=$(atf_get ident)
 	pyname=${pyname%*_[0-9]}
 
-	atf_check -o ignore -s exit:0 ping6 -c 3 -q -o ${ip6b}
+	atf_check -o ignore -s exit:0 ping -6 -c 3 -q -o ${ip6b}
 
 	atf_check -s exit:0 $(atf_get_srcdir)/${pyname}.py \
 		--sendif ${epair}a --recvif ${epair}a \
diff --git a/tests/sys/netinet6/lpm6.sh b/tests/sys/netinet6/lpm6.sh
index 937fd83d167b8..caba10c11d2ba 100755
--- a/tests/sys/netinet6/lpm6.sh
+++ b/tests/sys/netinet6/lpm6.sh
@@ -100,7 +100,7 @@ lpm6_test1_success_body()
 	valid_message="${count} packets transmitted, ${count} packets received"
 	
 	# Check that ${net_dst}:2:0 goes via epair0
-	atf_check -o match:"${valid_message}" jexec ${jname}a ping6 -f -nc${count} ${net_dst}:2:0
+	atf_check -o match:"${valid_message}" jexec ${jname}a ping -6 -f -nc${count} ${net_dst}:2:0
 	pkt_0=`jexec ${jname}a netstat -Wf link -I ${epair0}a | head | awk '$1!~/^Name/{print$8}'`
 	pkt_1=`jexec ${jname}a netstat -Wf link -I ${epair1}a | head | awk '$1!~/^Name/{print$8}'`
 	if [ ${pkt_0} -le ${count} ]; then
@@ -109,7 +109,7 @@ lpm6_test1_success_body()
 	fi
 
 	# Check that ${net_dst}:2:1 goes via epair1
-	atf_check -o match:"${valid_message}" jexec ${jname}a ping6 -f -nc${count} ${net_dst}:2:1
+	atf_check -o match:"${valid_message}" jexec ${jname}a ping -6 -f -nc${count} ${net_dst}:2:1
 	pkt_0=`jexec ${jname}a netstat -Wf link -I ${epair0}a | head | awk '$1!~/^Name/{print$8}'`
 	pkt_1=`jexec ${jname}a netstat -Wf link -I ${epair1}a | head | awk '$1!~/^Name/{print$8}'`
 	if [ ${pkt_1} -le ${count} ]; then
@@ -163,7 +163,7 @@ lpm6_test2_success_body()
 	valid_message="${count} packets transmitted, ${count} packets received"
 	
 	# Check that ${net_dst}:2:0 goes via epair1
-	atf_check -o match:"${valid_message}" jexec ${jname}a ping6 -f -nc${count} ${net_dst}:2:0
+	atf_check -o match:"${valid_message}" jexec ${jname}a ping -6 -f -nc${count} ${net_dst}:2:0
 	pkt_0=`jexec ${jname}a netstat -Wf link -I ${epair0}a | head | awk '$1!~/^Name/{print$8}'`
 	pkt_1=`jexec ${jname}a netstat -Wf link -I ${epair1}a | head | awk '$1!~/^Name/{print$8}'`
 	if [ ${pkt_1} -le ${count} ]; then
@@ -172,7 +172,7 @@ lpm6_test2_success_body()
 	fi
 
 	# Check that ${net_dst}:2:2 goes via epair0
-	atf_check -o match:"${valid_message}" jexec ${jname}a ping6 -f -nc${count} ${net_dst}:2:2
+	atf_check -o match:"${valid_message}" jexec ${jname}a ping -6 -f -nc${count} ${net_dst}:2:2
 	pkt_0=`jexec ${jname}a netstat -Wf link -I ${epair0}a | head | awk '$1!~/^Name/{print$8}'`
 	pkt_1=`jexec ${jname}a netstat -Wf link -I ${epair1}a | head | awk '$1!~/^Name/{print$8}'`
 	if [ ${pkt_0} -le ${count} ]; then
diff --git a/tests/sys/netinet6/output6.sh b/tests/sys/netinet6/output6.sh
index 21219389d7ab9..0e1a68366a348 100755
--- a/tests/sys/netinet6/output6.sh
+++ b/tests/sys/netinet6/output6.sh
@@ -227,7 +227,7 @@ output6_raw_success_body()
 		sleep 0.1
 	done
 
-	atf_check -o match:'1 packets transmitted, 1 packets received' jexec ${jname}a ping6 -nc1 ${ip_dst}
+	atf_check -o match:'1 packets transmitted, 1 packets received' jexec ${jname}a ping -6 -nc1 ${ip_dst}
 }
 
 output6_raw_success_cleanup()
@@ -340,7 +340,7 @@ output6_tcp_flowid_mpath_success_body()
 	jexec ${jname}b route add -6 -net ${net_src}::/${plen} ${ll}%${epair1}b
 	
 	# Base setup verification
-	atf_check -o match:'1 packets transmitted, 1 packets received' jexec ${jname}a ping6 -c1 ${ip_dst}
+	atf_check -o match:'1 packets transmitted, 1 packets received' jexec ${jname}a ping -6 -c1 ${ip_dst}
 
 	# run listener
 	num_ports=`echo ${ports} | wc -w`
@@ -482,7 +482,7 @@ output6_udp_flowid_mpath_success_body()
 	jexec ${jname}b route add -6 -net ${net_src}::/${plen} ${ll}%${epair1}b
 	
 	# Base setup verification
-	atf_check -o match:'1 packets transmitted, 1 packets received' jexec ${jname}a ping6 -c1 ${ip_dst}
+	atf_check -o match:'1 packets transmitted, 1 packets received' jexec ${jname}a ping -6 -c1 ${ip_dst}
 
 	# run listener
 	num_ports=`echo ${ports} | wc -w`
@@ -621,13 +621,13 @@ output6_raw_flowid_mpath_success_body()
 	jexec ${jname}b route add -6 -net ${net_src}::/${plen} ${ll}%${epair1}b
 	
 	# Base setup verification
-	atf_check -o match:'1 packets transmitted, 1 packets received' jexec ${jname}a ping6 -nc1 ${ip_dst}
+	atf_check -o match:'1 packets transmitted, 1 packets received' jexec ${jname}a ping -6 -nc1 ${ip_dst}
 
 	# run sender
 	valid_message='1 packets transmitted, 1 packets received'
 	for _ip in ${ips}; do
 		ip="${net_dst}:${_ip}"
-		atf_check -o match:"${valid_message}" jexec ${jname}a ping6 -nc1 ${ip}
+		atf_check -o match:"${valid_message}" jexec ${jname}a ping -6 -nc1 ${ip}
 	done
 
 	pkt_0=`jexec ${jname}a netstat -Wf link -I ${epair0}a | head | awk '$1!~/^Name/{print$8}'`
diff --git a/tests/sys/netipsec/tunnel/utils.subr b/tests/sys/netipsec/tunnel/utils.subr
index 9063a2d394e4a..9f467990b9e1f 100644
--- a/tests/sys/netipsec/tunnel/utils.subr
+++ b/tests/sys/netipsec/tunnel/utils.subr
@@ -124,7 +124,7 @@ ist_test()
 	if [ $1 -eq 4 ]; then
 		atf_check -s exit:0 -o ignore jexec hostA ping -c 1 203.0.113.1
 	else
-		atf_check -s exit:0 -o ignore jexec hostA ping6 -c 1 2001:db8:45::1
+		atf_check -s exit:0 -o ignore jexec hostA ping -6 -c 1 2001:db8:45::1
 	fi
 }
 ist_cleanup()
diff --git a/tests/sys/netpfil/common/pass_block.sh b/tests/sys/netpfil/common/pass_block.sh
index bc2cdd1b6de4d..adba350fc0d3c 100644
--- a/tests/sys/netpfil/common/pass_block.sh
+++ b/tests/sys/netpfil/common/pass_block.sh
@@ -99,7 +99,7 @@ v6_body()
 		"ipf" \
 			"block in all"
 
-	atf_check -s exit:2 -o ignore ping6 -c 1 -W 1 fd7a:803f:cc4b::2
+	atf_check -s exit:2 -o ignore ping -6 -c 1 -W 1 fd7a:803f:cc4b::2
 	
 	# Pass All
 	firewall_config "iron" ${firewall} \
@@ -110,7 +110,7 @@ v6_body()
 		"ipf" \
 			"pass in all"
 
-	atf_check -s exit:0 -o ignore ping6 -c 1 -W 1 fd7a:803f:cc4b::2
+	atf_check -s exit:0 -o ignore ping -6 -c 1 -W 1 fd7a:803f:cc4b::2
 }
 
 v6_cleanup()
diff --git a/tests/sys/netpfil/pf/fragmentation.sh b/tests/sys/netpfil/pf/fragmentation.sh
index b464ccc37418f..e697281b08265 100644
--- a/tests/sys/netpfil/pf/fragmentation.sh
+++ b/tests/sys/netpfil/pf/fragmentation.sh
@@ -112,23 +112,23 @@ v6_body()
 
 	# Host test
 	atf_check -s exit:0 -o ignore \
-		ping6 -c 1 2001:db8:42::2
+		ping -6 -c 1 2001:db8:42::2
 
 	atf_check -s exit:0 -o ignore \
-		ping6 -c 1 -s 4500 2001:db8:42::2
+		ping -6 -c 1 -s 4500 2001:db8:42::2
 
 	atf_check -s exit:0 -o ignore\
-		ping6 -c 1 -b 70000 -s 65000 2001:db8:42::2
+		ping -6 -c 1 -b 70000 -s 65000 2001:db8:42::2
 
 	# Forwarding test
 	atf_check -s exit:0 -o ignore \
-		ping6 -c 1 2001:db8:43::3
+		ping -6 -c 1 2001:db8:43::3
 
 	atf_check -s exit:0 -o ignore \
-		ping6 -c 1 -s 4500 2001:db8:43::3
+		ping -6 -c 1 -s 4500 2001:db8:43::3
 
 	atf_check -s exit:0 -o ignore\
-		ping6 -c 1 -b 70000 -s 65000 2001:db8:43::3
+		ping -6 -c 1 -b 70000 -s 65000 2001:db8:43::3
 
 	$(atf_get_srcdir)/CVE-2019-5597.py \
 		${epair_send}a \
diff --git a/tests/sys/netpfil/pf/pass_block.sh b/tests/sys/netpfil/pf/pass_block.sh
index 3282b0f3dceab..139adb43bddd9 100644
--- a/tests/sys/netpfil/pf/pass_block.sh
+++ b/tests/sys/netpfil/pf/pass_block.sh
@@ -85,23 +85,23 @@ v6_body()
 	jexec alcatraz ifconfig ${epair}b inet6 2001:db8:42::2/64 up no_dad
 
 	# Trivial ping to the jail, without pf
-	atf_check -s exit:0 -o ignore ping6 -c 1 -W 1 2001:db8:42::2
+	atf_check -s exit:0 -o ignore ping -6 -c 1 -W 1 2001:db8:42::2
 
 	# pf without policy will let us ping
 	jexec alcatraz pfctl -e
-	atf_check -s exit:0 -o ignore ping6 -c 1 -W 1 2001:db8:42::2
+	atf_check -s exit:0 -o ignore ping -6 -c 1 -W 1 2001:db8:42::2
 
 	# Block everything
 	pft_set_rules alcatraz "block in"
-	atf_check -s exit:2 -o ignore ping6 -c 1 -W 1 2001:db8:42::2
+	atf_check -s exit:2 -o ignore ping -6 -c 1 -W 1 2001:db8:42::2
 
 	# Block everything but ICMP
 	pft_set_rules alcatraz "block in" "pass in proto icmp6"
-	atf_check -s exit:0 -o ignore ping6 -c 1 -W 1 2001:db8:42::2
+	atf_check -s exit:0 -o ignore ping -6 -c 1 -W 1 2001:db8:42::2
 
 	# Allowing ICMPv4 does not allow ICMPv6
 	pft_set_rules alcatraz "block in" "pass in proto icmp"
-	atf_check -s exit:2 -o ignore ping6 -c 1 -W 1 2001:db8:42::2
+	atf_check -s exit:2 -o ignore ping -6 -c 1 -W 1 2001:db8:42::2
 }
 
 v6_cleanup()
@@ -132,21 +132,21 @@ noalias_body()
 		| cut -d % -f 1)
 
 	# Sanity check
-	atf_check -s exit:0 -o ignore ping6 -c 3 -W 1 2001:db8:42::2
-	atf_check -s exit:0 -o ignore ping6 -c 3 -W 1 ${linklocaladdr}%${epair}a
+	atf_check -s exit:0 -o ignore ping -6 -c 3 -W 1 2001:db8:42::2
+	atf_check -s exit:0 -o ignore ping -6 -c 3 -W 1 ${linklocaladdr}%${epair}a
 
 	jexec alcatraz pfctl -e
 	pft_set_rules alcatraz "block out inet6 from (${epair}b:0) to any"
 
-	atf_check -s exit:2 -o ignore ping6 -c 3 -W 1 2001:db8:42::2
+	atf_check -s exit:2 -o ignore ping -6 -c 3 -W 1 2001:db8:42::2
 
 	# We should still be able to ping the link-local address
-	atf_check -s exit:0 -o ignore ping6 -c 3 -W 1 ${linklocaladdr}%${epair}a
+	atf_check -s exit:0 -o ignore ping -6 -c 3 -W 1 ${linklocaladdr}%${epair}a
 
 	pft_set_rules alcatraz "block out inet6 from (${epair}b) to any"
 
 	# We cannot ping to the link-local address
-	atf_check -s exit:2 -o ignore ping6 -c 3 -W 1 ${linklocaladdr}%${epair}a
+	atf_check -s exit:2 -o ignore ping -6 -c 3 -W 1 ${linklocaladdr}%${epair}a
 }
 
 noalias_cleanup()
diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh
index 5597b45e1e6a8..af2691067f523 100644
--- a/tests/sys/netpfil/pf/table.sh
+++ b/tests/sys/netpfil/pf/table.sh
@@ -93,7 +93,7 @@ v6_counters_body()
 	    "pass in from <foo6> to any" \
 	    "pass out from any to <foo6>"
 
-	atf_check -s exit:0 -o ignore ping6 -c 3 2001:db8:42::2
+	atf_check -s exit:0 -o ignore ping -6 -c 3 2001:db8:42::2
 
 	atf_check -s exit:0 -e ignore \
 	    -o match:'In/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \