From e794d099248645ae8835ebdf46b071e3b3633eeb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 28 Apr 2015 11:50:26 +0100 Subject: 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 --- meta/classes/testimage.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/classes/testimage.bbclass') 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}" def get_tests_list(d, type="runtime"): testsuites = d.getVar("TEST_SUITES", True).split() + if type == "sdk": + testsuites = (d.getVar("TEST_SUITES_SDK", True) or "auto").split() bbpath = d.getVar("BBPATH", True).split(':') # This relies on lib/ under each directory in BBPATH being added to sys.path @@ -261,7 +263,7 @@ def testsdk_main(d): # they won't be skipped even if they aren't suitable. # testslist is what we'll actually pass to the unittest loader testslist = get_tests_list(d, "sdk") - testsrequired = [t for t in d.getVar("TEST_SUITES", True).split() if t != "auto"] + testsrequired = [t for t in (d.getVar("TEST_SUITES_SDK", True) or "auto").split() if t != "auto"] sdktestdir = d.expand("${WORKDIR}/testimage-sdk/") bb.utils.remove(sdktestdir, True) -- cgit v1.2.3-54-g00ecf