diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-06 23:16:34 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-06 23:40:36 +0000 |
| commit | 8ad8b34b5ac36d805bb10c120f3388e7dce83b98 (patch) | |
| tree | b8db6d71630254890555ac17d2d4e9adc6b4d05a /meta/classes | |
| parent | 131643695d7ba9d0c32bf8e192e7e3942f50f318 (diff) | |
| download | openembedded-core-8ad8b34b5ac36d805bb10c120f3388e7dce83b98.tar.gz openembedded-core-8ad8b34b5ac36d805bb10c120f3388e7dce83b98.tar.bz2 openembedded-core-8ad8b34b5ac36d805bb10c120f3388e7dce83b98.zip | |
imagetest-qemu: Adapt to bitbake environment changes
Load environment variables like DISPLAY from BB_ORIGENV after recent
bitbake changes.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/imagetest-qemu.bbclass | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass index 06ba3e3813..0d18f065a4 100644 --- a/meta/classes/imagetest-qemu.bbclass +++ b/meta/classes/imagetest-qemu.bbclass @@ -67,7 +67,6 @@ def qemuimagetest_main(d): os.environ["DEPLOY_DIR"] = d.getVar("DEPLOY_DIR", True) os.environ["QEMUARCH"] = machine os.environ["QEMUTARGET"] = pname - os.environ["DISPLAY"] = d.getVar("DISPLAY", True) os.environ["COREBASE"] = d.getVar("COREBASE", True) os.environ["TOPDIR"] = d.getVar("TOPDIR", True) os.environ["OE_TMPDIR"] = d.getVar("TMPDIR", True) @@ -76,6 +75,16 @@ def qemuimagetest_main(d): os.environ["TEST_SERIALIZE"] = d.getVar("TEST_SERIALIZE", True) os.environ["SDK_NAME"] = d.getVar("SDK_NAME", True) + # Add in all variables from the user's original environment which + # haven't subsequntly been set/changed + origbbenv = d.getVar("BB_ORIGENV", False) or {} + for key in origbbenv: + if key in os.environ: + continue + value = origbbenv.getVar(key, True) + if value is not None: + os.environ[key] = str(value) + """run Test Case""" bb.note("Run %s test in scenario %s" % (case, scen)) subprocess.call("%s" % fulltestpath, shell=True) |