summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-28 11:50:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-29 10:58:54 +0100
commite794d099248645ae8835ebdf46b071e3b3633eeb (patch)
tree74bde535d863d72b196f81be694e93bd8ecdd616 /meta
parent1ef823481b0ae2fd1a2c45bf6b4c4bf37b253338 (diff)
downloadpoky-e794d099248645ae8835ebdf46b071e3b3633eeb.tar.gz
testimage: Improve sdk handling of TEST_SUITES
Currently TEST_SUITES is used for both target image and sdk versions which can be confusing. This introduces TEST_SUITES_SDK for the sdk version of the code so that the different test sets can be specified independently. (From OE-Core rev: ffd84177c68a6c86e654a9ba2512c299b40ec5e9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/testimage.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 1557675eec..4074ff7c4e 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -68,6 +68,8 @@ do_testsdk[lockfiles] += "${TESTIMAGELOCK}"
68 68
69def get_tests_list(d, type="runtime"): 69def get_tests_list(d, type="runtime"):
70 testsuites = d.getVar("TEST_SUITES", True).split() 70 testsuites = d.getVar("TEST_SUITES", True).split()
71 if type == "sdk":
72 testsuites = (d.getVar("TEST_SUITES_SDK", True) or "auto").split()
71 bbpath = d.getVar("BBPATH", True).split(':') 73 bbpath = d.getVar("BBPATH", True).split(':')
72 74
73 # This relies on lib/ under each directory in BBPATH being added to sys.path 75 # This relies on lib/ under each directory in BBPATH being added to sys.path
@@ -261,7 +263,7 @@ def testsdk_main(d):
261 # they won't be skipped even if they aren't suitable. 263 # they won't be skipped even if they aren't suitable.
262 # testslist is what we'll actually pass to the unittest loader 264 # testslist is what we'll actually pass to the unittest loader
263 testslist = get_tests_list(d, "sdk") 265 testslist = get_tests_list(d, "sdk")
264 testsrequired = [t for t in d.getVar("TEST_SUITES", True).split() if t != "auto"] 266 testsrequired = [t for t in (d.getVar("TEST_SUITES_SDK", True) or "auto").split() if t != "auto"]
265 267
266 sdktestdir = d.expand("${WORKDIR}/testimage-sdk/") 268 sdktestdir = d.expand("${WORKDIR}/testimage-sdk/")
267 bb.utils.remove(sdktestdir, True) 269 bb.utils.remove(sdktestdir, True)