From bc4b98bd4ce8fcf2bedc09d172893aa770f68df0 Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Thu, 8 Aug 2013 16:41:11 +0300 Subject: [PATCH] classes/testimage: create a link for qemu boot log The full name for the log is confusing when there are multiple files. Also move the ssh log path stuff where it's needed. (From OE-Core rev: 1dbef61a0776ec6c9ac9209442bb4c346e706d7d) Signed-off-by: Stefan Stanacar Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 903849d9d4..86121e438d 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -53,11 +53,6 @@ def testimage_main(d): testdir = d.getVar("TEST_LOG_DIR", True) bb.utils.mkdirhier(testdir) - sshlog = os.path.join(testdir, "ssh_target_log.%s" % d.getVar('DATETIME', True)) - sshloglink = os.path.join(testdir, "ssh_target_log") - if os.path.islink(sshloglink): - os.unlink(sshloglink) - os.symlink(sshlog, sshloglink) # tests in TEST_SUITES become required tests # they won't be skipped even if they aren't suitable for a default image (like xorg for minimal) @@ -103,9 +98,22 @@ def testimage_main(d): except ValueError: qemu.boottime = 500 + qemuloglink = os.path.join(testdir, "qemu_boot_log") + if os.path.islink(qemuloglink): + os.unlink(qemuloglink) + os.symlink(qemu.logfile, qemuloglink) + + sshlog = os.path.join(testdir, "ssh_target_log.%s" % d.getVar('DATETIME', True)) + sshloglink = os.path.join(testdir, "ssh_target_log") + if os.path.islink(sshloglink): + os.unlink(sshloglink) + os.symlink(sshlog, sshloglink) + + bb.note("DISPLAY value: %s" % qemu.display) bb.note("rootfs file: %s" % rootfs) - bb.note("Qemu logfile: %s" % qemu.logfile) + bb.note("Qemu log file: %s" % qemu.logfile) + bb.note("SSH log file: %s" % sshlog) #catch exceptions when loading or running tests (mostly our own errors) try: