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

Remove test images dir once test is finished.

Browse Source 
THsi allows another user to run test later without permission collision..
This commit is contained in:
Milan Broz
2021-08-15 17:26:13 +02:00
parent 8606342b53
commit f702246d78
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/bitlk-compat-test
View File

@@ -16,6 +16,7 @@ CRYPTSETUP_LIB_VALGRIND=../.libs
function remove_mapping() function remove_mapping()
{ {
[ -b /dev/mapper/$MAP ] && dmsetup remove --retry $MAP [ -b /dev/mapper/$MAP ] && dmsetup remove --retry $MAP
rm -rf $TST_DIR
} }
function fail() function fail()
@@ -32,6 +33,7 @@ function skip()
{ {
[ -n "$1" ] && echo "$1" [ -n "$1" ] && echo "$1"
echo "Test skipped." echo "Test skipped."
remove_mapping
exit 77 exit 77
} }
@@ -106,11 +108,10 @@ done
if [ $(id -u) != 0 ]; then if [ $(id -u) != 0 ]; then
echo "WARNING: You must be root to run activation part of test, test skipped." echo "WARNING: You must be root to run activation part of test, test skipped."
remove_mapping
exit 0 exit 0
fi fi
remove_mapping
echo "ACTIVATION FS UUID CHECK" echo "ACTIVATION FS UUID CHECK"
for file in $(ls $TST_DIR/bitlk-*) ; do for file in $(ls $TST_DIR/bitlk-*) ; do
# load variables for this image from config file # load variables for this image from config file
@@ -185,3 +186,6 @@ for file in $(ls $TST_DIR/bitlk-*) ; do
fi fi
done done
remove_mapping
exit 0

6
tests/luks1-compat-test
View File

@@ -17,6 +17,7 @@ KEYFILE=keyfile1
function remove_mapping() function remove_mapping()
{ {
[ -b /dev/mapper/$MAP ] && dmsetup remove --retry $MAP [ -b /dev/mapper/$MAP ] && dmsetup remove --retry $MAP
rm -rf $TST_DIR
} }
function fail() function fail()
@@ -33,6 +34,7 @@ function skip()
{ {
[ -n "$1" ] && echo "$1" [ -n "$1" ] && echo "$1"
echo "Test skipped." echo "Test skipped."
remove_mapping
exit 77 exit 77
} }
@@ -80,6 +82,7 @@ done
if [ $(id -u) != 0 ]; then if [ $(id -u) != 0 ]; then
echo "WARNING: You must be root to run activation part of test, test skipped." echo "WARNING: You must be root to run activation part of test, test skipped."
remove_mapping
exit 0 exit 0
fi fi
@@ -102,3 +105,6 @@ for file in $(ls $TST_DIR/luks1_*) ; do
[ "$UUID" != "DEAD-BABE" ] && fail "UUID check failed." [ "$UUID" != "DEAD-BABE" ] && fail "UUID check failed."
echo " [OK]" echo " [OK]"
done done
remove_mapping
exit 0

6
tests/tcrypt-compat-test
View File

@@ -21,6 +21,7 @@ function remove_mapping()
[ -b /dev/mapper/$MAP ] && dmsetup remove --retry $MAP [ -b /dev/mapper/$MAP ] && dmsetup remove --retry $MAP
[ -b /dev/mapper/"$MAP"_1 ] && dmsetup remove --retry "$MAP"_1 [ -b /dev/mapper/"$MAP"_1 ] && dmsetup remove --retry "$MAP"_1
[ -b /dev/mapper/"$MAP"_2 ] && dmsetup remove --retry "$MAP"_2 [ -b /dev/mapper/"$MAP"_2 ] && dmsetup remove --retry "$MAP"_2
rm -rf $TST_DIR
} }
function fail() function fail()
@@ -37,6 +38,7 @@ function skip()
{ {
[ -n "$1" ] && echo "$1" [ -n "$1" ] && echo "$1"
echo "Test skipped." echo "Test skipped."
remove_mapping
exit 77 exit 77
} }
@@ -166,6 +168,7 @@ done
if [ $(id -u) != 0 ]; then if [ $(id -u) != 0 ]; then
echo "WARNING: You must be root to run activation part of test, test skipped." echo "WARNING: You must be root to run activation part of test, test skipped."
remove_mapping
exit 0 exit 0
fi fi
@@ -202,3 +205,6 @@ for file in $(ls $TST_DIR/[tv]c_*-hidden) ; do
[ "$UUID" != "CAFE-BABE" ] && fail "UUID check failed." [ "$UUID" != "CAFE-BABE" ] && fail "UUID check failed."
echo " [OK]" echo " [OK]"
done done
remove_mapping
exit 0