summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-07 09:16:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-07 09:17:41 +0000
commite43f8f917e4069d74b467dfd6aa29ff762e83a5e (patch)
treeeb7966475d68e4d12ba5e54cdf9102b063bea82f /meta
parent722a5eaa6bed6ab8c8a1caa066cd2eba7acda5ee (diff)
downloadopenembedded-core-e43f8f917e4069d74b467dfd6aa29ff762e83a5e.tar.gz
openembedded-core-e43f8f917e4069d74b467dfd6aa29ff762e83a5e.tar.bz2
openembedded-core-e43f8f917e4069d74b467dfd6aa29ff762e83a5e.zip
sanity.bbclass: Check for DISPLAY for qemutests in BB_ORIGENV now
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sanity.bbclass6
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: