Patchwork [3/5] classes/sanity: test for DISPLAY being set with testimage class

login
register
mail settings
Submitter Paul Eggleton
Date Sept. 20, 2013, 9:27 a.m.
Message ID <5e48791ccbb9ab86eef2f7dbbecb496a35ec6fcd.1379669217.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/58427/
State Accepted
Commit 595321a62669e90bed5f459a9d926a68988086a9
Headers show

Comments

Paul Eggleton - Sept. 20, 2013, 9:27 a.m.
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@linux.intel.com>
---
 meta/classes/sanity.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch

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: