[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3867/8267] oeqa/utils/commands.py: allow use of binaries from native sysroot

[Emmanuele Bassi <ebassi src gnome org>]

commit 5903182484276fec4d9ccbe7ad2c859e9588e5ba
Author: Maciej Borzecki <maciej borzecki rndity com>
Date:   Mon Dec 19 12:20:57 2016 +0100

    oeqa/utils/commands.py: allow use of binaries from native sysroot
    
    Tests may need to run a native tool that is not available on the host
    filesystem, but can be built using one of the *-native recipes. In such case,
    the tool will be available in native sysroot, and running in from that location
    will require adjustments to PATH.
    
    runCmd() can now take a path to native sysroot as one of its arguments and
    setup PATH accordingly.
    
    (From OE-Core rev: f2a04631949db72d4261d1c142c5044fad3741f9)
    
    Signed-off-by: Maciej Borzecki <maciej borzecki rndity com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/utils/commands.py |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index 3a68b00..0425c9f 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/meta/lib/oeqa/utils/commands.py
@@ -97,9 +97,16 @@ class Result(object):
     pass
 
 
-def runCmd(command, ignore_status=False, timeout=None, assert_error=True, **options):
+def runCmd(command, ignore_status=False, timeout=None, assert_error=True, native_sysroot=None, **options):
     result = Result()
 
+    if native_sysroot:
+        extra_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin" % \
+                      (native_sysroot, native_sysroot, native_sysroot)
+        nenv = dict(options.get('env', os.environ))
+        nenv['PATH'] = extra_paths + ':' + nenv.get('PATH', '')
+        options['env'] = nenv
+
     cmd = Command(command, timeout=timeout, **options)
     cmd.run()