sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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 <stefanx.stanacar@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Stefan Stanacar 2013-08-08 16:41:11 +03:00 committed by Richard Purdie
parent 32a36db2a8
commit bc4b98bd4c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meta/classes/testimage.bbclass
View File

@ -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: