From 552285688441330440bd1bc138aeaea87549024a Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Sat, 30 Jan 2016 11:55:39 -0600 Subject: testimage/testsdk: Move get test suites routine inside TestContext. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to provide better abstraction move functions to get the test suite inside the TestContext. Signed-off-by: Aníbal Limón Signed-off-by: Ross Burton --- meta/classes/testimage.bbclass | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'meta/classes/testimage.bbclass') diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index bdd6c9de6f..7f9c918273 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -195,8 +195,7 @@ def testimage_main(d): import oeqa.runtime import time import signal - from oeqa.oetest import loadTests, runTests, \ - get_test_suites, get_tests_list, ImageTestContext + from oeqa.oetest import loadTests, runTests, ImageTestContext from oeqa.targetcontrol import get_target_controller from oeqa.utils.dump import get_host_dumper @@ -207,12 +206,6 @@ def testimage_main(d): bb.utils.remove(d.getVar("TEST_EXPORT_DIR", True), recurse=True) bb.utils.mkdirhier(d.getVar("TEST_EXPORT_DIR", True)) - # tests in TEST_SUITES become required tests - # they won't be skipped even if they aren't suitable for a image (like xorg for minimal) - # testslist is what we'll actually pass to the unittest loader - testslist = get_tests_list(get_test_suites(d), d.getVar("BBPATH", True).split(':')) - testsrequired = [t for t in d.getVar("TEST_SUITES", True).split() if t != "auto"] - # we need the host dumper in test context host_dumper = get_host_dumper(d) @@ -220,7 +213,7 @@ def testimage_main(d): target = get_target_controller(d) # test context - tc = ImageTestContext(d, testslist, testsrequired, target, host_dumper) + tc = ImageTestContext(d, target, host_dumper) # this is a dummy load of tests # we are doing that to find compile errors in the tests themselves -- cgit 1.2.3-korg