From 90edaf9b9e51a24bf67c1c95732fc2d8cb22b098 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 9 Apr 2015 15:10:57 +0800 Subject: 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. Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/bblayers.py | 9 +++++---- 1 file 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') -- cgit v1.2.3