[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4012/8267] selftest/bbtests.py: fix path assumption for LICENSE_DIRECTORY
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 4012/8267] selftest/bbtests.py: fix path assumption for LICENSE_DIRECTORY
- Date: Sun, 17 Dec 2017 01:26:21 +0000 (UTC)
commit 0967a7868971b726f9ec2f3e4ad00454ee3d0a4f
Author: Chen Qi <Qi Chen windriver com>
Date: Tue Jan 10 10:24:53 2017 +0800
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>
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 08cc401..c4e50cb 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):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]