summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2014-04-02 10:02:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-04 11:53:50 +0100
commit342322c7bb97ab54f5caeb241810a715e78d8d21 (patch)
tree82212a4457e3c1d628cde9669bae50d84996e0ce
parent6d6d0b89ac1205125867ff8397e80867ba9e6eed (diff)
downloadpoky-342322c7bb97ab54f5caeb241810a715e78d8d21.tar.gz
sanity: testimage needs DISPLAY set only for qemu targets
There's no point in failing if DISPLAY isn't set if we don't boot a qemu image when using a controller like SimpleRemoteTarget or GummibootTarget. (From OE-Core rev: 9fcd3af8626e1b0979b0cde745fe0880ccc50de7) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sanity.bbclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index dd7fe4cdfb..989bdcd7cd 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -672,9 +672,11 @@ def check_sanity_everybuild(status, d):
672 672
673 # Check if DISPLAY is set if TEST_IMAGE is set 673 # Check if DISPLAY is set if TEST_IMAGE is set
674 if d.getVar('TEST_IMAGE', True) == '1' or d.getVar('DEFAULT_TEST_SUITES', True): 674 if d.getVar('TEST_IMAGE', True) == '1' or d.getVar('DEFAULT_TEST_SUITES', True):
675 display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True) 675 testtarget = d.getVar('TEST_TARGET', True)
676 if not display: 676 if testtarget == 'qemu' or testtarget == 'QemuTarget':
677 status.addresult('testimage needs an X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n') 677 display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True)
678 if not display:
679 status.addresult('testimage needs an X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n')
678 680
679 omask = os.umask(022) 681 omask = os.umask(022)
680 if omask & 0755: 682 if omask & 0755: