Remove test images dir once test is finished.

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

View File

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

View File

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

View File

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