diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2017-03-08 17:24:17 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-10 14:50:10 +0000 |
commit | e0a94a9adeb37637b6b4e08f0f6da0a63d3fbe7c (patch) | |
tree | 5967ac2e5db03a8f45e5b2505b91d99ccd72cdcc /meta | |
parent | e663c6145a7dedbcf86430c7d66bf8da26cf778a (diff) | |
download | poky-e0a94a9adeb37637b6b4e08f0f6da0a63d3fbe7c.tar.gz |
lib/oeqa/selftest/bbtests: update test_non_gplv3 to use selftest-ed
GPLv2 recipes have been moved to a new layer (meta-gplv2), instead of
readline perform this test on the selftest-ed recipe in meta-selftest
which has gplv2 and gplv3 variants.
Tested with oe-selftest -r bbtests.BitbakeTests.test_non_gplv3
(From OE-Core rev: 35b244b292cddb3ded31c2766fb1313511343f06)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/selftest/bbtests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py index 4d9eec130a..c2b79c6351 100644 --- a/meta/lib/oeqa/selftest/bbtests.py +++ b/meta/lib/oeqa/selftest/bbtests.py | |||
@@ -231,11 +231,11 @@ INHERIT_remove = \"report-error\" | |||
231 | @testcase(1119) | 231 | @testcase(1119) |
232 | def test_non_gplv3(self): | 232 | def test_non_gplv3(self): |
233 | self.write_config('INCOMPATIBLE_LICENSE = "GPLv3"') | 233 | self.write_config('INCOMPATIBLE_LICENSE = "GPLv3"') |
234 | result = bitbake('readline', ignore_status=True) | 234 | result = bitbake('selftest-ed', ignore_status=True) |
235 | self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, output %s" % (result.status, result.output)) | 235 | self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, output %s" % (result.status, result.output)) |
236 | lic_dir = get_bb_var('LICENSE_DIRECTORY') | 236 | lic_dir = get_bb_var('LICENSE_DIRECTORY') |
237 | self.assertFalse(os.path.isfile(os.path.join(lic_dir, 'readline/generic_GPLv3'))) | 237 | self.assertFalse(os.path.isfile(os.path.join(lic_dir, 'selftest-ed/generic_GPLv3'))) |
238 | self.assertTrue(os.path.isfile(os.path.join(lic_dir, 'readline/generic_GPLv2'))) | 238 | self.assertTrue(os.path.isfile(os.path.join(lic_dir, 'selftest-ed/generic_GPLv2'))) |
239 | 239 | ||
240 | @testcase(1422) | 240 | @testcase(1422) |
241 | def test_setscene_only(self): | 241 | def test_setscene_only(self): |