document -N in documentation and implement small fixes in test suite for macOS

diff --git a/ChangeLog b/ChangeLog
index c5f757320e11c78118ec93a66e224fbc465ba067..2168ae9092b1ec442a2dec8b42ae83e3abfdc302 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
   * Version 3.14
   * (feature) Ignore network and broadcast for cidrs /31 and /32 (#102, Martin Topholm)
   * (feature) New option '-M' to set the "Don't Fragment" flag (#91, Don Bowman) 
-  * (feature) New option '-N' to output statistics for netdata (see: http://my-netdata.io/, #10, Costa Tsaousis)
+  * (feature) New option '-N' to output statistics for netdata (see: http://my-netdata.io/, #105, Costa Tsaousis)
   * (feature) New option '-o' to calculate total outage time (#90, @jgerbeck)
   * (bugfix) Exit code should be 2 when the hostname can't be resolved
             (fixes #98, reported by @green-fox)

diff --git a/ci/test-14-ping-internet-hosts.pl b/ci/test-14-ping-internet-hosts.pl
index 388acfe5adb3184d5706e5b48dee9499948677a0..3c7aadb07aceaa2a2c2eca4ee2fc528d8547f85d 100755 (executable)
--- a/ci/test-14-ping-internet-hosts.pl
+++ b/ci/test-14-ping-internet-hosts.pl
@@ -43,7 +43,7 @@ $cmd->stderr_is_eq("");
 
 # fping6 -A -n
 SKIP: {
-    if(system("/sbin/ifconfig | grep inet6") != 0) {
+    if(system("/sbin/ifconfig | grep inet6.*Scope:Global") != 0) {
         skip 'No IPv6 on this host', 3;
     }
     my $cmd = Test::Command->new(cmd => "fping6 -n -A 2001:4860:4860::8888");

diff --git a/ci/test-issue-56.pl b/ci/test-issue-56.pl
index e1806bb0d379bba8baafb5e59323dc57138d6ad8..e36cc14d96f4f8da572cf1e0d2ddb2686eade761 100755 (executable)
--- a/ci/test-issue-56.pl
+++ b/ci/test-issue-56.pl
@@ -1,8 +1,16 @@
 #!/usr/bin/perl -w
 
 # regression testing for github issue #56
+#
+use Test::Command;
+use Test::More;
 
-use Test::Command tests => 3;
+if( $^O eq 'darwin' ) {
+    plan skip_all => 'Test disabled on MacOS';
+    exit 0;
+}
+
+plan tests => 3;
 
 my $cmd1 = Test::Command->new(cmd => "fping -t100 -p100 -C3 255.255.255.255");
 $cmd1->exit_is_num(1);

diff --git a/doc/fping.pod b/doc/fping.pod
index f0b82446362a9bc297c8e135402cd9cabe2cbbdf..94cbfff4527266756588008b0d8a20e0a3d554b8 100644 (file)
--- a/doc/fping.pod
+++ b/doc/fping.pod
@@ -135,6 +135,10 @@ Set the "Don't Fragment" bit in the IP header (used to determine/test the MTU).
 
 Same as -d. 
 
+=item B<-N>
+
+Format output for netdata (-l -Q are required). See: http://my-netdata.io/
+
 =item B<-o>
 
 Calculate "outage time" based on the number of lost pings and the interval used (useful for network convergence tests).