[oe-commits] [openembedded-core] 07/46: selftest/runtime-test: Split the config values

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 58d43b470ffa9b498234b6845cacfd867218ca03
Author: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
AuthorDate: Thu Apr 27 13:36:23 2017 -0700

    selftest/runtime-test: Split the config values
    
    Split the configuration values (common and specific) so it is easier to read
    what goes into the config file. Also the specific configurations are
    set in every loop so these do not append on each iteration.
    
    Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oeqa/selftest/runtime-test.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/runtime-test.py b/meta/lib/oeqa/selftest/runtime-test.py
index e498d04..13a4c03 100644
--- a/meta/lib/oeqa/selftest/runtime-test.py
+++ b/meta/lib/oeqa/selftest/runtime-test.py
@@ -203,11 +203,12 @@ postinst-delayed-t \
         rootfs_pkg = 'postinst-at-rootfs'
         boot_pkg = 'postinst-delayed-a'
         #Step 1
-        features = 'MACHINE = "qemux86"\n'
-        features += 'CORE_IMAGE_EXTRA_INSTALL += "%s %s "\n'% (rootfs_pkg, boot_pkg)
-        features += 'IMAGE_FEATURES += "ssh-server-openssh"\n'
+        common_features = 'MACHINE = "qemux86"\n'
+        common_features += 'CORE_IMAGE_EXTRA_INSTALL += "%s %s "\n'% (rootfs_pkg, boot_pkg)
+        common_features += 'IMAGE_FEATURES += "ssh-server-openssh"\n'
         for init_manager in ("sysvinit", "systemd"):
             #for sysvinit no extra configuration is needed,
+            features = ''
             if (init_manager is "systemd"):
                 features += 'DISTRO_FEATURES_append = " systemd"\n'
                 features += 'VIRTUAL-RUNTIME_init_manager = "systemd"\n'
@@ -217,7 +218,7 @@ postinst-delayed-t \
                             "package_deb package_rpm package_ipk",
                             "package_ipk package_deb package_rpm"):
                 features += 'PACKAGE_CLASSES = "%s"\n' % classes
-                self.write_config(features)
+                self.write_config(common_features + features)
 
                 #Step 2
                 bitbake('core-image-minimal')

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.