summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-09-19 13:12:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-22 12:19:34 +0100
commit595321a62669e90bed5f459a9d926a68988086a9 (patch)
treed6f5a9363985341b0b1b9eb7ac1fd54c5a68aa40 /meta
parenta3558bfb995fadf22d0d55a7ac7f5307ad48ae51 (diff)
downloadpoky-595321a62669e90bed5f459a9d926a68988086a9.tar.gz
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. (From OE-Core rev: d1297c2c3ae71de0e9e5cab36e582f5df8666391) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sanity.bbclass6
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):
627 627
628 check_supported_distro(d) 628 check_supported_distro(d)
629 629
630 # Check if DISPLAY is set if IMAGETEST is set 630 # Check if DISPLAY is set if TEST_IMAGE is set
631 if d.getVar( 'IMAGETEST', True ) == 'qemu': 631 if d.getVar('TEST_IMAGE', True) == '1' or d.getVar('DEFAULT_TEST_SUITES', True):
632 display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True) 632 display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True)
633 if not display: 633 if not display:
634 status.addresult('qemuimagetest needs an X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n') 634 status.addresult('testimage needs an X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n')
635 635
636 omask = os.umask(022) 636 omask = os.umask(022)
637 if omask & 0755: 637 if omask & 0755: