From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Tue, 18 Oct 2016 20:16:24 +0000 (+0200)
Subject: Testsuite: Test for existence if 'ip'
X-Git-Tag: exim-4_88_RC3~17
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/bb660b564b18e962c4f7221075b5e556d4dc4360

Testsuite: Test for existence if 'ip'
---

diff --git a/test/runtest b/test/runtest
index 7fe0e5dae..8dca8316b 100755
--- a/test/runtest
+++ b/test/runtest
@@ -3039,9 +3039,8 @@ else
 # Find this host's IP addresses - there may be many, of course, but we keep
 # one of each type (IPv4 and IPv6).
 
-open(IFCONFIG, 'ip address|')           # show *all*, addresses w/o label
-    or open(IFCONFIG, 'ifconfig -a|')   # probably skips addresses w/o label
-    or die "** Cannot run 'ifconfig' or 'ip address': $!\n";
+open(IFCONFIG, '-|', (grep { -x "$_/ip" } split /:/, $ENV{PATH}) ? 'ip address' : 'ifconfig -a')
+  or die "** Cannot run 'ip address' or 'ifconfig -a'\n";
 while (not ($parm_ipv4 and $parm_ipv6) and defined($_ = <IFCONFIG>))
   {
   if (not $parm_ipv4 and /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)(?:\/\d+)\s/i)