Add some API test and rewrite some parts.

[platform/upstream/cryptsetup.git] / tests / mode-test

diff --git a/tests/mode-test b/tests/mode-test
index f913699..9a2ad8b 100755 (executable)
--- a/tests/mode-test
+++ b/tests/mode-test
@@ -4,7 +4,6 @@
 #
 CRYPTSETUP=../src/cryptsetup
 DEV_NAME=dmc_test
-LOOPDEV=/dev/loop5
 HEADER_IMG=mode-test.img
 PASSWORD=3xrododenron
 
@@ -13,9 +12,11 @@ CIPHERS="aes twofish serpent"
 MODES="cbc lrw xts"
 IVMODES="null benbi plain plain64 essiv:sha256"
 
+LOOPDEV=$(losetup -f 2>/dev/null)
+
 dmremove() { # device
-       udevadm settle 2>/dev/null 2>&1
-       dmsetup remove $1 2>/dev/null 2>&1
+       udevadm settle >/dev/null 2>&1
+       dmsetup remove $1 >/dev/null 2>&1
 }
 
 cleanup() {
@@ -35,6 +36,12 @@ fail()
        exit 100
 }
 
+skip()
+{
+       [ -n "$1" ] && echo "$1"
+       exit 0
+}
+
 add_device() {
        dd if=/dev/zero of=$HEADER_IMG bs=1M count=6 >/dev/null 2>&1
        sync
@@ -44,7 +51,7 @@ add_device() {
 
 dmcrypt_check() # device outstring
 {
-       X=$(dmsetup table $1 2>/dev/null | cut -d' '  -f 4)
+       X=$(dmsetup table $1 2>/dev/null | sed 's/.*: //' | cut -d' '  -f 4)
        if [ $X = $2 ] ; then
                echo -n "[table OK]"
        else
@@ -72,7 +79,8 @@ dmcrypt_check_sum() # cipher device outstring
        dd if=/dev/zero of=/dev/mapper/$2 bs=1M count=6 >/dev/null 2>&1
        sync
        dmremove $2
-       echo $PASSWORD | $CRYPTSETUP create -c $1 -s 256 $2 /dev/mapper/$DEV_NAME >/dev/null 2>&1
+
+       echo $PASSWORD | $CRYPTSETUP create -h sha256 -c $1 -s 256 $2 /dev/mapper/$DEV_NAME >/dev/null 2>&1
        ret=$?
        VSUM=$(sha256sum /dev/mapper/$2 | cut -d' ' -f 1)
        if [ $ret -eq 0 -a "$VSUM" = "$EXPSUM" ] ; then
@@ -92,7 +100,7 @@ dmcrypt()
        [ -z "$OUT" ] && OUT=$1
        printf "%-25s" "$1"
 
-       echo $PASSWORD | $CRYPTSETUP create -c $1 -s 256 "$DEV_NAME"_"$1" /dev/mapper/$DEV_NAME >/dev/null 2>&1
+       echo $PASSWORD | $CRYPTSETUP create -h sha256 -c $1 -s 256 "$DEV_NAME"_"$1" /dev/mapper/$DEV_NAME >/dev/null 2>&1
        if [ $? -eq 0 ] ; then
                echo -n -e "PLAIN:"
                dmcrypt_check "$DEV_NAME"_"$1" $OUT
@@ -108,7 +116,7 @@ dmcrypt()
        fi
 
        # repeated device creation must return the same checksum
-       echo $PASSWORD | $CRYPTSETUP create -c $1 -s 256 "$DEV_NAME"_"$1" /dev/mapper/$DEV_NAME >/dev/null 2>&1
+       echo $PASSWORD | $CRYPTSETUP create -h sha256 -c $1 -s 256 "$DEV_NAME"_"$1" /dev/mapper/$DEV_NAME >/dev/null 2>&1
        if [ $? -eq 0 ] ; then
                echo -n -e " CHECKSUM:"
                dmcrypt_check_sum "$1" "$DEV_NAME"_"$1"
@@ -116,10 +124,8 @@ dmcrypt()
        echo
 }
 
-if [ $(id -u) != 0 ]; then
-       echo "WARNING: You must be root to run this test, test skipped."
-       exit 0
-fi
+[ $(id -u) != 0 ] && skip "WARNING: You must be root to run this test, test skipped."
+[ -z "$LOOPDEV" ] && skip "Cannot find free loop device, test skipped."
 
 add_device