From: Chen Qi Date: Tue, 10 Jan 2017 02:24:53 +0000 (+0800) Subject: selftest/bbtests.py: fix path assumption for LICENSE_DIRECTORY X-Git-Tag: uninative-1.5~874 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ae388652b8de0665390560e78429e10119d4d537;p=openembedded-core.git 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. Signed-off-by: Chen Qi Signed-off-by: Ross Burton --- 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\" self.addCleanup(ftools.remove_from_file, conf ,data) result = bitbake('readline', ignore_status=True) self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, output %s" % (result.status, result.output)) - self.assertFalse(os.path.isfile(os.path.join(self.builddir, 'tmp/deploy/licenses/readline/generic_GPLv3'))) - self.assertTrue(os.path.isfile(os.path.join(self.builddir, 'tmp/deploy/licenses/readline/generic_GPLv2'))) + lic_dir = get_bb_var('LICENSE_DIRECTORY') + self.assertFalse(os.path.isfile(os.path.join(lic_dir, 'readline/generic_GPLv3'))) + self.assertTrue(os.path.isfile(os.path.join(lic_dir, 'readline/generic_GPLv2'))) @testcase(1422) def test_setscene_only(self):