Fix deactivation of device when failed underlying node disappeared

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

diff --git a/tests/mode-test b/tests/mode-test
index a94876d..3801718 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
@@ -53,7 +60,7 @@ dmcrypt_check() # device outstring
                fail
        fi
 
-       X=$($CRYPTSETUP status $1 | grep cipher | sed s/\.\*cipher:\\s*//)
+       X=$($CRYPTSETUP status $1 | grep cipher: | sed s/\.\*cipher:\\s*//)
        if [ $X = $2 ] ; then
                echo -n "[status OK]"
        else
@@ -117,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
 
@@ -128,6 +133,11 @@ add_device
 dmcrypt aes aes-cbc-plain
 dmcrypt aes-plain aes-cbc-plain
 
+# empty cipher
+dmcrypt null cipher_null-ecb
+dmcrypt cipher_null cipher_null-cbc-plain
+dmcrypt cipher_null-ecb
+
 # codebook doesn't support IV at all
 for cipher in $CIPHERS ; do
        dmcrypt "$cipher-ecb"