[oe-commits] Richard Purdie : sanity.bbclass: Check for DISPLAY for qemutests in BB_ORIGENV now

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: e43f8f917e4069d74b467dfd6aa29ff762e83a5e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e43f8f917e4069d74b467dfd6aa29ff762e83a5e

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Feb  7 09:16:18 2013 +0000

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

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

---

 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 48ac77d..e1888ba 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: