diff options
| author |   Ross Burton <ross.burton@intel.com> | 2018-09-13 12:30:39 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-13 16:28:26 +0100 |
| commit | d180dc758710c7259d45eeb9304e7284a8fd8825 (patch) | |
| tree | 80624996a3334ad5db1d6cd1e327d752d9cb28ea /meta/lib/oeqa/selftest/cases | |
| parent | e91838b63b506e2969582b2b8511fd3724d6aa3f (diff) | |
| download | openembedded-core-contrib-d180dc758710c7259d45eeb9304e7284a8fd8825.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.
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/cases')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/recipetool.py | 4 |
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 754ea949824..cd15df11a93 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -427,6 +427,8 @@ class RecipetoolTests(RecipetoolBase): @OETestID(1418) def test_recipetool_create_cmake(self): + bitbake('-c packagedata gtk+') + # Try adding a recipe temprecipe = os.path.join(self.tempdir, 'recipe') os.makedirs(temprecipe) @@ -439,7 +441,7 @@ class RecipetoolTests(RecipetoolBase): checkvars['SRC_URI'] = 'http://downloads.sourceforge.net/project/navit/v${PV}/navit-${PV}.tar.gz' checkvars['SRC_URI[md5sum]'] = '242f398e979a6b8c0f3c802b63435b68' checkvars['SRC_URI[sha256sum]'] = '13353481d7fc01a4f64e385dda460b51496366bba0fd2cc85a89a0747910e94d' - checkvars['DEPENDS'] = set(['freetype', 'zlib', 'openssl', 'glib-2.0', 'virtual/libgl', 'virtual/egl', 'gtk+', 'libpng', 'libsdl', 'freeglut', 'dbus-glib']) + checkvars['DEPENDS'] = set(['freetype', 'zlib', 'openssl', 'glib-2.0', 'virtual/libgl', 'virtual/egl', 'gtk+', 'libpng', 'libsdl', 'freeglut', 'dbus-glib', 'fribidi']) inherits = ['cmake', 'python-dir', 'gettext', 'pkgconfig'] self._test_recipe_contents(recipefile, checkvars, inherits) |