diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-07 09:16:18 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-07 09:17:44 +0000 |
commit | 5db5904614296cfa530458741feebc9f57cf753b (patch) | |
tree | f80667a3bfc61d8bac3bae96c74b092c8812c92b /meta/classes/sanity.bbclass | |
parent | a0ef94d3aec3ac347d7cd20b4b5844f687381958 (diff) | |
download | openembedded-core-contrib-5db5904614296cfa530458741feebc9f57cf753b.tar.gz |
sanity.bbclass: Check for DISPLAY for qemutests in BB_ORIGENV now
(From OE-Core rev: e43f8f917e4069d74b467dfd6aa29ff762e83a5e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sanity.bbclass')
-rw-r--r-- | meta/classes/sanity.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 48ac77d744..e1888ba34b 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -499,8 +499,10 @@ def check_sanity(sanity_data): messages = messages + toolchain_msg + '\n' # Check if DISPLAY is set if IMAGETEST is set - if not sanity_data.getVar( 'DISPLAY', True ) and sanity_data.getVar( 'IMAGETEST', True ) == 'qemu': - messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n' + if sanity_data.getVar( 'IMAGETEST', True ) == 'qemu': + display = sanity_data.getVar("BB_ORIGENV", False).getVar("DISPLAY", True) + if not display: + messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n' omask = os.umask(022) if omask & 0755: |