Add Yardstick TC044 TEST CASE

[yardstick.git] / tools / yardstick-img-modify

diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify
index 3306562..13d4360 100755 (executable)
--- a/tools/yardstick-img-modify
+++ b/tools/yardstick-img-modify
@@ -57,11 +57,11 @@ download() {
     cd $workspace
     rm -f MD5SUMS # always download the checksum file to a detect stale image
     wget $md5sums_url
-    test -e $filename || wget -nc $image_url
+    test -e $filename || wget -nc --progress=dot:giga $image_url
     grep $filename MD5SUMS | md5sum -c ||
     if [ $? -ne 0 ]; then
         rm $filename
-        wget -nc $image_url
+        wget -nc --progress=dot:giga $image_url
         grep $filename MD5SUMS | md5sum -c
     fi
     qemu-img convert $filename $raw_imgfile
@@ -78,7 +78,12 @@ setup() {
 
     loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ')
 
-    kpartx -a $raw_imgfile
+    kpartx -av $raw_imgfile
+
+    # for trouble shooting
+    sleep 2
+    dmsetup ls
+    fdisk -l /dev/${loopdevice:0:5} || true
 
     mount /dev/mapper/$loopdevice $mountdir
     mount -t proc none $mountdir/proc
@@ -104,6 +109,10 @@ modify() {
     umount $mountdir
 
     qemu-img convert -c -o compat=0.10 -O qcow2 $raw_imgfile $imgfile
+
+    if dmsetup table | grep $loopdevice; then
+       dmsetup clear $loopdevice || true
+    fi
 }
 
 # cleanup (umount) the image
@@ -112,7 +121,7 @@ cleanup() {
     mount | grep $mountdir/proc && umount $mountdir/proc
     mount | grep $mountdir && umount $mountdir
     if [ -f $raw_imgfile ]; then
-        kpartx -d $raw_imgfile || true
+        kpartx -dv $raw_imgfile || true
     fi
     rm -f $raw_imgfile
     rm -rf $mountdir
@@ -129,6 +138,8 @@ error_trap()
         exitcode=$rc
     fi
 
+    dmesg -T | tail -50
+
     cleanup
 
     echo "Image build failed with $exitcode"