[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4325/8267] selftest/imagefeatures: skip weston test if required features are not present

[Emmanuele Bassi <ebassi src gnome org>]

commit 6702c7b08940691736f66f411e292cd4da1c6001
Author: Leonardo Sandoval <leonardo sandoval gonzalez linux intel com>
Date:   Mon Jan 23 14:41:31 2017 -0600

    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>

 meta/lib/oeqa/selftest/imagefeatures.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py
index d015c49..76896c7 100644
--- a/meta/lib/oeqa/selftest/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/imagefeatures.py
@@ -91,9 +91,9 @@ class ImageFeatures(oeSelfTest):
         AutomatedBy: Daniel Istrate <daniel alexandrux istrate intel com>
         """
 
-        features = 'DISTRO_FEATURES_append = " wayland"\n'
-        features += 'CORE_IMAGE_EXTRA_INSTALL += "wayland weston"'
-        self.write_config(features)
+        distro_features = get_bb_var('DISTRO_FEATURES')
+        if not ('opengl' in distro_features and 'wayland' in distro_features):
+            self.skipTest('neither opengl nor wayland present on DISTRO_FEATURES so core-image-weston cannot 
be built')
 
         # Build a core-image-weston
         bitbake('core-image-weston')