diff options
author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2016-07-07 14:48:55 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 11:08:16 +0100 |
commit | 380e5d80898cac4ffc9715b3f597d0b62a0643ff (patch) | |
tree | d88099f1c8d3f30275e35cc30c24b89e193cf753 /meta/lib/oeqa | |
parent | 9900000d404b09a701d5368d529eb515e054e3f0 (diff) | |
download | openembedded-core-380e5d80898cac4ffc9715b3f597d0b62a0643ff.tar.gz openembedded-core-380e5d80898cac4ffc9715b3f597d0b62a0643ff.tar.bz2 openembedded-core-380e5d80898cac4ffc9715b3f597d0b62a0643ff.zip |
lib/oeqa/utils/commands.py: Move updateEnv() from runexported.py
updateEnv() can be used in other places so move the
function to utils/commands.py
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/lib/oeqa')
-rwxr-xr-x | meta/lib/oeqa/runexported.py | 16 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/commands.py | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/meta/lib/oeqa/runexported.py b/meta/lib/oeqa/runexported.py index 58867393bb..125e86d0e6 100755 --- a/meta/lib/oeqa/runexported.py +++ b/meta/lib/oeqa/runexported.py @@ -31,7 +31,7 @@ except ImportError: sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "oeqa"))) from oeqa.oetest import ExportTestContext -from oeqa.utils.commands import runCmd +from oeqa.utils.commands import runCmd, updateEnv from oeqa.utils.sshcontrol import SSHControl # this isn't pretty but we need a fake target object @@ -137,19 +137,7 @@ def extract_sdk(d): if f.startswith("environment-setup"): print("Setting up SDK environment...") env_file = os.path.join(extract_path, f) - update_env(env_file) - -def update_env(env_file): - """ - Source a file and update environment - """ - - cmd = ". %s; env -0" % env_file - result = runCmd(cmd) - - for line in result.output.split("\0"): - (key, _, value) = line.partition("=") - os.environ[key] = value + updateEnv(env_file) if __name__ == "__main__": try: diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index 418643a1a6..4f79d15bb8 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -261,3 +261,15 @@ def runqemu(pn, ssh=True): qemu.stop() except: pass + +def updateEnv(env_file): + """ + Source a file and update environment. + """ + + cmd = ". %s; env -0" % env_file + result = runCmd(cmd) + + for line in result.output.split("\0"): + (key, _, value) = line.partition("=") + os.environ[key] = value |