diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-09-19 13:12:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-20 12:14:32 +0100 |
commit | d1297c2c3ae71de0e9e5cab36e582f5df8666391 (patch) | |
tree | a794559245451473ab66d7cfdd6152fd54ca2202 | |
parent | 72269a8fbec35c39af30fbabb1fa9ca7c5ee8d69 (diff) | |
download | openembedded-core-d1297c2c3ae71de0e9e5cab36e582f5df8666391.tar.gz openembedded-core-d1297c2c3ae71de0e9e5cab36e582f5df8666391.tar.bz2 openembedded-core-d1297c2c3ae71de0e9e5cab36e582f5df8666391.zip |
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@linux.intel.com>
-rw-r--r-- | 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 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: |