Fix missing mountpoint directory in mount_image()

Remove redundant mkdirs from tct/odroid_prepare_flash_conf.sh

Change-Id: I6da51ef4b7e82debf66eea88570b7e997bf7855a
Signed-off-by: Aleksander Mistewicz <a.mistewicz@samsung.com>

diff --git a/tct/odroid_prepare_flash_conf.sh b/tct/odroid_prepare_flash_conf.sh
index 4452254..4995a6b 100755 (executable)
--- a/tct/odroid_prepare_flash_conf.sh
+++ b/tct/odroid_prepare_flash_conf.sh
@@ -46,10 +46,8 @@ IMAGE_MOUNTPOINT="/tmp/image_mounted_${SDMUX}"
 
 switch2testserver "${SDMUX}"
 
-mkdir "${IMAGE_UNPACKED}"
 unpack_image "${BOOT_IMAGE}" "${IMAGE}" "${IMAGE_UNPACKED}"
 
-mkdir "${IMAGE_MOUNTPOINT}"
 mount_image "${IMAGE_UNPACKED}/rootfs.img" "${IMAGE_MOUNTPOINT}"
 install_iserial "${SDMUX}" "${IMAGE_MOUNTPOINT}"
 unmount_image "${IMAGE_MOUNTPOINT}"

diff --git a/tct/prepare/prepare.sh b/tct/prepare/prepare.sh
index df79e1c..ccfc751 100755 (executable)
--- a/tct/prepare/prepare.sh
+++ b/tct/prepare/prepare.sh
@@ -52,8 +52,10 @@ unpack_image() {
 mount_image() {
     IMAGE="$1"
     MOUNTPOINT="$2"
+
     test -n "${IMAGE}" || die "Missing argument: image"
     test -n "${MOUNTPOINT}" || die "Missing argument: mountpoint"
+    test -d "${MOUNTPOINT}" || mkdir -p "${MOUNTPOINT}"
 
     sudo mount -o loop "${IMAGE}" "${MOUNTPOINT}"
 }