diff options
Diffstat (limited to 'meta/classes/testimage.bbclass')
-rw-r--r-- | 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 903849d9d4..86121e438d 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -53,11 +53,6 @@ def testimage_main(d): | |||
53 | 53 | ||
54 | testdir = d.getVar("TEST_LOG_DIR", True) | 54 | testdir = d.getVar("TEST_LOG_DIR", True) |
55 | bb.utils.mkdirhier(testdir) | 55 | bb.utils.mkdirhier(testdir) |
56 | sshlog = os.path.join(testdir, "ssh_target_log.%s" % d.getVar('DATETIME', True)) | ||
57 | sshloglink = os.path.join(testdir, "ssh_target_log") | ||
58 | if os.path.islink(sshloglink): | ||
59 | os.unlink(sshloglink) | ||
60 | os.symlink(sshlog, sshloglink) | ||
61 | 56 | ||
62 | # tests in TEST_SUITES become required tests | 57 | # tests in TEST_SUITES become required tests |
63 | # they won't be skipped even if they aren't suitable for a default image (like xorg for minimal) | 58 | # 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): | |||
103 | except ValueError: | 98 | except ValueError: |
104 | qemu.boottime = 500 | 99 | qemu.boottime = 500 |
105 | 100 | ||
101 | qemuloglink = os.path.join(testdir, "qemu_boot_log") | ||
102 | if os.path.islink(qemuloglink): | ||
103 | os.unlink(qemuloglink) | ||
104 | os.symlink(qemu.logfile, qemuloglink) | ||
105 | |||
106 | sshlog = os.path.join(testdir, "ssh_target_log.%s" % d.getVar('DATETIME', True)) | ||
107 | sshloglink = os.path.join(testdir, "ssh_target_log") | ||
108 | if os.path.islink(sshloglink): | ||
109 | os.unlink(sshloglink) | ||
110 | os.symlink(sshlog, sshloglink) | ||
111 | |||
112 | |||
106 | bb.note("DISPLAY value: %s" % qemu.display) | 113 | bb.note("DISPLAY value: %s" % qemu.display) |
107 | bb.note("rootfs file: %s" % rootfs) | 114 | bb.note("rootfs file: %s" % rootfs) |
108 | bb.note("Qemu logfile: %s" % qemu.logfile) | 115 | bb.note("Qemu log file: %s" % qemu.logfile) |
116 | bb.note("SSH log file: %s" % sshlog) | ||
109 | 117 | ||
110 | #catch exceptions when loading or running tests (mostly our own errors) | 118 | #catch exceptions when loading or running tests (mostly our own errors) |
111 | try: | 119 | try: |