diff options
Diffstat (limited to 'meta/classes/testimage.bbclass')
| -rw-r--r-- | meta/classes/testimage.bbclass | 11 |
1 files changed, 2 insertions, 9 deletions
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): | |||
| 195 | import oeqa.runtime | 195 | import oeqa.runtime |
| 196 | import time | 196 | import time |
| 197 | import signal | 197 | import signal |
| 198 | from oeqa.oetest import loadTests, runTests, \ | 198 | from oeqa.oetest import loadTests, runTests, ImageTestContext |
| 199 | get_test_suites, get_tests_list, ImageTestContext | ||
| 200 | from oeqa.targetcontrol import get_target_controller | 199 | from oeqa.targetcontrol import get_target_controller |
| 201 | from oeqa.utils.dump import get_host_dumper | 200 | from oeqa.utils.dump import get_host_dumper |
| 202 | 201 | ||
| @@ -207,12 +206,6 @@ def testimage_main(d): | |||
| 207 | bb.utils.remove(d.getVar("TEST_EXPORT_DIR", True), recurse=True) | 206 | bb.utils.remove(d.getVar("TEST_EXPORT_DIR", True), recurse=True) |
| 208 | bb.utils.mkdirhier(d.getVar("TEST_EXPORT_DIR", True)) | 207 | bb.utils.mkdirhier(d.getVar("TEST_EXPORT_DIR", True)) |
| 209 | 208 | ||
| 210 | # tests in TEST_SUITES become required tests | ||
| 211 | # they won't be skipped even if they aren't suitable for a image (like xorg for minimal) | ||
| 212 | # testslist is what we'll actually pass to the unittest loader | ||
| 213 | testslist = get_tests_list(get_test_suites(d), d.getVar("BBPATH", True).split(':')) | ||
| 214 | testsrequired = [t for t in d.getVar("TEST_SUITES", True).split() if t != "auto"] | ||
| 215 | |||
| 216 | # we need the host dumper in test context | 209 | # we need the host dumper in test context |
| 217 | host_dumper = get_host_dumper(d) | 210 | host_dumper = get_host_dumper(d) |
| 218 | 211 | ||
| @@ -220,7 +213,7 @@ def testimage_main(d): | |||
| 220 | target = get_target_controller(d) | 213 | target = get_target_controller(d) |
| 221 | 214 | ||
| 222 | # test context | 215 | # test context |
| 223 | tc = ImageTestContext(d, testslist, testsrequired, target, host_dumper) | 216 | tc = ImageTestContext(d, target, host_dumper) |
| 224 | 217 | ||
| 225 | # this is a dummy load of tests | 218 | # this is a dummy load of tests |
| 226 | # we are doing that to find compile errors in the tests themselves | 219 | # we are doing that to find compile errors in the tests themselves |
