Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh	(revision 280836)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh	(revision 280837)
@@ -1,70 +1,71 @@
 #!/usr/bin/ksh
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #
 # Test ip:::{send,receive} of IPv4 ICMP to a local address.
 #
 # This may fail due to:
 #
 # 1. A change to the ip stack breaking expected probe behavior,
 #    which is the reason we are testing.
 # 2. The lo0 interface missing or not up.
 # 3. Unrelated ICMP on lo0 traced by accident.
 #
 
 if (( $# != 1 )); then
 	print -u2 "expected one argument: <dtrace-path>"
 	exit 2
 fi
 
 dtrace=$1
 local=127.0.0.1
 
-$dtrace -c "/sbin/ping $local 3" -qs /dev/stdin <<EOF | sort -n
+$dtrace -c "/sbin/ping -q -c 1 -t 3 $local" -qs /dev/stdin <<EOF | sort -n | \
+    grep -v -e '^round-trip ' -e '^--- '
 ip:::send
 /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" &&
     args[4]->ipv4_protocol == IPPROTO_ICMP/
 {
-	printf("1 ip:::send    (");
+	printf("2 ip:::send    (");
 	printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength);
 	printf("args[4]: %d %d %d %d %d)\n",
 	    args[4]->ipv4_ver, args[4]->ipv4_length, args[4]->ipv4_flags,
 	    args[4]->ipv4_offset, args[4]->ipv4_ttl);
 }
 
 ip:::receive
 /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" &&
     args[4]->ipv4_protocol == IPPROTO_ICMP/
 {
-	printf("2 ip:::receive (");
+	printf("3 ip:::receive (");
 	printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength);
 	printf("args[4]: %d %d %d %d %d)\n",
 	    args[4]->ipv4_ver, args[4]->ipv4_length, args[4]->ipv4_flags,
 	    args[4]->ipv4_offset, args[4]->ipv4_ttl);
 }
 EOF
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out	(revision 280836)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out	(revision 280837)
@@ -1,6 +1,8 @@
 
-1 ip:::send    (args[2]: 4 64, args[4]: 4 84 0 0 255)
-1 ip:::send    (args[2]: 4 64, args[4]: 4 84 0 0 255)
-2 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 255)
-2 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 255)
-127.0.0.1 is alive
+
+PING 127.0.0.1 (127.0.0.1): 56 data bytes
+1 packets transmitted, 1 packets received, 0.0% packet loss
+2 ip:::send    (args[2]: 4 64, args[4]: 4 84 0 0 64)
+2 ip:::send    (args[2]: 4 64, args[4]: 4 84 0 0 64)
+3 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 64)
+3 ip:::receive (args[2]: 4 64, args[4]: 4 84 0 0 64)
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh	(revision 280836)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh	(revision 280837)
@@ -1,82 +1,83 @@
 #!/usr/bin/ksh
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #
 # Test ip:::{send,receive} of IPv6 ICMP to a local address.  This creates a
 # temporary lo0/inet6 interface if one doesn't already exist.
 #
 # This may fail due to:
 #
 # 1. A change to the ip stack breaking expected probe behavior,
 #    which is the reason we are testing.
 # 2. Unrelated ICMPv6 on lo0 traced by accident.
 #
 
 if (( $# != 1 )); then
 	print -u2 "expected one argument: <dtrace-path>"
 	exit 2
 fi
 
 dtrace=$1
 local=::1
 
 if ! ifconfig lo0 inet6 > /dev/null 2>&1; then
 	if ! ifconfig lo0 inet6 plumb up; then
 		print -u2 "could not plumb lo0 inet6 for testing"
 		exit 3
 	fi
 	removeinet6=1
 else
 	removeinet6=0
 fi
 
-$dtrace -c "/sbin/ping -A inet6 $local 3" -qs /dev/stdin <<EOF | sort -n
+$dtrace -c "/sbin/ping6 -q -c 1 -X 3 $local" -qs /dev/stdin <<EOF | sort -n | \
+    grep -v -e '^round-trip ' -e '^--- '
 ip:::send
 /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" &&
     args[5]->ipv6_nexthdr == IPPROTO_ICMPV6/
 {
-	printf("1 ip:::send    (");
+	printf("2 ip:::send    (");
 	printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength);
 	printf("args[5]: %d %d %d)\n",
 	    args[5]->ipv6_ver, args[5]->ipv6_tclass, args[5]->ipv6_plen);
 }
 
 ip:::receive
 /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" &&
     args[5]->ipv6_nexthdr == IPPROTO_ICMPV6/
 {
-	printf("2 ip:::receive (");
+	printf("3 ip:::receive (");
 	printf("args[2]: %d %d, ", args[2]->ip_ver, args[2]->ip_plength);
 	printf("args[5]: %d %d %d)\n",
 	    args[5]->ipv6_ver, args[5]->ipv6_tclass, args[5]->ipv6_plen);
 }
 EOF
 
 if (( removeinet6 )); then
 	ifconfig lo0 inet6 unplumb
 fi
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out	(revision 280836)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out	(revision 280837)
@@ -1,6 +1,8 @@
 
-::1 is alive
-1 ip:::send    (args[2]: 6 64, args[5]: 6 0 64)
-1 ip:::send    (args[2]: 6 64, args[5]: 6 0 64)
-2 ip:::receive (args[2]: 6 64, args[5]: 6 0 64)
-2 ip:::receive (args[2]: 6 64, args[5]: 6 0 64)
+
+PING6(56=40+8+8 bytes) ::1 --> ::1
+1 packets transmitted, 1 packets received, 0.0% packet loss
+2 ip:::send    (args[2]: 6 16, args[5]: 6 0 16)
+2 ip:::send    (args[2]: 6 16, args[5]: 6 0 16)
+3 ip:::receive (args[2]: 6 16, args[5]: 6 0 16)
+3 ip:::receive (args[2]: 6 16, args[5]: 6 0 16)