mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer

Browse Source 
Use absolute path instead of relative path for meta-skeleton.
Otherwise the case would fail if the builddir outside the poky source
tree.

(From OE-Core rev: 90edaf9b9e51a24bf67c1c95732fc2d8cb22b098)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yi Zhao
2015-04-09 15:10:57 +08:00
committed by Richard Purdie
parent f23a3b6212
commit c0fc3c4727
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/bblayers.py
+5 -4
View File
@@ -6,7 +6,7 @@ import shutil
import oeqa.utils.ftools as ftools import oeqa.utils.ftools as ftools
from oeqa.selftest.base import oeSelfTest from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import runCmd from oeqa.utils.commands import runCmd, get_bb_var
from oeqa.utils.decorators import testcase from oeqa.utils.decorators import testcase
class BitbakeLayers(oeSelfTest): class BitbakeLayers(oeSelfTest):
@@ -44,15 +44,16 @@ class BitbakeLayers(oeSelfTest):
self.assertTrue(find_in_contents) self.assertTrue(find_in_contents)
def test_bitbakelayers_add_remove(self): def test_bitbakelayers_add_remove(self):
test_layer = os.path.join(get_bb_var('COREBASE'), 'meta-skeleton')
result = runCmd('bitbake-layers show-layers') result = runCmd('bitbake-layers show-layers')
self.assertNotIn('meta-skeleton', result.output, 'This test cannot run with meta-skeleton in bblayers.conf') self.assertNotIn('meta-skeleton', result.output, 'This test cannot run with meta-skeleton in bblayers.conf')
result = runCmd('bitbake-layers add-layer ../meta-skeleton') result = runCmd('bitbake-layers add-layer %s' % test_layer)
result = runCmd('bitbake-layers show-layers') result = runCmd('bitbake-layers show-layers')
self.assertIn('meta-skeleton', result.output) self.assertIn('meta-skeleton', result.output)
result = runCmd('bitbake-layers remove-layer ../meta-skeleton') result = runCmd('bitbake-layers remove-layer %s' % test_layer)
result = runCmd('bitbake-layers show-layers') result = runCmd('bitbake-layers show-layers')
self.assertNotIn('meta-skeleton', result.output) self.assertNotIn('meta-skeleton', result.output)
result = runCmd('bitbake-layers add-layer ../meta-skeleton') result = runCmd('bitbake-layers add-layer %s' % test_layer)
result = runCmd('bitbake-layers show-layers') result = runCmd('bitbake-layers show-layers')
self.assertIn('meta-skeleton', result.output) self.assertIn('meta-skeleton', result.output)
result = runCmd('bitbake-layers remove-layer */meta-skeleton') result = runCmd('bitbake-layers remove-layer */meta-skeleton')