summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Borzecki <maciej.borzecki@rndity.com>2016-12-19 12:20:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-22 08:46:35 +0000
commitf2a04631949db72d4261d1c142c5044fad3741f9 (patch)
treedc5fa82a2d8498967a0088ba0fdcf02cab3d089e
parentee0b0da237c1661f43e27e26e0ab24b7d8ed174f (diff)
downloadopenembedded-core-contrib-f2a04631949db72d4261d1c142c5044fad3741f9.tar.gz
openembedded-core-contrib-f2a04631949db72d4261d1c142c5044fad3741f9.tar.bz2
openembedded-core-contrib-f2a04631949db72d4261d1c142c5044fad3741f9.zip
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. Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/lib/oeqa/utils/commands.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index 3a68b001b7..0425c9fd98 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()