Re: [OE-core] [PATCH 2/9] selftest: skip two bbtest tests depending on distro
On Mon, 2016-10-17 at 11:04 -0500, Leonardo Sandoval wrote: > > On 10/17/2016 02:08 AM, Joshua Lock wrote: > > > > On Fri, 2016-10-14 at 11:40 -0500, > > leonardo.sandoval.gonza...@linux.intel.com wrote: > > > > > > From: Leonardo Sandoval > > om> > > > > > > There are two bbtests that just makes sense on certain distros: > > > test_bitbake_g cannot be done on poky-tiny and test_non_gplv3 > > > just makes sense on poky and poky-tiny. Skip these when > > > necessary under the latter conditions. > > > > > > [YOCTO #8525] > > > > > > Signed-off-by: Leonardo Sandoval > > x.in > > > tel.com> > > > --- > > > meta/lib/oeqa/selftest/bbtests.py | 7 +++ > > > 1 file changed, 7 insertions(+) > > > > > > diff --git a/meta/lib/oeqa/selftest/bbtests.py > > > b/meta/lib/oeqa/selftest/bbtests.py > > > index baae1e0..9b11cd9 100644 > > > --- a/meta/lib/oeqa/selftest/bbtests.py > > > +++ b/meta/lib/oeqa/selftest/bbtests.py > > > @@ -114,6 +114,9 @@ class BitbakeTests(oeSelfTest): > > > > > > @testcase(167) > > > def test_bitbake_g(self): > > > +if self.distro == 'poky-tiny': > > > +self.skipTest('core-image-full-cmdline is not > > > buildable > > > with poky-tiny') > > > + > > This test is still valid for poky-tiny, it's just that the image > > the > > test builds isn't buildable with poky-tiny, right? > > > > I think it would be better to change the test to a different, > > smaller, > > image that can also be built for poky-tiny (core-image-minimal?). > > We'd also need to change the target the test checks for the > > presence of > > in pn-buildlist. > Good idea. Which image and pn-buildlist package check do you suggest? It doesn't really matter and will depend on which image you decide to build for the test. The goal of the test appears to be to validate the output of `bitbake -e`. Hopefully we can find an image and recipe combination which is buildable across distros but I don't know what that would be off the top of my head. Regards, Joshua > > > > Regards, > > > > Joshua > > > > > > > > result = bitbake('-g core-image-full-cmdline') > > > for f in ['pn-buildlist', 'pn-depends.dot', 'package- > > > depends.dot', 'task-depends.dot']: > > > self.addCleanup(os.remove, f) > > > @@ -229,6 +232,10 @@ INHERIT_remove = \"report-error\" > > > > > > @testcase(1119) > > > def test_non_gplv3(self): > > > +supported_distros = ['poky', 'poky-tiny'] > > > +if not self.distro in supported_distros: > > > +self.skipTest('Test considers only %s distros' % > > > ','.join(supported_distros)) > > > + > > > data = 'INCOMPATIBLE_LICENSE = "GPLv3"' > > > conf = os.path.join(self.builddir, 'conf/local.conf') > > > ftools.append_file(conf ,data) > > > -- > > > 2.1.4 > > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/9] selftest: skip two bbtest tests depending on distro
On 10/17/2016 02:08 AM, Joshua Lock wrote: On Fri, 2016-10-14 at 11:40 -0500, leonardo.sandoval.gonza...@linux.intel.com wrote: From: Leonardo Sandoval There are two bbtests that just makes sense on certain distros: test_bitbake_g cannot be done on poky-tiny and test_non_gplv3 just makes sense on poky and poky-tiny. Skip these when necessary under the latter conditions. [YOCTO #8525] Signed-off-by: Leonardo Sandoval --- meta/lib/oeqa/selftest/bbtests.py | 7 +++ 1 file changed, 7 insertions(+) diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py index baae1e0..9b11cd9 100644 --- a/meta/lib/oeqa/selftest/bbtests.py +++ b/meta/lib/oeqa/selftest/bbtests.py @@ -114,6 +114,9 @@ class BitbakeTests(oeSelfTest): @testcase(167) def test_bitbake_g(self): +if self.distro == 'poky-tiny': +self.skipTest('core-image-full-cmdline is not buildable with poky-tiny') + This test is still valid for poky-tiny, it's just that the image the test builds isn't buildable with poky-tiny, right? I think it would be better to change the test to a different, smaller, image that can also be built for poky-tiny (core-image-minimal?). We'd also need to change the target the test checks for the presence of in pn-buildlist. Good idea. Which image and pn-buildlist package check do you suggest? Regards, Joshua result = bitbake('-g core-image-full-cmdline') for f in ['pn-buildlist', 'pn-depends.dot', 'package- depends.dot', 'task-depends.dot']: self.addCleanup(os.remove, f) @@ -229,6 +232,10 @@ INHERIT_remove = \"report-error\" @testcase(1119) def test_non_gplv3(self): +supported_distros = ['poky', 'poky-tiny'] +if not self.distro in supported_distros: +self.skipTest('Test considers only %s distros' % ','.join(supported_distros)) + data = 'INCOMPATIBLE_LICENSE = "GPLv3"' conf = os.path.join(self.builddir, 'conf/local.conf') ftools.append_file(conf ,data) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/9] selftest: skip two bbtest tests depending on distro
On Fri, 2016-10-14 at 11:40 -0500, leonardo.sandoval.gonza...@linux.intel.com wrote: > From: Leonardo Sandoval > > There are two bbtests that just makes sense on certain distros: > test_bitbake_g cannot be done on poky-tiny and test_non_gplv3 > just makes sense on poky and poky-tiny. Skip these when > necessary under the latter conditions. > > [YOCTO #8525] > > Signed-off-by: Leonardo Sandoval tel.com> > --- > meta/lib/oeqa/selftest/bbtests.py | 7 +++ > 1 file changed, 7 insertions(+) > > diff --git a/meta/lib/oeqa/selftest/bbtests.py > b/meta/lib/oeqa/selftest/bbtests.py > index baae1e0..9b11cd9 100644 > --- a/meta/lib/oeqa/selftest/bbtests.py > +++ b/meta/lib/oeqa/selftest/bbtests.py > @@ -114,6 +114,9 @@ class BitbakeTests(oeSelfTest): > > @testcase(167) > def test_bitbake_g(self): > +if self.distro == 'poky-tiny': > +self.skipTest('core-image-full-cmdline is not buildable > with poky-tiny') > + This test is still valid for poky-tiny, it's just that the image the test builds isn't buildable with poky-tiny, right? I think it would be better to change the test to a different, smaller, image that can also be built for poky-tiny (core-image-minimal?). We'd also need to change the target the test checks for the presence of in pn-buildlist. Regards, Joshua > result = bitbake('-g core-image-full-cmdline') > for f in ['pn-buildlist', 'pn-depends.dot', 'package- > depends.dot', 'task-depends.dot']: > self.addCleanup(os.remove, f) > @@ -229,6 +232,10 @@ INHERIT_remove = \"report-error\" > > @testcase(1119) > def test_non_gplv3(self): > +supported_distros = ['poky', 'poky-tiny'] > +if not self.distro in supported_distros: > +self.skipTest('Test considers only %s distros' % > ','.join(supported_distros)) > + > data = 'INCOMPATIBLE_LICENSE = "GPLv3"' > conf = os.path.join(self.builddir, 'conf/local.conf') > ftools.append_file(conf ,data) > -- > 2.1.4 > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core