diff options
Diffstat (limited to 'meta/classes/testsdk.bbclass')
| -rw-r--r-- | meta/classes/testsdk.bbclass | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 06e7a77398..47bad29096 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass | |||
| @@ -13,18 +13,11 @@ def testsdk_main(d): | |||
| 13 | import oeqa.sdk | 13 | import oeqa.sdk |
| 14 | import time | 14 | import time |
| 15 | import subprocess | 15 | import subprocess |
| 16 | from oeqa.oetest import loadTests, runTests, \ | 16 | from oeqa.oetest import loadTests, runTests, SDKTestContext |
| 17 | get_test_suites, get_tests_list, SDKTestContext | ||
| 18 | 17 | ||
| 19 | pn = d.getVar("PN", True) | 18 | pn = d.getVar("PN", True) |
| 20 | bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR", True)) | 19 | bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR", True)) |
| 21 | 20 | ||
| 22 | # tests in TEST_SUITES become required tests | ||
| 23 | # they won't be skipped even if they aren't suitable. | ||
| 24 | # testslist is what we'll actually pass to the unittest loader | ||
| 25 | testslist = get_tests_list(get_test_suites(d, "sdk"), d.getVar("BBPATH", True).split(':'), "sdk") | ||
| 26 | testsrequired = [t for t in (d.getVar("TEST_SUITES_SDK", True) or "auto").split() if t != "auto"] | ||
| 27 | |||
| 28 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh") | 21 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh") |
| 29 | if not os.path.exists(tcname): | 22 | if not os.path.exists(tcname): |
| 30 | bb.fatal("The toolchain is not built. Build it before running the tests: 'bitbake <image> -c populate_sdk' .") | 23 | bb.fatal("The toolchain is not built. Build it before running the tests: 'bitbake <image> -c populate_sdk' .") |
| @@ -41,7 +34,7 @@ def testsdk_main(d): | |||
| 41 | targets = glob.glob(d.expand(sdktestdir + "/tc/environment-setup-*")) | 34 | targets = glob.glob(d.expand(sdktestdir + "/tc/environment-setup-*")) |
| 42 | for sdkenv in targets: | 35 | for sdkenv in targets: |
| 43 | bb.plain("Testing %s" % sdkenv) | 36 | bb.plain("Testing %s" % sdkenv) |
| 44 | tc = SDKTestContext(d, testslist, testsrequired, sdktestdir, sdkenv) | 37 | tc = SDKTestContext(d, sdktestdir, sdkenv) |
| 45 | 38 | ||
| 46 | # this is a dummy load of tests | 39 | # this is a dummy load of tests |
| 47 | # we are doing that to find compile errors in the tests themselves | 40 | # we are doing that to find compile errors in the tests themselves |
| @@ -94,14 +87,6 @@ def testsdkext_main(d): | |||
| 94 | pn = d.getVar("PN", True) | 87 | pn = d.getVar("PN", True) |
| 95 | bb.utils.mkdirhier(d.getVar("TEST_LOG_SDKEXT_DIR", True)) | 88 | bb.utils.mkdirhier(d.getVar("TEST_LOG_SDKEXT_DIR", True)) |
| 96 | 89 | ||
| 97 | # tests in TEST_SUITES become required tests | ||
| 98 | # they won't be skipped even if they aren't suitable. | ||
| 99 | # testslist is what we'll actually pass to the unittest loader | ||
| 100 | testslist = get_tests_list(get_test_suites(d, "sdkext"), | ||
| 101 | d.getVar("BBPATH", True).split(':'), "sdkext") | ||
| 102 | testsrequired = [t for t in (d.getVar("TEST_SUITES_SDKEXT", True) or \ | ||
| 103 | "auto").split() if t != "auto"] | ||
| 104 | |||
| 105 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh") | 90 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh") |
| 106 | if not os.path.exists(tcname): | 91 | if not os.path.exists(tcname): |
| 107 | bb.fatal("The toolchain ext is not built. Build it before running the" \ | 92 | bb.fatal("The toolchain ext is not built. Build it before running the" \ |
