Bugfix: yardstick-image built without test tools

JIRA: YARDSTICK-593

The yardstick-image now built dosen't have test tools in it.
This patch aims to fix this issus.

Change-Id: I9863a933106236835c16e21f84aa107ffd554df7
Signed-off-by: JingLu5 <lvjing5@huawei.com>
(cherry picked from commit bd90c394fe223c5d465d70fb24076ef1d9258c91)

diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify
index da8e1c9..b4f632b 100755 (executable)
--- a/tools/yardstick-img-modify
+++ b/tools/yardstick-img-modify
@@ -109,13 +109,9 @@ setup() {
     fi
     mkdir -p $mountdir
 
-    #kpartx fails with image paths longer than 63 characters
-    #try shortest relative path to image as temporary workaround
-    cd ${workspace}
-    loopdevice=$(kpartx -l $raw_imgfile_basename | head -1 | cut -f1 -d ' ')
+    loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ')
 
-    kpartx -av $raw_imgfile_basename
-    cd -
+    kpartx -av $raw_imgfile
 
     if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
         e2fsck -p -f /dev/mapper/$loopdevice