diff options
| -rw-r--r-- | meta/classes/imagetest-qemu.bbclass | 1 | ||||
| -rwxr-xr-x | scripts/qemuimage-testlib | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass index ce20164d09..a8a45bf92b 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 6377c7f27a..a800f681f2 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 |