From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Fri, 2 Oct 2015 13:03:17 +0000 (+0300)
Subject: oe-selftest: wic: fix LocalSetup
X-Git-Tag: 2015-10~149
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=037b757722093ced372eaae8cc9305ad2ea81ab5;p=openembedded-core.git

oe-selftest: wic: fix LocalSetup

Appended required features to build config every time
LocalSetup is run to ensure that core-image-minimal is not
rebuilt due to configuration changes.

This should fix test22_mkgummidisk and test23_mkefidisk testcases as
they depend on specific features set in LocalSetup.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 0a35935aac..7625505463 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -48,10 +48,10 @@ class Wic(oeSelfTest):
 
     def setUpLocal(self):
         """This code is executed before each test method."""
+        features = 'IMAGE_FSTYPES += " hddimg"\nMACHINE_FEATURES_append = " efi"\n'
+        self.append_config(features)
         if not Wic.image_is_ready:
             # build core-image-minimal with required features
-            features = 'IMAGE_FSTYPES += " hddimg"\nMACHINE_FEATURES_append = " efi"\n'
-            self.append_config(features)
             bitbake('core-image-minimal')
             # set this class variable to avoid buiding image many times
             Wic.image_is_ready = True