From 5db5904614296cfa530458741feebc9f57cf753b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 7 Feb 2013 09:16:18 +0000 Subject: sanity.bbclass: Check for DISPLAY for qemutests in BB_ORIGENV now (From OE-Core rev: e43f8f917e4069d74b467dfd6aa29ff762e83a5e) Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 6 ++++-- 1 file 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: -- cgit v1.2.3-54-g00ecf