diff options
| author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2014-04-02 10:02:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-04 11:53:50 +0100 |
| commit | 342322c7bb97ab54f5caeb241810a715e78d8d21 (patch) | |
| tree | 82212a4457e3c1d628cde9669bae50d84996e0ce | |
| parent | 6d6d0b89ac1205125867ff8397e80867ba9e6eed (diff) | |
| download | ast2050-yocto-poky-342322c7bb97ab54f5caeb241810a715e78d8d21.zip ast2050-yocto-poky-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.bbclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index dd7fe4c..989bdcd 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -672,9 +672,11 @@ def check_sanity_everybuild(status, d): # 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('testimage needs an X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n') + testtarget = d.getVar('TEST_TARGET', True) + if testtarget == 'qemu' or testtarget == 'QemuTarget': + display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True) + if not display: + 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: |
