summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/testsdk.bbclass10
-rw-r--r--meta/lib/oeqa/oetest.py12
-rw-r--r--meta/lib/oeqa/sdkext/__init__.py3
3 files changed, 23 insertions, 2 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index a0c50fe4a9..417510ce3d 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -114,7 +114,15 @@ def testsdkext_main(d):
114 bb.plain("Running SDK Compatibility tests ...") 114 bb.plain("Running SDK Compatibility tests ...")
115 run_test_context(SDKTestContext, d, testdir, tcname, pn) 115 run_test_context(SDKTestContext, d, testdir, tcname, pn)
116 finally: 116 finally:
117 bb.utils.remove(testdir, True) 117 pass
118
119 try:
120 bb.plain("Running Extensible SDK tests ...")
121 run_test_context(SDKExtTestContext, d, testdir, tcname, pn)
122 finally:
123 pass
124
125 bb.utils.remove(testdir, True)
118 126
119testsdkext_main[vardepsexclude] =+ "BB_ORIGENV" 127testsdkext_main[vardepsexclude] =+ "BB_ORIGENV"
120 128
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index 47ea3b259f..620617c4fb 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -19,6 +19,7 @@ except ImportError:
19import logging 19import logging
20 20
21import oeqa.runtime 21import oeqa.runtime
22import oeqa.sdkext
22from oeqa.utils.decorators import LogResults, gettag, getResults 23from oeqa.utils.decorators import LogResults, gettag, getResults
23 24
24logger = logging.getLogger("BitBake") 25logger = logging.getLogger("BitBake")
@@ -126,6 +127,9 @@ class oeSDKTest(oeTest):
126 def _run(self, cmd): 127 def _run(self, cmd):
127 return subprocess.check_output(". %s > /dev/null; %s;" % (self.tc.sdkenv, cmd), shell=True) 128 return subprocess.check_output(". %s > /dev/null; %s;" % (self.tc.sdkenv, cmd), shell=True)
128 129
130class oeSDKExtTest(oeSDKTest):
131 pass
132
129def getmodule(pos=2): 133def getmodule(pos=2):
130 # stack returns a list of tuples containg frame information 134 # stack returns a list of tuples containg frame information
131 # First element of the list the is current frame, caller is 1 135 # First element of the list the is current frame, caller is 1
@@ -400,7 +404,13 @@ class SDKTestContext(TestContext):
400 return [t for t in (self.d.getVar("TEST_SUITES_SDK", True) or \ 404 return [t for t in (self.d.getVar("TEST_SUITES_SDK", True) or \
401 "auto").split() if t != "auto"] 405 "auto").split() if t != "auto"]
402 406
403class SDKExtTestContext(TestContext): 407class SDKExtTestContext(SDKTestContext):
408 def __init__(self, d, sdktestdir, sdkenv):
409 super(SDKExtTestContext, self).__init__(d, sdktestdir, sdkenv)
410
411 self.sdkextfilesdir = os.path.join(os.path.dirname(os.path.abspath(
412 oeqa.sdkext.__file__)), "files")
413
404 def _get_test_namespace(self): 414 def _get_test_namespace(self):
405 return "sdkext" 415 return "sdkext"
406 416
diff --git a/meta/lib/oeqa/sdkext/__init__.py b/meta/lib/oeqa/sdkext/__init__.py
new file mode 100644
index 0000000000..4cf3fa76b6
--- /dev/null
+++ b/meta/lib/oeqa/sdkext/__init__.py
@@ -0,0 +1,3 @@
1# Enable other layers to have tests in the same named directory
2from pkgutil import extend_path
3__path__ = extend_path(__path__, __name__)