From 38c06ab45084904b28ed6588f147e6379cf8475c Mon Sep 17 00:00:00 2001 From: Jose Perez Carranza Date: Fri, 5 May 2017 09:02:54 -0700 Subject: selftest/devtool: Modify test to use default config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/devtool.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'meta/lib/oeqa/selftest/cases/devtool.py') diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 75340d6d7b..06ecf40473 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') -- cgit v1.2.3-54-g00ecf