summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2017-01-23 14:41:31 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-26 10:44:27 +0000
commit6702c7b08940691736f66f411e292cd4da1c6001 (patch)
tree4338114dae3e02e9d50d0a9c905e014212ad7af2 /meta/lib
parent6805ae0f2aa77b2719f382140c3ad562e767d21b (diff)
downloadpoky-6702c7b08940691736f66f411e292cd4da1c6001.tar.gz
selftest/imagefeatures: skip weston test if required features are not present
Also, remove hard-coded features because the image already contains them. (From OE-Core rev: 899680840d497343095d0e7d7264e3e278ba4602) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/imagefeatures.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py
index d015c49087..76896c7981 100644
--- a/meta/lib/oeqa/selftest/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/imagefeatures.py
@@ -91,9 +91,9 @@ class ImageFeatures(oeSelfTest):
91 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> 91 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
92 """ 92 """
93 93
94 features = 'DISTRO_FEATURES_append = " wayland"\n' 94 distro_features = get_bb_var('DISTRO_FEATURES')
95 features += 'CORE_IMAGE_EXTRA_INSTALL += "wayland weston"' 95 if not ('opengl' in distro_features and 'wayland' in distro_features):
96 self.write_config(features) 96 self.skipTest('neither opengl nor wayland present on DISTRO_FEATURES so core-image-weston cannot be built')
97 97
98 # Build a core-image-weston 98 # Build a core-image-weston
99 bitbake('core-image-weston') 99 bitbake('core-image-weston')