sanity.bbclass: Check for DISPLAY for qemutests in BB_ORIGENV now

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 48ac77d744b9dd4b75cbc467c0c1017ac02e7d5c..e1888ba34b167c34149c986e788c65dfe727b68e 100644 (file)
--- 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: