* [PATCH] lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer
@ 2015-04-09 7:10 Yi Zhao
2015-04-09 10:04 ` Paul Eggleton
2015-04-10 0:22 ` Khem Raj
0 siblings, 2 replies; 4+ messages in thread
From: Yi Zhao @ 2015-04-09 7:10 UTC (permalink / raw)
To: openembedded-core; +Cc: paul.eggleton
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 <yi.zhao@windriver.com>
---
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 5b046d0..3a18029 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')
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer
2015-04-09 7:10 [PATCH] lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer Yi Zhao
@ 2015-04-09 10:04 ` Paul Eggleton
2015-04-10 0:22 ` Khem Raj
1 sibling, 0 replies; 4+ messages in thread
From: Paul Eggleton @ 2015-04-09 10:04 UTC (permalink / raw)
To: openembedded-core
On Thursday 09 April 2015 15:10:57 Yi Zhao wrote:
> 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 <yi.zhao@windriver.com>
> ---
> 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 5b046d0..3a18029 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')
Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer
2015-04-09 7:10 [PATCH] lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer Yi Zhao
2015-04-09 10:04 ` Paul Eggleton
@ 2015-04-10 0:22 ` Khem Raj
2015-04-10 9:26 ` Yi Zhao
1 sibling, 1 reply; 4+ messages in thread
From: Khem Raj @ 2015-04-10 0:22 UTC (permalink / raw)
To: Yi Zhao; +Cc: paul.eggleton, openembedded-core
> On Apr 9, 2015, at 12:10 AM, Yi Zhao <yi.zhao@windriver.com> wrote:
>
> Use absolute path instead of relative path for meta-skeleton.
> Otherwise the case would fail if the builddir outside the poky source
> tree.
may be you should say ‘OE-Core’ sources instead here.
>
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ---
> 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 5b046d0..3a18029 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')
> --
> 1.7.9.5
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer
2015-04-10 0:22 ` Khem Raj
@ 2015-04-10 9:26 ` Yi Zhao
0 siblings, 0 replies; 4+ messages in thread
From: Yi Zhao @ 2015-04-10 9:26 UTC (permalink / raw)
To: Khem Raj; +Cc: paul.eggleton, openembedded-core
在 2015年04月10日 08:22, Khem Raj 写道:
>> On Apr 9, 2015, at 12:10 AM, Yi Zhao <yi.zhao@windriver.com> wrote:
>>
>> Use absolute path instead of relative path for meta-skeleton.
>> Otherwise the case would fail if the builddir outside the poky source
>> tree.
> may be you should say ‘OE-Core’ sources instead here.
Thanks, Khem. Strictly speaking it should be OE-Core.
Yi
>
>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>> ---
>> 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 5b046d0..3a18029 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')
>> --
>> 1.7.9.5
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-04-10 9:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-09 7:10 [PATCH] lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer Yi Zhao
2015-04-09 10:04 ` Paul Eggleton
2015-04-10 0:22 ` Khem Raj
2015-04-10 9:26 ` Yi Zhao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox