eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix targets/kernel version detection

Browse Source 
It is really not a good idea to check minor version without
checking major version is not lower first.

Also try to prepare for situation when major target versions
increases.
This commit is contained in:
Milan Broz
2025-02-19 13:46:06 +01:00
parent 52c63b5de1
commit 93bc8997ea
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/compat-test2
View File

@@ -184,6 +184,7 @@ dm_crypt_capi_support()
VER_MAJ=$(echo $VER_STR | cut -f 1 -d.) VER_MAJ=$(echo $VER_STR | cut -f 1 -d.)
VER_MIN=$(echo $VER_STR | cut -f 2 -d.) VER_MIN=$(echo $VER_STR | cut -f 2 -d.)
[ $VER_MAJ -gt 1 ] && return 0
if [ $VER_MIN -ge 16 ]; then if [ $VER_MIN -ge 16 ]; then
return 0 return 0
fi fi
@@ -239,6 +240,7 @@ dm_crypt_sector_size_support()
VER_MIN=$(echo $VER_STR | cut -f 2 -d.) VER_MIN=$(echo $VER_STR | cut -f 2 -d.)
VER_PTC=$(echo $VER_STR | cut -f 3 -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 if [ $VER_MIN -ge 17 -o \( $VER_MIN -eq 14 -a $VER_PTC -ge 5 \) ]; then
return 0 return 0
fi fi

9
tests/integrity-compat-test
View File

@@ -61,6 +61,15 @@ dm_integrity_features()
VER_PTC=$(echo $VER_STR | cut -f 3 -d.) VER_PTC=$(echo $VER_STR | cut -f 3 -d.)
[ $VER_MAJ -lt 1 ] && return [ $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 ] && { [ $VER_MIN -gt 1 ] && {
DM_INTEGRITY_META=1 DM_INTEGRITY_META=1
DM_INTEGRITY_RECALC=1 DM_INTEGRITY_RECALC=1

1
tests/mode-test
View File

@@ -64,6 +64,7 @@ dm_crypt_capi_support()
VER_MIN=$(echo $VER_STR | cut -f 2 -d.) VER_MIN=$(echo $VER_STR | cut -f 2 -d.)
VER_PTC=$(echo $VER_STR | cut -f 3 -d.) VER_PTC=$(echo $VER_STR | cut -f 3 -d.)
[ $VER_MAJ -gt 1 ] && return 0
if [ $VER_MIN -ge 16 ]; then if [ $VER_MIN -ge 16 ]; then
return 0 return 0
fi fi

3
tests/verity-compat-test
View File

@@ -83,7 +83,9 @@ check_version() # MAJ MIN
VER_MIN=$(echo $VER_STR | cut -f 2 -d.) VER_MIN=$(echo $VER_STR | cut -f 2 -d.)
test $VER_MAJ -gt $1 && return 0 test $VER_MAJ -gt $1 && return 0
test $VER_MAJ -lt $1 && return 1
test $VER_MIN -ge $2 && return 0 test $VER_MIN -ge $2 && return 0
return 1 return 1
} }
@@ -95,6 +97,7 @@ check_version_kernel()
KER_MIN=$(echo $KER_STR | cut -f 2 -d.) KER_MIN=$(echo $KER_STR | cut -f 2 -d.)
test $KER_MAJ -gt $1 && return 0 test $KER_MAJ -gt $1 && return 0
test $KER_MAJ -lt $1 && return 1
test $KER_MIN -ge $2 && return 0 test $KER_MIN -ge $2 && return 0
return 1 return 1