summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-01-10 10:24:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:05:13 +0000
commit988f2efd655f90bd20d6923ea1a8ed50f535656e (patch)
tree8b1020ad22b0cb3962db243af3006ae071aea05e /meta/lib
parent0967a7868971b726f9ec2f3e4ad00454ee3d0a4f (diff)
downloadpoky-988f2efd655f90bd20d6923ea1a8ed50f535656e.tar.gz
selftest/buildoptions.py: fix path assumption for DEPLOY_DIR_SRC
Fix path assumption for DEPLOY_DIR_SRC, otherwise, the testcase may fail even if the functionality works well. (From OE-Core rev: dab5d3901755a965cdd8f5b5e8ffb8e4cb79f2e5) 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/lib')
-rw-r--r--meta/lib/oeqa/selftest/buildoptions.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py
index 25d14f7c7a..95fd2f01ec 100644
--- a/meta/lib/oeqa/selftest/buildoptions.py
+++ b/meta/lib/oeqa/selftest/buildoptions.py
@@ -197,7 +197,8 @@ class ArchiverTest(oeSelfTest):
197 self.write_config("INHERIT += \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nARCHIVER_MODE[srpm] = \"1\"") 197 self.write_config("INHERIT += \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nARCHIVER_MODE[srpm] = \"1\"")
198 res = bitbake("xcursor-transparent-theme", ignore_status=True) 198 res = bitbake("xcursor-transparent-theme", ignore_status=True)
199 self.assertEqual(res.status, 0, "\nCouldn't build xcursortransparenttheme.\nbitbake output %s" % res.output) 199 self.assertEqual(res.status, 0, "\nCouldn't build xcursortransparenttheme.\nbitbake output %s" % res.output)
200 pkgs_path = g.glob(str(self.builddir) + "/tmp/deploy/sources/allarch*/xcurs*") 200 deploy_dir_src = get_bb_var('DEPLOY_DIR_SRC')
201 pkgs_path = g.glob(str(deploy_dir_src) + "/allarch*/xcurs*")
201 src_file_glob = str(pkgs_path[0]) + "/xcursor*.src.rpm" 202 src_file_glob = str(pkgs_path[0]) + "/xcursor*.src.rpm"
202 tar_file_glob = str(pkgs_path[0]) + "/xcursor*.tar.gz" 203 tar_file_glob = str(pkgs_path[0]) + "/xcursor*.tar.gz"
203 self.assertTrue((g.glob(src_file_glob) and g.glob(tar_file_glob)), "Couldn't find .src.rpm and .tar.gz files under tmp/deploy/sources/allarch*/xcursor*") 204 self.assertTrue((g.glob(src_file_glob) and g.glob(tar_file_glob)), "Couldn't find .src.rpm and .tar.gz files under %s/allarch*/xcursor*" % deploy_dir_src)