summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-07-10 14:33:32 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-16 10:04:15 +0100
commit9c4a02b6c6dd9c450791bde3e9acb61b85244fe1 (patch)
tree347e4172e77b3c525868cf373f5567ae43f1ee05 /meta/classes
parent1552f33a3e3daca1730e9fc781e51caf05e1c692 (diff)
downloadpoky-9c4a02b6c6dd9c450791bde3e9acb61b85244fe1.tar.gz
testimage.bbclass, lib/oeqa/utils/qemurunner.py: make boot timeout configurable and increase it
On a loaded host (such as an AB setup where multiple builds run) the 200 seconds timeout might not be enough to reach the login prompt. Also make it configurable so we can set it from local.conf/auto.conf (From OE-Core rev: e828571683333e6f18ed56a84e114b5e54975bc7) 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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/testimage.bbclass6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 35c6811c89..f66f514904 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -7,6 +7,8 @@ DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "ping ssh connman rpm smart gcc xor
7 7
8TEST_SUITES ?= "${DEFAULT_TEST_SUITES}" 8TEST_SUITES ?= "${DEFAULT_TEST_SUITES}"
9 9
10TEST_QEMUBOOT_TIMEOUT ?= "500"
11
10python do_testimage() { 12python do_testimage() {
11 testimage_main(d) 13 testimage_main(d)
12} 14}
@@ -65,6 +67,10 @@ def testimage_main(d):
65 qemu.tmpdir = d.getVar("TMPDIR", True) 67 qemu.tmpdir = d.getVar("TMPDIR", True)
66 qemu.display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True) 68 qemu.display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True)
67 qemu.logfile = os.path.join(testdir, "qemu_boot_log.%s" % d.getVar('DATETIME', True)) 69 qemu.logfile = os.path.join(testdir, "qemu_boot_log.%s" % d.getVar('DATETIME', True))
70 try:
71 qemu.boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT", True))
72 except ValueError:
73 qemu.boottime = 500
68 74
69 bb.note("DISPLAY value: %s" % qemu.display) 75 bb.note("DISPLAY value: %s" % qemu.display)
70 bb.note("rootfs file: %s" % rootfs) 76 bb.note("rootfs file: %s" % rootfs)