[oe-commits] Stefan Stanacar : oeqa/targetcontrol: properly get the host ip

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 19af3ac53690b1bd2fee54827090f59c525d2236
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=19af3ac53690b1bd2fee54827090f59c525d2236

Author: Stefan Stanacar <stefanx.stanacar at intel.com>
Date:   Tue Feb 25 12:46:11 2014 +0200

oeqa/targetcontrol: properly get the host ip

For the SimpleRemote target where we need the host ip and
it wasn't set in conf, we tried to determine it automatically.
However ip route output isn't the same for every network, we
need the last field from the first line.

Signed-off-by: Stefan Stanacar <stefanx.stanacar at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/lib/oeqa/targetcontrol.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index ba5e6e5..46e5f7f 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -133,7 +133,7 @@ class SimpleRemoteTarget(BaseTarget):
         self.server_ip = d.getVar("TEST_SERVER_IP", True)
         if not self.server_ip:
             try:
-                self.server_ip = subprocess.check_output(['ip', 'route', 'get', self.ip ]).split()[6]
+                self.server_ip = subprocess.check_output(['ip', 'route', 'get', self.ip ]).split("\n")[0].split()[-1]
             except Exception as e:
                 bb.fatal("Failed to determine the host IP address (alternatively you can set TEST_SERVER_IP with the IP address of this machine): %s" % e)
         bb.note("Server IP: %s" % self.server_ip)