diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/testimage-auto.bbclass | 23 | ||||
-rw-r--r-- | meta/classes/testimage.bbclass | 10 | ||||
-rw-r--r-- | meta/classes/testsdk.bbclass | 5 |
4 files changed, 14 insertions, 25 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index f056ca5970..8ef06c0fb0 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -13,7 +13,6 @@ IMGCLASSES += "${@['populate_sdk_base', 'populate_sdk_ext']['linux' in d.getVar( IMGCLASSES += "${@bb.utils.contains_any('IMAGE_FSTYPES', 'live iso hddimg', 'image-live', '', d)}" IMGCLASSES += "${@bb.utils.contains('IMAGE_FSTYPES', 'container', 'image-container', '', d)}" IMGCLASSES += "image_types_wic" -IMGCLASSES += "${@oe.utils.conditional('TEST_IMAGE', '1', 'testimage-auto', '', d)}" IMGCLASSES += "rootfs-postcommands" inherit ${IMGCLASSES} diff --git a/meta/classes/testimage-auto.bbclass b/meta/classes/testimage-auto.bbclass deleted file mode 100644 index e0a22b773c..0000000000 --- a/meta/classes/testimage-auto.bbclass +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2013 Intel Corporation -# -# Released under the MIT license (see COPYING.MIT) - - -# Run tests automatically on an image after the image is constructed -# (as opposed to testimage.bbclass alone where tests must be called -# manually using bitbake -c testimage <image>). -# -# NOTE: to use this class, simply set TEST_IMAGE = "1" - no need to -# inherit it since that will be done in image.bbclass when this variable -# has been set. -# -# See testimage.bbclass for the test implementation. - -inherit testimage - -python do_testimage_auto() { - testimage_main(d) -} -addtask testimage_auto before do_build after do_image_complete -do_testimage_auto[depends] += "${TESTIMAGEDEPENDS}" -do_testimage_auto[lockfiles] += "${TESTIMAGELOCK}" diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index c17a7c604b..eb2181309e 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -10,6 +10,11 @@ # - first add IMAGE_CLASSES += "testimage" in local.conf # - build a qemu core-image-sato # - then bitbake core-image-sato -c testimage. That will run a standard suite of tests. +# +# The tests can be run automatically each time an image is built if you set +# TESTIMAGE_AUTO = "1" + +TESTIMAGE_AUTO ??= "0" # You can set (or append to) TEST_SUITES in local.conf to select the tests # which you want to run for your target. @@ -382,4 +387,7 @@ def package_extraction(d, test_suites): testimage_main[vardepsexclude] += "BB_ORIGENV DATETIME" -inherit testsdk +python () { + if oe.types.boolean(d.getVar("TESTIMAGE_AUTO") or "False"): + bb.build.addtask("testimage", "do_build", "do_image_complete", d) +} diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 2e43343643..dba6b0708a 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass @@ -194,3 +194,8 @@ python do_testsdkext() { addtask testsdkext do_testsdkext[nostamp] = "1" +python () { + if oe.types.boolean(d.getVar("TESTIMAGE_AUTO") or "False"): + bb.build.addtask("testsdk", None, "do_populate_sdk", d) + bb.build.addtask("testsdkext", None, "do_populate_sdk_ext", d) +} |