summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-03-26 12:43:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-27 17:28:01 +0000
commitbaba50e9313587916a0ce4dcceaaf0d8bc84e527 (patch)
treebb2298ef2695335d3a4c37113befb4fb4edfb73a
parentd76a3f534d2d65d9cc7d6dc02930518a3bd849b0 (diff)
downloadpoky-baba50e9313587916a0ce4dcceaaf0d8bc84e527.zip
poky-baba50e9313587916a0ce4dcceaaf0d8bc84e527.tar.gz
poky-baba50e9313587916a0ce4dcceaaf0d8bc84e527.tar.bz2
qemuimagetest: collect and print runqemu output
If runqemu (or qemu itself) fails we need to know why, so tee out to a log file and print it when we can't find the qemu process or determine its IP address. (From OE-Core rev: 3faa2d5bc993876f1f8b3ad806a0192efaa43e05) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/imagetest-qemu.bbclass1
-rwxr-xr-xscripts/qemuimage-testlib10
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index ce20164..a8a45bf 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -75,6 +75,7 @@ def qemuimagetest_main(d):
os.environ["TARGET_IPSAVE"] = d.getVar("TARGET_IPSAVE", True)
os.environ["TEST_SERIALIZE"] = d.getVar("TEST_SERIALIZE", True)
os.environ["SDK_NAME"] = d.getVar("SDK_NAME", True)
+ os.environ["RUNQEMU_LOGFILE"] = d.expand("${T}/log.runqemutest.%s" % os.getpid())
"""run Test Case"""
bb.note("Run %s test in scenario %s" % (case, scen))
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 6377c7f..a800f68 100755
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -408,8 +408,8 @@ Test_Create_Qemu()
export MACHINE=$QEMUARCH
# Create Qemu in localhost VNC Port 1
- echo "Running xterm -display ${DISPLAY} -e 'OE_TMPDIR=${OE_TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} || /bin/sleep 60' &"
- xterm -display ${DISPLAY} -e "OE_TMPDIR=${OE_TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} || /bin/sleep 60" &
+ echo "Running xterm -display ${DISPLAY} -e 'OE_TMPDIR=${OE_TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} | tee ${RUNQEMU_LOGFILE} || /bin/sleep 60' &"
+ xterm -display ${DISPLAY} -e "OE_TMPDIR=${OE_TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} | tee ${RUNQEMU_LOGFILE} || /bin/sleep 60" &
# Get the pid of the xterm processor, which will be used in Test_Kill_Qemu
XTERMPID=$!
@@ -436,6 +436,9 @@ Test_Create_Qemu()
Test_Info "No qemu process appeared to start, exiting"
ps axww -O ppid
Test_Info "Process list dumped for debugging purposes"
+ Test_Info "runqemu output log:"
+ cat ${RUNQEMU_LOGFILE}
+ echo
return 1
fi
@@ -446,6 +449,9 @@ Test_Create_Qemu()
Test_Info "There is no qemu process or qemu ip address found, return failed"
ps -wwf
ps axww -O ppid
+ Test_Info "runqemu output log:"
+ cat ${RUNQEMU_LOGFILE}
+ echo
return 1
fi