summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2016-07-13 11:47:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 11:08:16 +0100
commit129c2b4589710aa24e23108f2728f1625b72cb06 (patch)
tree77128f354108c9d383a62c1aab5190a763e3a288
parent665a0f93bde0d61e0c7ceab072ca3f1f22b2f700 (diff)
downloadopenembedded-core-contrib-129c2b4589710aa24e23108f2728f1625b72cb06.tar.gz
openembedded-core-contrib-129c2b4589710aa24e23108f2728f1625b72cb06.tar.bz2
openembedded-core-contrib-129c2b4589710aa24e23108f2728f1625b72cb06.zip
oetest.py: Fix problem when there is more than one json file for package extraction
This allow to have more than one test to have json file in order to install packages in the DUT without using a package manager. [YOCTO #9926] Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/lib/oeqa/oetest.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index 4a740fb53f..e63ca56165 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -441,12 +441,9 @@ class RuntimeTestContext(TestContext):
def extract_packages(self):
"""
- Find and extract packages that will be needed during runtime.
+ Find packages that will be needed during runtime.
"""
- needed_packages = {}
- extracted_path = self.d.getVar("TEST_EXTRACTED_DIR", True)
- packaged_path = self.d.getVar("TEST_PACKAGED_DIR", True)
modules = self.getTestModules()
bbpaths = self.d.getVar("BBPATH", True).split(":")
@@ -454,6 +451,15 @@ class RuntimeTestContext(TestContext):
json_file = self._getJsonFile(module)
if json_file:
needed_packages = self._getNeededPackages(json_file)
+ self._perform_package_extraction(needed_packages)
+
+ def _perform_package_extraction(self, needed_packages):
+ """
+ Extract packages that will be needed during runtime.
+ """
+
+ extracted_path = self.d.getVar("TEST_EXTRACTED_DIR", True)
+ packaged_path = self.d.getVar("TEST_PACKAGED_DIR", True)
for key,value in needed_packages.items():
packages = ()