aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2015-03-30 04:03:01 +0000
committerMark Johnston <markj@FreeBSD.org>2015-03-30 04:03:01 +0000
commit3f05af05ace08ae28892ecfd28b000822a5d7ae0 (patch)
tree7cb6a8822d40e6f25f28dd9a004a5553b07825d3
parent41aeaf2a3043622e90a6364be5dfe7be164258d9 (diff)
downloadsrc-3f05af05ace08ae28892ecfd28b000822a5d7ae0.tar.gz
src-3f05af05ace08ae28892ecfd28b000822a5d7ae0.zip
Fix ping(8) usage in funcs/tst.system.d so that the test actually completes.
MFC after: 1 week
Notes
Notes: svn path=/head/; revision=280836
-rw-r--r--cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d6
-rw-r--r--cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out15
2 files changed, 15 insertions, 6 deletions
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d
index b7ffbfa4329c..63a850133b3f 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d
@@ -35,11 +35,11 @@ BEGIN
this->b = -2;
system("echo %s %d %d", "foo", this->a, this->b);
- system("ping localhost");
+ system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '");
system("echo %d", ++this->a);
- system("ping localhost");
+ system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '");
system("echo %d", ++this->a);
- system("ping localhost");
+ system("ping -q -c 1 localhost 2>/dev/null | grep -v '^round-trip '");
system("echo %d", ++this->a);
exit(0);
}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out
index cd0d735f0fb2..fa61a5110615 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out
@@ -1,8 +1,17 @@
foo 9 -2
-localhost is alive
+PING localhost (127.0.0.1): 56 data bytes
+
+--- localhost ping statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
10
-localhost is alive
+PING localhost (127.0.0.1): 56 data bytes
+
+--- localhost ping statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
11
-localhost is alive
+PING localhost (127.0.0.1): 56 data bytes
+
+--- localhost ping statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
12