diff options
| author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2013-05-10 19:06:26 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-12 08:29:29 +0100 |
| commit | 95b7cafafcaa4dda7328632475003f5778ab95bd (patch) | |
| tree | a038ab9d371599e349151cf18ec689465b88f3d7 /scripts | |
| parent | 8fbf21365fbfab9e3cd36c4eab86fe03efa04e8e (diff) | |
| download | openembedded-core-95b7cafafcaa4dda7328632475003f5778ab95bd.tar.gz openembedded-core-95b7cafafcaa4dda7328632475003f5778ab95bd.tar.bz2 openembedded-core-95b7cafafcaa4dda7328632475003f5778ab95bd.zip | |
imagetest-qemu.bbclass, qemuimage-testlib: add support for more FSTYPES
qemuimage-testlib hardcodes ext3 as fs type. This adds support for more
images types which are supported by runqemu: ext[234]/jffs2/btrfs.
I've skipped (for now) vmdk (which qemu can boot) because:
- we don't have network on images without connman because of the way
runqemu starts vmdk images (can't pass kernel args for network config)
- qemuimage-testlib-pythonhelper relies on '192.168' being in the output of
ps to return the pid
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/qemuimage-testlib | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib index 051fee806c..622c1ce438 100755 --- a/scripts/qemuimage-testlib +++ b/scripts/qemuimage-testlib @@ -14,8 +14,6 @@ # Version 2. # -TYPE="ext3" - # The folder to hold all scripts running on targets TOOLS="$COREBASE/scripts/qemuimage-tests/tools" @@ -306,18 +304,18 @@ Test_Find_Image() extension="" rootfs="" - while getopts "l:k:a:t:" Option + while getopts "l:k:a:t:e:" Option do case $Option in l) where="$OPTARG" ;; k) kernel="$OPTARG" - extension="bin" ;; a) arch="$OPTARG" ;; t) target="$OPTARG" - extension="ext3" + ;; + e) extension="$OPTARG" ;; *) echo "invalid option: -$Option" && return 1 ;; @@ -396,11 +394,11 @@ Test_Create_Qemu() fi if [ "$QEMUARCH" = "qemux86" -o "$QEMUARCH" = "qemux86-64" ]; then - KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k bzImage -a ${QEMUARCH}) + KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k bzImage -a ${QEMUARCH} -e "bin") elif [ "$QEMUARCH" = "qemuarm" -o "$QEMUARCH" = "spitz" -o "$QEMUARCH" = "borzoi" -o "$QEMUARCH" = "akita" -o "$QEMUARCH" = "nokia800" ]; then KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k zImage -a ${QEMUARCH}) elif [ "$QEMUARCH" = "qemumips" -o "$QEMUARCH" = "qemuppc" ]; then - KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k vmlinux -a ${QEMUARCH}) + KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k vmlinux -a ${QEMUARCH} -e "bin") fi # If there is no kernel image found, return failed directly @@ -409,7 +407,8 @@ Test_Create_Qemu() return 1 fi - ROOTFS_IMAGE=$(Test_Find_Image -l ${DEPLOY_DIR}/images -t ${QEMUTARGET} -a ${QEMUARCH}) + Test_Info "rootfs image extension selected: $ROOTFS_EXT" + ROOTFS_IMAGE=$(Test_Find_Image -l ${DEPLOY_DIR}/images -t ${QEMUTARGET} -a ${QEMUARCH} -e "$ROOTFS_EXT") # If there is no rootfs image found, return failed directly if [ $? -eq 1 ]; then @@ -417,7 +416,7 @@ Test_Create_Qemu() return 1 fi - TEST_ROOTFS_IMAGE="${TEST_TMP}/${QEMUTARGET}-${QEMUARCH}-test.ext3" + TEST_ROOTFS_IMAGE="${TEST_TMP}/${QEMUTARGET}-${QEMUARCH}-test.${ROOTFS_EXT}" CP=`which cp` @@ -751,4 +750,4 @@ Test_Display_Syslog() echo "System logs:" cat $tmplog rm -f $tmplog -}
\ No newline at end of file +} |