From: Lucian Musat <george.l.mu...@intel.com>
Copy all the __init__.py files from all the extra layers
also, specified in bblayers.conf, in accordance to
TEST_SUITES variable.
Signed-off-by: Lucian Musat <george.l.mu...@intel.com>
---
meta/classes/testimage.bbclass | 67 +++++++++++++++++++++++-------------------
meta/lib/oeqa/runexported.py | 2 +-
2 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 88aa941..83a11ee 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -211,6 +211,7 @@ def exportTests(d,tc):
import shutil
import pkgutil
import re
+ import oeqa.utils.testexport as te
exportpath = d.getVar("TEST_EXPORT_DIR", True)
@@ -300,37 +301,37 @@ def exportTests(d,tc):
if not os.path.exists(target_folder):
shutil.copytree(mod.filename, target_folder)
- if not isfolder:
+ if not isfolder:
shutil.copy2(mod.filename, os.path.join(layerpath, "oeqa/runtime"))
- # copy __init__.py files
- for _oeqadir in get_extra_layers(d):
- oeqadir = os.path.join(_oeqadir,"lib","oeqa")
- # copy oeqa/oetest.py and oeqa/runexported.py
- if os.path.basename(_oeqadir) == "meta":
- layerpath = exportpath
- # Make sure we always copy the minimum required files from meta
- shutil.copy2(os.path.join(oeqadir, "oetest.py"),
os.path.join(layerpath, "oeqa"))
- shutil.copy2(os.path.join(oeqadir, "__init__.py"),
os.path.join(layerpath, "oeqa"))
- shutil.copy2(os.path.join(oeqadir, "runtime", "__init__.py"),
os.path.join(layerpath, "oeqa", "runtime"))
- shutil.copy2(os.path.join(oeqadir, "runexported.py"), layerpath)
- for root, dirs, files in os.walk(os.path.join(oeqadir, "utils")):
- for f in files:
- if f.endswith(".py"):
- shutil.copy2(os.path.join(root, f),
os.path.join(layerpath, "oeqa/utils"))
- else:
- if oeqadir in mod.filename:
- layerpath = os.path.join(exportpath, "extralayers",
get_layer(mod.filename))
-
- try:
- if oeqadir in mod.filename:
+ # copy __init__.py files
+ for _oeqadir in get_extra_layers(d):
+ oeqadir = os.path.join(_oeqadir,"lib","oeqa")
+ # copy oeqa/oetest.py and oeqa/runexported.py
+ if os.path.basename(_oeqadir) == "meta":
+ layerpath = exportpath
+ # Make sure we always copy the minimum required files from meta
+ shutil.copy2(os.path.join(oeqadir, "oetest.py"),
os.path.join(layerpath, "oeqa"))
shutil.copy2(os.path.join(oeqadir, "__init__.py"),
os.path.join(layerpath, "oeqa"))
- except IOError:
- pass
- try:
- if oeqadir in mod.filename:
- shutil.copy2(os.path.join(oeqadir, "runtime/__init__.py"),
os.path.join(layerpath, "oeqa/runtime"))
- except IOError:
- pass
+ shutil.copy2(os.path.join(oeqadir, "runtime", "__init__.py"),
os.path.join(layerpath, "oeqa", "runtime"))
+ shutil.copy2(os.path.join(oeqadir, "runexported.py"),
layerpath)
+ for root, dirs, files in os.walk(os.path.join(oeqadir,
"utils")):
+ for f in files:
+ if f.endswith(".py"):
+ shutil.copy2(os.path.join(root, f),
os.path.join(layerpath, "oeqa/utils"))
+ else:
+ if oeqadir in mod.filename:
+ layerpath = os.path.join(exportpath, "extralayers",
get_layer(mod.filename))
+
+ try:
+ if oeqadir in mod.filename:
+ shutil.copy2(os.path.join(oeqadir, "__init__.py"),
os.path.join(layerpath, "oeqa"))
+ except IOError:
+ pass
+ try:
+ if oeqadir in mod.filename:
+ shutil.copy2(os.path.join(oeqadir, "runtime/__init__.py"),
os.path.join(layerpath, "oeqa/runtime"))
+ except IOError:
+ pass
# copy oeqa/utils/*.py
for root, dirs, files in os.walk(os.path.join(oeqadir, "utils")):
for f in files:
@@ -347,13 +348,19 @@ def exportTests(d,tc):
bb.utils.mkdirhier(os.path.join(exportpath, "conf/test"))
else:
bb.utils.mkdirhier(os.path.join(exportpath,
"extralayers/%s/conf/test" % os.path.basename(os.path.normpath(layer))))
+ layerpath = os.path.join(exportpath, "extralayers",
os.path.basename(os.path.normpath(layer)))
for root, dirs, files in os.walk(os.path.join(_oeqadir, "conf",
"test")):
for f in files:
shutil.copy2(os.path.join(root, f),
os.path.join(layerpath, "conf/test"))
#integrating binaries too
# creting needed directory structure
- arch = te.get_dest_folder(d.getVar("TUNE_FEATURES", True),
os.listdir(d.getVar("DEPLOY_DIR_RPM", True)))
+ try:
+ arch = te.get_dest_folder(d.getVar("TUNE_FEATURES", True),
os.listdir(d.getVar("DEPLOY_DIR_RPM", True)))
+ except OSError:
+ # Make a default folder
+ bb.utils.mkdirhier(os.path.join(d.getVar("DEPLOY_DIR_RPM", True),
"i586"))
+ arch = "i586"
bb.utils.mkdirhier(os.path.join(exportpath,"tar_files"))
bb.utils.mkdirhier(os.path.join(exportpath,"binaries", arch,
"packaged_binaries"))
bb.utils.mkdirhier(os.path.join(exportpath,"binaries", "native"))
diff --git a/meta/lib/oeqa/runexported.py b/meta/lib/oeqa/runexported.py
index 3a6bad7..2ce4922 100755
--- a/meta/lib/oeqa/runexported.py
+++ b/meta/lib/oeqa/runexported.py
@@ -24,7 +24,7 @@ import time
import argparse
import re
-from oeqa.utils.testsexport import get_dest_folder
+from oeqa.utils.testexport import get_dest_folder
try:
import simplejson as json
--
2.5.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
