[oe-commits] Paul Eggleton : classes/sanity: test for DISPLAY being set with testimage class

[git at git.openembedded.org]

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

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Thu Sep 19 13:12:49 2013 +0100

classes/sanity: test for DISPLAY being set with testimage class

Update the sanity test for DISPLAY being set to handle the new testimage
class rather than the old imagetest-qemu class.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 meta/classes/sanity.bbclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index feffed9..b8e5b02 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -627,11 +627,11 @@ def check_sanity_everybuild(status, d):
 
     check_supported_distro(d)
 
-    # Check if DISPLAY is set if IMAGETEST is set
-    if d.getVar( 'IMAGETEST', True ) == 'qemu':
+    # Check if DISPLAY is set if TEST_IMAGE is set
+    if d.getVar('TEST_IMAGE', True) == '1' or d.getVar('DEFAULT_TEST_SUITES', True):
         display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True)
         if not display:
-            status.addresult('qemuimagetest needs an X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n')
+            status.addresult('testimage needs an X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n')
 
     omask = os.umask(022)
     if omask & 0755: