diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2017-01-10 10:24:53 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-16 18:05:13 +0000 |
commit | 0967a7868971b726f9ec2f3e4ad00454ee3d0a4f (patch) | |
tree | 508e9c92c932abad1431710c1730a9cceae55923 /meta | |
parent | 0c943538e42e78290cef4b8cbe434ed93cf4b0a9 (diff) | |
download | poky-0967a7868971b726f9ec2f3e4ad00454ee3d0a4f.tar.gz |
selftest/bbtests.py: fix path assumption for LICENSE_DIRECTORY
Fix path assumption for LICENSE_DIRECTORY, otherwise, the test case
may fail even if the functionality it tests works well.
(From OE-Core rev: ae388652b8de0665390560e78429e10119d4d537)
Signed-off-by: Chen Qi <Qi.Chen@windriver.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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py index 08cc4012fc..c4e50cbfa0 100644 --- a/meta/lib/oeqa/selftest/bbtests.py +++ b/meta/lib/oeqa/selftest/bbtests.py | |||
@@ -235,8 +235,9 @@ INHERIT_remove = \"report-error\" | |||
235 | self.addCleanup(ftools.remove_from_file, conf ,data) | 235 | self.addCleanup(ftools.remove_from_file, conf ,data) |
236 | result = bitbake('readline', ignore_status=True) | 236 | result = bitbake('readline', ignore_status=True) |
237 | self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, output %s" % (result.status, result.output)) | 237 | self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, output %s" % (result.status, result.output)) |
238 | self.assertFalse(os.path.isfile(os.path.join(self.builddir, 'tmp/deploy/licenses/readline/generic_GPLv3'))) | 238 | lic_dir = get_bb_var('LICENSE_DIRECTORY') |
239 | self.assertTrue(os.path.isfile(os.path.join(self.builddir, 'tmp/deploy/licenses/readline/generic_GPLv2'))) | 239 | self.assertFalse(os.path.isfile(os.path.join(lic_dir, 'readline/generic_GPLv3'))) |
240 | self.assertTrue(os.path.isfile(os.path.join(lic_dir, 'readline/generic_GPLv2'))) | ||
240 | 241 | ||
241 | @testcase(1422) | 242 | @testcase(1422) |
242 | def test_setscene_only(self): | 243 | def test_setscene_only(self): |