diff options
Diffstat (limited to 'tests/i_e2image/script')
| -rw-r--r-- | tests/i_e2image/script | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tests/i_e2image/script b/tests/i_e2image/script index 9c6ae2af..adf59a46 100644 --- a/tests/i_e2image/script +++ b/tests/i_e2image/script @@ -1,4 +1,4 @@ -printf "Create/convert raw and qcow2 disk images: " +test_description="create/convert raw/qcow2 images" if test -x $E2IMAGE_EXE; then ORIG_IMAGES="image1024.orig image2048.orig image4096.orig" @@ -8,7 +8,7 @@ QCOW2_IMG=_image.qcow2 QCOW2_TO_RAW=_image.qcow2.raw OUT=$test_name.log MD5=$SRCDIR/$test_name/$test_name.md5 -MD5_TMP=$test_name.md5tmp +MD5_TMP=$test_name.md5.tmp rm -f $test_name/_image.* $MD5_TMP $OUT >/dev/null 2>&1 @@ -20,6 +20,7 @@ for i in $ORIG_IMAGES; do bunzip2 < $SRCDIR/$ORIG_IMG.bz2 > $i md5sum $i >> $MD5_TMP + rm -f $RAW_IMG echo "e2image -r $ORIG_IMG $RAW_IMG" $E2IMAGE -r $i $RAW_IMG md5sum $RAW_IMG >> $MD5_TMP @@ -28,6 +29,7 @@ for i in $ORIG_IMAGES; do $E2IMAGE -Q $i $QCOW2_IMG md5sum $QCOW2_IMG >> $MD5_TMP + rm -f $QCOW2_TO_RAW echo "e2image -r $QCOW2_IMG $QCOW2_TO_RAW" $E2IMAGE -r $i $QCOW2_TO_RAW md5sum $QCOW2_TO_RAW >> $MD5_TMP @@ -43,18 +45,15 @@ echo "" >> $OUT diff $MD5 $MD5_TMP >> $OUT 2>&1 if [ $? -eq 0 ]; then - echo "ok" + echo "$test_name: $test_description: ok" touch $test_name.ok - rm -f $test_name.failed else - rm -f $test_name.ok ln -f $test_name.log $test_name.failed - echo "failed" + echo "$test_name: $test_description: failed" fi rm -f _image.* $MD5_TMP >/dev/null 2>&1 else #if test -x $E2IMAGE_EXE; then - rm -f $test_name.ok $test_name.failed - echo "skipped" + echo "$test_name: $test_description: skipped" fi |