From d1297c2c3ae71de0e9e5cab36e582f5df8666391 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 19 Sep 2013 13:12:49 +0100 Subject: 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 --- meta/classes/sanity.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index feffed9431..b8e5b02da0 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: -- cgit v1.2.3