[oe-commits] Stefan Stanacar : classes/testimage: create a link for qemu boot log
git at git.openembedded.org
git at git.openembedded.org
Tue Aug 13 21:55:57 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 1dbef61a0776ec6c9ac9209442bb4c346e706d7d
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1dbef61a0776ec6c9ac9209442bb4c346e706d7d
Author: Stefan Stanacar <stefanx.stanacar at intel.com>
Date: Thu Aug 8 16:41:11 2013 +0300
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.
Signed-off-by: Stefan Stanacar <stefanx.stanacar at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/testimage.bbclass | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 903849d..86121e4 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:
More information about the Openembedded-commits
mailing list