[OE-core] [PATCH 1/1] buildoptions.py: fix test_arch_work_dir_and_export_source
Chen Qi
Qi.Chen at windriver.com
Mon Jun 17 08:04:32 UTC 2019
If multilib is enabled, allarch is actually disabled. So take
this into consideration in this test case, using /*/ instead of /allarch*/.
Also, use xcursor-transparent-theme* instead of xcursor* for more
accurate match.
Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
---
meta/lib/oeqa/selftest/cases/buildoptions.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py
index 3ad65b4..51b948c 100644
--- a/meta/lib/oeqa/selftest/cases/buildoptions.py
+++ b/meta/lib/oeqa/selftest/cases/buildoptions.py
@@ -154,12 +154,12 @@ class ArchiverTest(OESelftestTestCase):
"""
self.write_config("INHERIT += \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nARCHIVER_MODE[srpm] = \"1\"")
res = bitbake("xcursor-transparent-theme", ignore_status=True)
- self.assertEqual(res.status, 0, "\nCouldn't build xcursortransparenttheme.\nbitbake output %s" % res.output)
+ self.assertEqual(res.status, 0, "\nCouldn't build xcursor-transparent-theme.\nbitbake output %s" % res.output)
deploy_dir_src = get_bb_var('DEPLOY_DIR_SRC')
- pkgs_path = g.glob(str(deploy_dir_src) + "/allarch*/xcurs*")
- src_file_glob = str(pkgs_path[0]) + "/xcursor*.src.rpm"
- tar_file_glob = str(pkgs_path[0]) + "/xcursor*.tar.gz"
- 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)
+ pkgs_path = g.glob(str(deploy_dir_src) + "/*/xcursor-transparent-theme*")
+ src_file_glob = str(pkgs_path[0]) + "/xcursor-transparent-theme*.src.rpm"
+ tar_file_glob = str(pkgs_path[0]) + "/xcursor-transparent-theme*.tar.gz"
+ self.assertTrue((g.glob(src_file_glob) and g.glob(tar_file_glob)), "Couldn't find .src.rpm and .tar.gz files under %s/*/xcursor-transparent-theme*" % deploy_dir_src)
class ToolchainOptions(OESelftestTestCase):
--
1.9.1
More information about the Openembedded-core
mailing list