mirrors/poky
1
0 Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-10-23 19:38:18 +00:00
Code Issues Projects Releases Wiki Activity

lib/oeqa/otest.py: Fix import tests from other layers with python3

Browse Source 
In python3 the functionality to import modules has been changed and
this broke the capability to add runtime tests from other layers.

This commit returns this capability to testimage and testexport.

[YOCTO #9705]

(From OE-Core rev: a26f23d3ce8f7e9f59dbc9bf27516377fd7a0a6d)

Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mariano Lopez authored and Richard Purdie committed 2016-06-07 15:22:38 +01:00
1 parent 84441a96f0
commit d9b3ee8b38
4 files changed
+8 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

meta/classes/testexport.bbclass
+6 -4
View File
@@ -96,11 +96,13 @@ def exportTests(d,tc):
shutil.copytree(foldername, target_folder)
if not isfolder:
shutil.copy2(mod.path, os.path.join(exportpath, "oeqa/runtime"))
# copy __init__.py files
oeqadir = os.path.dirname(pkgutil.get_loader("oeqa").path)
shutil.copy2(os.path.join(oeqadir, "__init__.py"), os.path.join(exportpath, "oeqa"))
shutil.copy2(os.path.join(oeqadir, "runtime/__init__.py"), os.path.join(exportpath, "oeqa/runtime"))
# Get meta layer
for layer in d.getVar("BBLAYERS", True).split():
if os.path.basename(layer) == "meta":
meta_layer = layer
break
# copy oeqa/oetest.py and oeqa/runexported.py
oeqadir = os.path.join(meta_layer, "lib/oeqa")
shutil.copy2(os.path.join(oeqadir, "oetest.py"), os.path.join(exportpath, "oeqa"))
shutil.copy2(os.path.join(oeqadir, "runexported.py"), exportpath)
# copy oeqa/utils/*.py