From: Peter Tatrai <[email protected]> When qemu test runs only produce suffixed bootlog variants, the base bootlog path may not exist. os.symlink() creates a dangling symlink in the oeqa result log directory.
Avoid advertising a boot log in the collected test results when that path does not exist. Guard the symlink creation and log a note instead. This is a partial backport of master commit 7a6596925cb0eb8dd48a0362a51875cdd60152bc. Only the symlink guard is picked here; the bootlog variant globbing from master is not applicable to scarthgap. Signed-off-by: Peter Tatrai <[email protected]> --- meta/classes-recipe/testimage.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index 33b1c13f9d..744de5d7de 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -395,7 +395,10 @@ def testimage_main(d): # Copy additional logs to tmp/log/oeqa so it's easier to find them targetdir = os.path.join(get_json_result_dir(d), d.getVar("PN")) os.makedirs(targetdir, exist_ok=True) - os.symlink(bootlog, os.path.join(targetdir, os.path.basename(bootlog))) + if os.path.exists(bootlog): + os.symlink(bootlog, os.path.join(targetdir, os.path.basename(bootlog))) + else: + bb.note("testimage: boot log not found at %s" % bootlog) os.symlink(d.getVar("BB_LOGFILE"), os.path.join(targetdir, os.path.basename(d.getVar("BB_LOGFILE") + "." + d.getVar('DATETIME')))) if not results or not complete: -- 2.39.5
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#245789): https://lists.openembedded.org/g/openembedded-core/message/245789 Mute This Topic: https://lists.openembedded.org/mt/121246621/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
