summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-09-13 12:30:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 17:38:07 +0100
commit7bf0d815877c441a92730de8b86e3c4de1f7165b (patch)
tree90e658a5485468b5c92915178c4b3ee2d4aba1a6 /meta/lib/oeqa/selftest
parent1110b68dda41f5cdc849ec01afff5c4b45cd90aa (diff)
downloadpoky-7bf0d815877c441a92730de8b86e3c4de1f7165b.tar.gz
oeqa/selftest/recipetool: fix non-determinism in cmake test
The Navit recipe can depend on fribidi which is now part of oe-core. Since the pkgconfig lookup is based on pkgdata the results can change depending on what has been built, which leads to occasional failures. Build gtk+ before the test to ensure that the pkgdata is populated with more of the dependencies, and add fribidi to the generated DEPENDS checklist. (From OE-Core rev: d180dc758710c7259d45eeb9304e7284a8fd8825) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r--meta/lib/oeqa/selftest/cases/recipetool.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py
index 754ea94982..cd15df11a9 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -427,6 +427,8 @@ class RecipetoolTests(RecipetoolBase):
427 427
428 @OETestID(1418) 428 @OETestID(1418)
429 def test_recipetool_create_cmake(self): 429 def test_recipetool_create_cmake(self):
430 bitbake('-c packagedata gtk+')
431
430 # Try adding a recipe 432 # Try adding a recipe
431 temprecipe = os.path.join(self.tempdir, 'recipe') 433 temprecipe = os.path.join(self.tempdir, 'recipe')
432 os.makedirs(temprecipe) 434 os.makedirs(temprecipe)
@@ -439,7 +441,7 @@ class RecipetoolTests(RecipetoolBase):
439 checkvars['SRC_URI'] = 'http://downloads.sourceforge.net/project/navit/v${PV}/navit-${PV}.tar.gz' 441 checkvars['SRC_URI'] = 'http://downloads.sourceforge.net/project/navit/v${PV}/navit-${PV}.tar.gz'
440 checkvars['SRC_URI[md5sum]'] = '242f398e979a6b8c0f3c802b63435b68' 442 checkvars['SRC_URI[md5sum]'] = '242f398e979a6b8c0f3c802b63435b68'
441 checkvars['SRC_URI[sha256sum]'] = '13353481d7fc01a4f64e385dda460b51496366bba0fd2cc85a89a0747910e94d' 443 checkvars['SRC_URI[sha256sum]'] = '13353481d7fc01a4f64e385dda460b51496366bba0fd2cc85a89a0747910e94d'
442 checkvars['DEPENDS'] = set(['freetype', 'zlib', 'openssl', 'glib-2.0', 'virtual/libgl', 'virtual/egl', 'gtk+', 'libpng', 'libsdl', 'freeglut', 'dbus-glib']) 444 checkvars['DEPENDS'] = set(['freetype', 'zlib', 'openssl', 'glib-2.0', 'virtual/libgl', 'virtual/egl', 'gtk+', 'libpng', 'libsdl', 'freeglut', 'dbus-glib', 'fribidi'])
443 inherits = ['cmake', 'python-dir', 'gettext', 'pkgconfig'] 445 inherits = ['cmake', 'python-dir', 'gettext', 'pkgconfig']
444 self._test_recipe_contents(recipefile, checkvars, inherits) 446 self._test_recipe_contents(recipefile, checkvars, inherits)
445 447