[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4278/8267] selftest: automatically add the meta-selftest layer

[Emmanuele Bassi <ebassi src gnome org>]

commit 44ac2995b88410aa1456e91c0ec913e3b5335010
Author: Benjamin Esquivel <benjamin esquivel linux intel com>
Date:   Thu Jan 19 15:55:52 2017 +0000

    selftest: automatically add the meta-selftest layer
    
    adding the meta-selftest layer is a small bump you always encounter
    when you want to run selftest. Adding an automatic procedure to include
    the layer if it is not yet present.
    
    (From OE-Core rev: b5000dd7b1d74d5dfede869ffa75ed87f5a8553c)
    
    Signed-off-by: Benjamin Esquivel <benjamin esquivel linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/oe-selftest |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index 0baf572..58d3b1e 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -131,8 +131,16 @@ def preflight_check():
         os.chdir(builddir)
 
     if not "meta-selftest" in get_bb_var("BBLAYERS"):
-        log.error("You don't seem to have the meta-selftest layer in BBLAYERS")
-        return False
+        log.warn("meta-selftest layer not found in BBLAYERS, adding it")
+        meta_selftestdir = os.path.join(
+                get_bb_var("BBLAYERS_FETCH_DIR"),
+                'meta-selftest')
+        if os.path.isdir(meta_selftestdir):
+            runCmd("bitbake-layers add-layer %s" %meta_selftestdir)
+        else:
+            log.error("could not locate meta-selftest in:\n%s"
+                    %meta_selftestdir)
+            return False
 
     if "buildhistory.bbclass" in get_bb_var("BBINCLUDED"):
         log.error("You have buildhistory enabled already and this isn't recommended for selftest, please 
disable it first.")