diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2015-04-09 15:10:57 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-10 18:10:24 +0100 |
| commit | c0fc3c4727a69455d899b52ee9d0ebd341a7912d (patch) | |
| tree | 108d1c242e5ee069d3d98a5b194bfbce533c9801 /meta/lib/oeqa | |
| parent | f23a3b6212048c256a50784a1a7f482622e4c67d (diff) | |
| download | openembedded-core-contrib-c0fc3c4727a69455d899b52ee9d0ebd341a7912d.tar.gz | |
lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer
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>
Diffstat (limited to 'meta/lib/oeqa')
| -rw-r--r-- | meta/lib/oeqa/selftest/bblayers.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/bblayers.py b/meta/lib/oeqa/selftest/bblayers.py index 5b046d06e1..3a18029a02 100644 --- a/meta/lib/oeqa/selftest/bblayers.py +++ b/meta/lib/oeqa/selftest/bblayers.py @@ -6,7 +6,7 @@ import shutil import oeqa.utils.ftools as ftools 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 class BitbakeLayers(oeSelfTest): @@ -44,15 +44,16 @@ class BitbakeLayers(oeSelfTest): self.assertTrue(find_in_contents) def test_bitbakelayers_add_remove(self): + test_layer = os.path.join(get_bb_var('COREBASE'), 'meta-skeleton') result = runCmd('bitbake-layers show-layers') 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') 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') 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') self.assertIn('meta-skeleton', result.output) result = runCmd('bitbake-layers remove-layer */meta-skeleton') |