summaryrefslogtreecommitdiffstats
path: root/scripts/qemuimage-testlib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-09 17:14:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-09 17:39:26 (GMT)
commit32bb9c3184cd51c1407a5a51fc1153f54ceba20e (patch)
treef9b81e670e76e98fe757b3ff4cca2167a14da776 /scripts/qemuimage-testlib
parentb9386c6ec044cf682135c4423ca04f66d4000c59 (diff)
downloadpoky-32bb9c3184cd51c1407a5a51fc1153f54ceba20e.tar.gz
imagetest-qemu/runqueue: Since we no longer support BUILDDIR, use TMPDIR
Commit 993672fa2739794a6dd0dbd7bb232fa60522b897 removed the BUILDDIR support from runqueue which broke the imagetest-qemu integration. We now therefore need to set TMPDIR and pass this through the environment to ensure the runqueue script finds the right locations without running bitbake directly. This patch also adds a sleep to the qemu command in the error case so that this remains on the screen for a period of time so the user can see errors more easily. This change unbreaks automated testing failures on the autobuilder. (From OE-Core rev: de470333dbdeea444199340e4cd458c13fed6a5a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/qemuimage-testlib')
-rwxr-xr-xscripts/qemuimage-testlib5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index c2dbf60..9ffaa7c 100755
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -457,6 +457,7 @@ Test_Create_Qemu()
457 timeout=50 457 timeout=50
458 else 458 else
459 rm -rf $TEST_ROOTFS_IMAGE 459 rm -rf $TEST_ROOTFS_IMAGE
460 echo "Copying rootfs $ROOTFS_IMAGE to $TEST_ROOTFS_IMAGE"
460 $CP $ROOTFS_IMAGE $TEST_ROOTFS_IMAGE 461 $CP $ROOTFS_IMAGE $TEST_ROOTFS_IMAGE
461 if [ $? -ne 0 ]; then 462 if [ $? -ne 0 ]; then
462 Test_Info "Image ${ROOTFS_IMAGE} copy to ${TEST_ROOTFS_IMAGE} failed, return fail" 463 Test_Info "Image ${ROOTFS_IMAGE} copy to ${TEST_ROOTFS_IMAGE} failed, return fail"
@@ -466,8 +467,8 @@ Test_Create_Qemu()
466 export MACHINE=$QEMUARCH 467 export MACHINE=$QEMUARCH
467 468
468 # Create Qemu in localhost VNC Port 1 469 # Create Qemu in localhost VNC Port 1
469 echo "Running xterm -display ${DISPLAY} -e 'BUILDDIR=${TOPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE}' &" 470 echo "Running xterm -display ${DISPLAY} -e 'TMPDIR=${TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60' &"
470 xterm -display ${DISPLAY} -e "BUILDDIR=${TOPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE}" & 471 xterm -display ${DISPLAY} -e "TMPDIR=${TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60" &
471 472
472 # Get the pid of the xterm processor, which will be used in Test_Kill_Qemu 473 # Get the pid of the xterm processor, which will be used in Test_Kill_Qemu
473 PID=$! 474 PID=$!