summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/__init__.py0
-rw-r--r--meta/lib/oeqa/oetest.py5
-rw-r--r--meta/lib/oeqa/runtime/__init__.py3
3 files changed, 2 insertions, 6 deletions
diff --git a/meta/lib/oeqa/__init__.py b/meta/lib/oeqa/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/meta/lib/oeqa/__init__.py
+++ /dev/null
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index b4cf34b720..819f95987b 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -203,8 +203,7 @@ class TestContext(object):
203 self.testslist = self._get_tests_list(path, extrapath) 203 self.testslist = self._get_tests_list(path, extrapath)
204 self.testsrequired = self._get_test_suites_required() 204 self.testsrequired = self._get_test_suites_required()
205 205
206 self.filesdir = os.path.join(os.path.dirname(os.path.abspath( 206 self.filesdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "runtime/files")
207 oeqa.runtime.__file__)), "files")
208 self.imagefeatures = d.getVar("IMAGE_FEATURES", True).split() 207 self.imagefeatures = d.getVar("IMAGE_FEATURES", True).split()
209 self.distrofeatures = d.getVar("DISTRO_FEATURES", True).split() 208 self.distrofeatures = d.getVar("DISTRO_FEATURES", True).split()
210 209
@@ -460,7 +459,7 @@ class RuntimeTestContext(TestContext):
460 Returns the path of the JSON file for a module, empty if doesn't exitst. 459 Returns the path of the JSON file for a module, empty if doesn't exitst.
461 """ 460 """
462 461
463 module_file = module.filename 462 module_file = module.path
464 json_file = "%s.json" % module_file.rsplit(".", 1)[0] 463 json_file = "%s.json" % module_file.rsplit(".", 1)[0]
465 if os.path.isfile(module_file) and os.path.isfile(json_file): 464 if os.path.isfile(module_file) and os.path.isfile(json_file):
466 return json_file 465 return json_file
diff --git a/meta/lib/oeqa/runtime/__init__.py b/meta/lib/oeqa/runtime/__init__.py
deleted file mode 100644
index 4cf3fa76b6..0000000000
--- a/meta/lib/oeqa/runtime/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
1# Enable other layers to have tests in the same named directory
2from pkgutil import extend_path
3__path__ = extend_path(__path__, __name__)