Helpful when I commit all of the changes isn't it...
On Wed, 10 Jul 2019 at 22:22, Richard Purdie <[email protected]> wrote: > > On Wed, 2019-07-10 at 13:34 +0100, Ross Burton wrote: > > The current test builds Navit, which uses GTK+ 2. As GTK+ 2 is being > > removed > > from oe-core, change the test to build taglib instead. > > > > Signed-off-by: Ross Burton <[email protected]> > > --- > > meta/lib/oeqa/selftest/cases/recipetool.py | 19 ++++++++----------- > > 1 file changed, 8 insertions(+), 11 deletions(-) > > > > diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py > > b/meta/lib/oeqa/selftest/cases/recipetool.py > > index e3f5c71666f..1c701a40bf0 100644 > > --- a/meta/lib/oeqa/selftest/cases/recipetool.py > > +++ b/meta/lib/oeqa/selftest/cases/recipetool.py > > @@ -406,22 +406,19 @@ class RecipetoolTests(RecipetoolBase): > > self._test_recipe_contents(os.path.join(temprecipe, dirlist[0]), > > checkvars, inherits) > > > > def test_recipetool_create_cmake(self): > > - bitbake('-c packagedata gtk+') > > - > > - # Try adding a recipe > > temprecipe = os.path.join(self.tempdir, 'recipe') > > os.makedirs(temprecipe) > > - recipefile = os.path.join(temprecipe, 'navit_0.5.0.bb') > > - srcuri = > > 'http://downloads.yoctoproject.org/mirror/sources/navit-0.5.0.tar.gz' > > + recipefile = os.path.join(temprecipe, 'taglib_1.11.1.bb') > > + srcuri = 'http://taglib.github.io/releases/taglib-1.11.1.tar.gz' > > result = runCmd('recipetool create -o %s %s' % (temprecipe, > > srcuri)) > > self.assertTrue(os.path.isfile(recipefile)) > > checkvars = {} > > - checkvars['LICENSE'] = set(['Unknown', 'GPLv2', 'LGPLv2']) > > - checkvars['SRC_URI'] = > > 'http://downloads.yoctoproject.org/mirror/sources/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', 'fribidi']) > > - inherits = ['cmake', 'python-dir', 'gettext', 'pkgconfig'] > > + checkvars['LICENSE'] = set(['LGPLv2.1', 'MPL-1.1']) > > + checkvars['SRC_URI'] = > > 'http://taglib.github.io/releases/taglib-${PV}.tar.gz' > > + checkvars['SRC_URI[md5sum]'] = 'cee7be0ccfc892fa433d6c837df9522a' > > + checkvars['SRC_URI[sha256sum]'] = > > 'b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b' > > + checkvars['DEPENDS'] = set(['boost', 'zlib']) > > + inherits = ['cmake'] > > self._test_recipe_contents(recipefile, checkvars, inherits) > > > > def test_recipetool_create_github(self): > > > > > 2019-07-10 19:33:07,067 - oe-selftest - INFO - > ====================================================================== > 2019-07-10 19:33:07,067 - oe-selftest - INFO - FAIL: > recipetool.RecipetoolTests.test_recipetool_create_cmake > (subunit.RemotedTestCase) > 2019-07-10 19:33:07,068 - oe-selftest - INFO - > ---------------------------------------------------------------------- > 2019-07-10 19:33:07,068 - oe-selftest - INFO - > testtools.testresult.real._StringException: Traceback (most recent call last): > File > "/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/lib/oeqa/selftest/cases/recipetool.py", > line 422, in test_recipetool_create_cmake > self._test_recipe_contents(recipefile, checkvars, inherits) > File > "/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/lib/oeqa/selftest/cases/devtool.py", > line 172, in _test_recipe_contents > self.assertEqual(value, needvalue, 'values for %s do not match' % var) > File "/usr/lib/python3.5/unittest/case.py", line 821, in assertEqual > assertion_func(first, second, msg=msg) > File "/usr/lib/python3.5/unittest/case.py", line 1073, in assertSetEqual > self.fail(self._formatMessage(msg, standardMsg)) > File "/usr/lib/python3.5/unittest/case.py", line 666, in fail > raise self.failureException(msg) > AssertionError: Items in the first set but not the second: > 'Unknown' > Items in the second set but not the first: > 'MPL-1.1' : values for LICENSE do not match > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/283 > https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/284 > > etc. > > Cheers, > > Richard > -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
