diff --git a/tests/compat-test2 b/tests/compat-test2 index 35ee35c3..c556e593 100755 --- a/tests/compat-test2 +++ b/tests/compat-test2 @@ -184,6 +184,7 @@ dm_crypt_capi_support() VER_MAJ=$(echo $VER_STR | cut -f 1 -d.) VER_MIN=$(echo $VER_STR | cut -f 2 -d.) + [ $VER_MAJ -gt 1 ] && return 0 if [ $VER_MIN -ge 16 ]; then return 0 fi @@ -239,6 +240,7 @@ dm_crypt_sector_size_support() VER_MIN=$(echo $VER_STR | cut -f 2 -d.) VER_PTC=$(echo $VER_STR | cut -f 3 -d.) + [ $VER_MAJ -gt 1 ] && return 0 if [ $VER_MIN -ge 17 -o \( $VER_MIN -eq 14 -a $VER_PTC -ge 5 \) ]; then return 0 fi diff --git a/tests/integrity-compat-test b/tests/integrity-compat-test index ef02e106..8f678982 100755 --- a/tests/integrity-compat-test +++ b/tests/integrity-compat-test @@ -61,6 +61,15 @@ dm_integrity_features() VER_PTC=$(echo $VER_STR | cut -f 3 -d.) [ $VER_MAJ -lt 1 ] && return + [ $VER_MAJ -gt 1 ] && { + DM_INTEGRITY_META=1 + DM_INTEGRITY_RECALC=1 + DM_INTEGRITY_BITMAP=1 + DM_INTEGRITY_RESIZE_SUPPORTED=1 + DM_INTEGRITY_HMAC_FIX=1 + DM_INTEGRITY_RESET=1 + return + } [ $VER_MIN -gt 1 ] && { DM_INTEGRITY_META=1 DM_INTEGRITY_RECALC=1 diff --git a/tests/mode-test b/tests/mode-test index 09586a4e..fa483e5f 100755 --- a/tests/mode-test +++ b/tests/mode-test @@ -64,6 +64,7 @@ dm_crypt_capi_support() VER_MIN=$(echo $VER_STR | cut -f 2 -d.) VER_PTC=$(echo $VER_STR | cut -f 3 -d.) + [ $VER_MAJ -gt 1 ] && return 0 if [ $VER_MIN -ge 16 ]; then return 0 fi diff --git a/tests/verity-compat-test b/tests/verity-compat-test index 795ca804..638f39f1 100755 --- a/tests/verity-compat-test +++ b/tests/verity-compat-test @@ -83,7 +83,9 @@ check_version() # MAJ MIN VER_MIN=$(echo $VER_STR | cut -f 2 -d.) test $VER_MAJ -gt $1 && return 0 + test $VER_MAJ -lt $1 && return 1 test $VER_MIN -ge $2 && return 0 + return 1 } @@ -95,6 +97,7 @@ check_version_kernel() KER_MIN=$(echo $KER_STR | cut -f 2 -d.) test $KER_MAJ -gt $1 && return 0 + test $KER_MAJ -lt $1 && return 1 test $KER_MIN -ge $2 && return 0 return 1