[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6172/8267] selftest/devtool: Modify test to use default config

[Emmanuele Bassi <ebassi src gnome org>]

commit 38c06ab45084904b28ed6588f147e6379cf8475c
Author: Jose Perez Carranza <jose perez carranza linux intel com>
Date:   Fri May 5 09:02:54 2017 -0700

    selftest/devtool: Modify test to use default config
    
    Modify “test_devtool_virtual_kernel_modify” to be executed with default
    configuration defined on oe-selftest test suite. A shorter string was
    added to the the header file to avoid overlapped sections when building
    kernel for qemux86-64.
    
    [Yocto #11300]
    
    (From OE-Core rev: a8bda790fded43eac72b2ad76d47c27363f02070)
    
    Signed-off-by: Jose Perez Carranza <jose perez carranza linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/selftest/cases/devtool.py |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 75340d6..06ecf40 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1632,10 +1632,6 @@ class DevtoolTests(DevtoolBase):
                          and modification to the source and configurations are reflected
                          when building the kernel.
          """
-        #Set machine to qemxu86 to be able to modify the kernel and
-        #verify the modification.
-        features = 'MACHINE = "qemux86"\n'
-        self.append_config(features)
         kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel')
         # Clean up the enviroment
         bitbake('%s -c clean' % kernel_provider)
@@ -1673,10 +1669,10 @@ class DevtoolTests(DevtoolBase):
         kernelfile = os.path.join(get_bb_var('KBUILD_OUTPUT', kernel_provider), 'vmlinux')
         self.assertTrue(os.path.exists(kernelfile),'Kernel was not build correctly')
 
-        #Modify the kernel source, this is specific for qemux86
+        #Modify the kernel source
         modfile = os.path.join(tempdir,'arch/x86/boot/header.S')
-        modstring = "use a boot loader - Devtool kernel testing"
-        modapplied = runCmd("sed -i 's/boot loader/%s/' %s" % (modstring, modfile))
+        modstring = "Use a boot loader. Devtool testing."
+        modapplied = runCmd("sed -i 's/Use a boot loader./%s/' %s" % (modstring, modfile))
         self.assertEqual(0,modapplied.status,'Modification to %s on kernel source failed' % modfile)
         #Modify the configuration
         codeconfigfile = os.path.join(tempdir,'.config.new')