diff options
-rw-r--r-- | meta/classes/imagetest-qemu.bbclass | 1 | ||||
-rwxr-xr-x | scripts/qemuimage-testlib | 5 | ||||
-rwxr-xr-x | scripts/runqemu | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass index 25304de5ef..18798e025c 100644 --- a/meta/classes/imagetest-qemu.bbclass +++ b/meta/classes/imagetest-qemu.bbclass | |||
@@ -70,6 +70,7 @@ def qemuimagetest_main(d): | |||
70 | os.environ["DISPLAY"] = bb.data.getVar("DISPLAY", d, True) | 70 | os.environ["DISPLAY"] = bb.data.getVar("DISPLAY", d, True) |
71 | os.environ["COREBASE"] = bb.data.getVar("COREBASE", d, True) | 71 | os.environ["COREBASE"] = bb.data.getVar("COREBASE", d, True) |
72 | os.environ["TOPDIR"] = bb.data.getVar("TOPDIR", d, True) | 72 | os.environ["TOPDIR"] = bb.data.getVar("TOPDIR", d, True) |
73 | os.environ["TMPDIR"] = bb.data.getVar("TMPDIR", d, True) | ||
73 | os.environ["TEST_STATUS"] = bb.data.getVar("TEST_STATUS", d, True) | 74 | os.environ["TEST_STATUS"] = bb.data.getVar("TEST_STATUS", d, True) |
74 | os.environ["TARGET_IPSAVE"] = bb.data.getVar("TARGET_IPSAVE", d, True) | 75 | os.environ["TARGET_IPSAVE"] = bb.data.getVar("TARGET_IPSAVE", d, True) |
75 | os.environ["TEST_SERIALIZE"] = bb.data.getVar("TEST_SERIALIZE", d, True) | 76 | os.environ["TEST_SERIALIZE"] = bb.data.getVar("TEST_SERIALIZE", d, True) |
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib index c2dbf6027f..9ffaa7c785 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=$! |
diff --git a/scripts/runqemu b/scripts/runqemu index 74938f7404..364fa1cb14 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -55,8 +55,6 @@ SCRIPT_QEMU_OPT="" | |||
55 | SCRIPT_QEMU_EXTRA_OPT="" | 55 | SCRIPT_QEMU_EXTRA_OPT="" |
56 | SCRIPT_KERNEL_OPT="" | 56 | SCRIPT_KERNEL_OPT="" |
57 | 57 | ||
58 | TMPDIR="" | ||
59 | |||
60 | # Determine whether the file is a kernel or QEMU image, and set the | 58 | # Determine whether the file is a kernel or QEMU image, and set the |
61 | # appropriate variables | 59 | # appropriate variables |
62 | process_filename() { | 60 | process_filename() { |