diff options
author | Ross Burton <ross.burton@arm.com> | 2022-11-09 19:31:35 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-11 13:43:40 +0000 |
commit | c3ad78032870f0f30ac8f85e220f7a0f768715cc (patch) | |
tree | bd91f3479209bcf98ca89a34994a361ab72bf5e4 | |
parent | 33b4cd0c00618fad170db13a25f96de9bb1c5863 (diff) | |
download | poky-c3ad78032870f0f30ac8f85e220f7a0f768715cc.tar.gz |
classes/testexport: move to classes-recipe
This class should be in classes-recipe as, like testimage, it is specific
to image recipes.
This also solves a regression where simply IMAGE_CLASSES += "testexport"
doesn't work if testimage isn't already in IMAGE_CLASSES. The testexport
class adds testimage to IMAGE_CLASSES, but by this point it's too late.
Now that the class can only be inherited via IMAGE_CLASSES, we can
simply inherit testimage directly.
(From OE-Core rev: 87fcee9fed915ff3af528b976d7d44737f9f1a95)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes-recipe/testexport.bbclass (renamed from meta/classes/testexport.bbclass) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/testexport.bbclass b/meta/classes-recipe/testexport.bbclass index f7c5242dc5..0f0c56107f 100644 --- a/meta/classes/testexport.bbclass +++ b/meta/classes-recipe/testexport.bbclass | |||
@@ -7,12 +7,14 @@ | |||
7 | # To use it add testexport to global inherit and call your target image with -c testexport | 7 | # To use it add testexport to global inherit and call your target image with -c testexport |
8 | # You can try it out like this: | 8 | # You can try it out like this: |
9 | # - First build an image. i.e. core-image-sato | 9 | # - First build an image. i.e. core-image-sato |
10 | # - Add INHERIT += "testexport" in local.conf | 10 | # - Add IMAGE_CLASSES += "testexport" in local.conf |
11 | # - Then bitbake core-image-sato -c testexport. That will generate the directory structure | 11 | # - Then bitbake core-image-sato -c testexport. That will generate the directory structure |
12 | # to execute the runtime tests using runexported.py. | 12 | # to execute the runtime tests using runexported.py. |
13 | # | 13 | # |
14 | # For more information on TEST_SUITES check testimage class. | 14 | # For more information on TEST_SUITES check testimage class. |
15 | 15 | ||
16 | inherit testimage | ||
17 | |||
16 | TEST_LOG_DIR ?= "${WORKDIR}/testexport" | 18 | TEST_LOG_DIR ?= "${WORKDIR}/testexport" |
17 | TEST_EXPORT_DIR ?= "${TMPDIR}/testexport/${PN}" | 19 | TEST_EXPORT_DIR ?= "${TMPDIR}/testexport/${PN}" |
18 | TEST_EXPORT_PACKAGED_DIR ?= "packages/packaged" | 20 | TEST_EXPORT_PACKAGED_DIR ?= "packages/packaged" |
@@ -176,5 +178,3 @@ def testexport_create_tarball(d, tar_name, src_dir): | |||
176 | tar.add(base_name) | 178 | tar.add(base_name) |
177 | tar.close() | 179 | tar.close() |
178 | os.chdir(current_dir) | 180 | os.chdir(current_dir) |
179 | |||
180 | IMAGE_CLASSES += "testimage" | ||