summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorJose Perez Carranza <jose.perez.carranza@linux.intel.com>2017-05-05 09:02:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-09 17:12:14 +0100
commit38c06ab45084904b28ed6588f147e6379cf8475c (patch)
treef2b6d48911ced560cbc1871e2cce9b10777fcaf1 /meta/lib
parenta9a5b6267f86f430c0c95c19fd41c1551baff627 (diff)
downloadpoky-38c06ab45084904b28ed6588f147e6379cf8475c.tar.gz
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>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py10
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 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):
1632 and modification to the source and configurations are reflected 1632 and modification to the source and configurations are reflected
1633 when building the kernel. 1633 when building the kernel.
1634 """ 1634 """
1635 #Set machine to qemxu86 to be able to modify the kernel and
1636 #verify the modification.
1637 features = 'MACHINE = "qemux86"\n'
1638 self.append_config(features)
1639 kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel') 1635 kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel')
1640 # Clean up the enviroment 1636 # Clean up the enviroment
1641 bitbake('%s -c clean' % kernel_provider) 1637 bitbake('%s -c clean' % kernel_provider)
@@ -1673,10 +1669,10 @@ class DevtoolTests(DevtoolBase):
1673 kernelfile = os.path.join(get_bb_var('KBUILD_OUTPUT', kernel_provider), 'vmlinux') 1669 kernelfile = os.path.join(get_bb_var('KBUILD_OUTPUT', kernel_provider), 'vmlinux')
1674 self.assertTrue(os.path.exists(kernelfile),'Kernel was not build correctly') 1670 self.assertTrue(os.path.exists(kernelfile),'Kernel was not build correctly')
1675 1671
1676 #Modify the kernel source, this is specific for qemux86 1672 #Modify the kernel source
1677 modfile = os.path.join(tempdir,'arch/x86/boot/header.S') 1673 modfile = os.path.join(tempdir,'arch/x86/boot/header.S')
1678 modstring = "use a boot loader - Devtool kernel testing" 1674 modstring = "Use a boot loader. Devtool testing."
1679 modapplied = runCmd("sed -i 's/boot loader/%s/' %s" % (modstring, modfile)) 1675 modapplied = runCmd("sed -i 's/Use a boot loader./%s/' %s" % (modstring, modfile))
1680 self.assertEqual(0,modapplied.status,'Modification to %s on kernel source failed' % modfile) 1676 self.assertEqual(0,modapplied.status,'Modification to %s on kernel source failed' % modfile)
1681 #Modify the configuration 1677 #Modify the configuration
1682 codeconfigfile = os.path.join(tempdir,'.config.new') 1678 codeconfigfile = os.path.join(tempdir,'.config.new')