From e1454aa6bbbb909907233e1f9903ef22bbf646a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Sun, 5 Oct 2014 17:35:33 +0200
Subject: [PATCH] clean the test repository properly in case there are
 directories

---
 tests/run.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/run.sh b/tests/run.sh
index 5df7789..6e0a6f2 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -46,30 +46,30 @@ umount ${SETUP_DIR}
 
 # Prepare the test source key
 mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_VFAT_NORM} ${SETUP_DIR}
-cp content_img_vfat_norm/* ${SETUP_DIR}
+cp -rf content_img_vfat_norm/* ${SETUP_DIR}
 umount ${SETUP_DIR}
 # Prepare the test source key (with partitions)
 mount -o loop,offset=${OFFSET_VFAT_PART1} ${IMAGE_VFAT_PART} ${SETUP_DIR}
-cp content_img_vfat_part1/* ${SETUP_DIR}
+cp -rf content_img_vfat_part1/* ${SETUP_DIR}
 umount ${SETUP_DIR}
 mount -o loop,offset=${OFFSET_VFAT_PART2} ${IMAGE_VFAT_PART} ${SETUP_DIR}
-cp content_img_vfat_part2/* ${SETUP_DIR}
+cp -rf content_img_vfat_part2/* ${SETUP_DIR}
 umount ${SETUP_DIR}
 # Prepare the test source key (NTFS)
 mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_NTFS_NORM} ${SETUP_DIR}
-cp content_img_vfat_norm/* ${SETUP_DIR}
+cp -rf content_img_vfat_norm/* ${SETUP_DIR}
 umount ${SETUP_DIR}
 # Prepare the test source key (EXT2)
 mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT2} ${SETUP_DIR}
-cp content_img_vfat_norm/* ${SETUP_DIR}
+cp -rf content_img_vfat_norm/* ${SETUP_DIR}
 umount ${SETUP_DIR}
 # Prepare the test source key (EXT3)
 mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT3} ${SETUP_DIR}
-cp content_img_vfat_norm/* ${SETUP_DIR}
+cp -rf content_img_vfat_norm/* ${SETUP_DIR}
 umount ${SETUP_DIR}
 # Prepare the test source key (EXT4)
 mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT4} ${SETUP_DIR}
-cp content_img_vfat_norm/* ${SETUP_DIR}
+cp -rf content_img_vfat_norm/* ${SETUP_DIR}
 umount ${SETUP_DIR}
 
 ./run.exp ${IMAGE} ${IMAGE_VFAT_NORM} ${IMAGE_DEST}