mirror of
https://git.yoctoproject.org/poky
synced 2026-04-29 09:32:11 +02:00
248f6f01cf
* these cases were correctly respecting IMAGE_LINK_NAME in most tests
* the only exception was relatively wide glob for manifest:
"test-empty-image-*.manifest"
* and even wider glob for -dbg:
"*-dbg.rootfs.tar.bz2"
* replace them with the exact filename we expect for given image
* be aware that gzip won't accept the symlink in IMAGE_LINK_NAME causing:
2023-03-13 08:58:23,845 - oe-selftest - INFO - ... FAIL
2023-03-13 08:58:23,845 - oe-selftest - INFO - Traceback (most recent call last):
File "/OE/build/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py", line 124, in test_bmap
self.assertTrue(runCmd('gzip -t %s' % gzip_path))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/OE/build/poky/meta/lib/oeqa/utils/commands.py", line 214, in runCmd
raise AssertionError("Command '%s' returned non-zero exit status %d:\n%s" % (command, result.status, exc_output))
AssertionError: Command 'gzip -t /OE/build/poky/build/build-st-2023-03-12-todo-patch2/imagefeatures.ImageFeatures.test_bmap/build-st/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.ext4.bmap.gz' returned non-zero exit status 1:
gzip: skipping: /OE/build/poky/build/build-st-2023-03-12-todo-patch2/imagefeatures.ImageFeatures.test_bmap/build-st/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.ext4.bmap.gz is a symbolic link
* and "*-dbg.rootfs.tar.bz2" doesn't work if IMAGE_NAME_SUFFIX
is changed to anything else than ".rootfs" or moved into
IMAGE_LINK_NAME (like I plan in future changes where this will
need to be updated again).
Luckily we can use the symlink which currently doesn't have
IMAGE_NAME_SUFFIX nor the DATETIME, so we don't need to search
for it with glob, e.g. currently:
core-image-minimal-qemux86-64-dbg-20230313112546-dbg.rootfs.tar.bz2
core-image-minimal-qemux86-64-dbg.tar.bz2 -> core-image-minimal-qemux86-64-dbg-20230313112546-dbg.rootfs.tar.bz2
[YOCTO #12937]
(From OE-Core rev: 39285e981343930e41afe4eb8f2db675a85d54c2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>