From: Leonardo Sandoval <leonardo.sandoval.gonza...@linux.intel.com>
The poky-tiny distro points to linux-yocto-tiny instead of linux-yocto,
so setting the correct name depending on the distro.
[YOCTO #8525]
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonza...@linux.intel.com>
---
meta/lib/oeqa/selftest/base.py | 1 +
meta/lib/oeqa/selftest/bblayers.py | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/selftest/base.py b/meta/lib/oeqa/selftest/base.py
index 26c93f9..b477db3 100644
--- a/meta/lib/oeqa/selftest/base.py
+++ b/meta/lib/oeqa/selftest/base.py
@@ -41,6 +41,7 @@ class oeSelfTest(unittest.TestCase):
self.testinc_path, self.testinc_bblayers_path,
self.machineinc_path, self.localconf_backup,
self.local_bblayers_backup]
+ self.distro = get_bb_var('DISTRO')
super(oeSelfTest, self).__init__(methodName)
def setUp(self):
diff --git a/meta/lib/oeqa/selftest/bblayers.py
b/meta/lib/oeqa/selftest/bblayers.py
index d23675e..a0206a2 100644
--- a/meta/lib/oeqa/selftest/bblayers.py
+++ b/meta/lib/oeqa/selftest/bblayers.py
@@ -68,6 +68,7 @@ class BitbakeLayers(oeSelfTest):
@testcase(1384)
def test_bitbakelayers_showrecipes(self):
+ distro = get_bb_var('DISTRO')
result = runCmd('bitbake-layers show-recipes')
self.assertIn('aspell:', result.output)
self.assertIn('mtd-utils:', result.output)
@@ -77,11 +78,12 @@ class BitbakeLayers(oeSelfTest):
self.assertIn('mtd-utils:', result.output)
self.assertNotIn('aspell:', result.output)
result = runCmd('bitbake-layers show-recipes -i kernel')
- self.assertIn('linux-yocto:', result.output)
+ linux_yocto = 'linux-yocto-tiny' if distro == 'poky-tiny' else
'linux-yocto'
+ self.assertIn(linux_yocto, result.output)
self.assertNotIn('mtd-utils:', result.output)
result = runCmd('bitbake-layers show-recipes -i image')
self.assertIn('core-image-minimal', result.output)
- self.assertNotIn('linux-yocto:', result.output)
+ self.assertNotIn(linux_yocto, result.output)
self.assertNotIn('mtd-utils:', result.output)
result = runCmd('bitbake-layers show-recipes -i cmake,pkgconfig')
self.assertIn('libproxy:', result.output)
--
2.1.4
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
