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

Allow bitlk tests to run with valgrind.

Browse Source
This commit is contained in:
Ondrej Kozina
2020-05-27 16:08:34 +02:00
committed by Milan Broz
parent 79442539c7
commit 616dd5a304
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Makefile.am
View File

@@ -119,6 +119,7 @@ valgrind-check: api-test api-test-2 differ
@INFOSTRING="api-test-000" ./valg-api.sh ./api-test @INFOSTRING="api-test-000" ./valg-api.sh ./api-test
@INFOSTRING="api-test-002" ./valg-api.sh ./api-test-2 @INFOSTRING="api-test-002" ./valg-api.sh ./api-test-2
@VALG=1 ./luks2-reencryption-test @VALG=1 ./luks2-reencryption-test
@VALG=1 ./bitlk-compat-test
@VALG=1 ./compat-test @VALG=1 ./compat-test
.PHONY: valgrind-check .PHONY: valgrind-check

17
tests/bitlk-compat-test
View File

@@ -7,6 +7,9 @@ CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
TST_DIR=bitlk-images TST_DIR=bitlk-images
MAP=bitlktst MAP=bitlktst
CRYPTSETUP_VALGRIND=../.libs/cryptsetup
CRYPTSETUP_LIB_VALGRIND=../.libs
[ -z "$srcdir" ] && srcdir="." [ -z "$srcdir" ] && srcdir="."
function remove_mapping() function remove_mapping()
@@ -75,9 +78,23 @@ function check_dump()
} }
function valgrind_setup()
{
which valgrind >/dev/null 2>&1 || fail "Cannot find valgrind."
[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
}
function valgrind_run()
{
INFOSTRING="$(basename ${BASH_SOURCE[1]})-line-${BASH_LINENO[0]}" ./valg.sh ${CRYPTSETUP_VALGRIND} "$@"
}
export LANG=C export LANG=C
[ ! -d $TST_DIR ] && tar xJSf $srcdir/bitlk-images.tar.xz --no-same-owner [ ! -d $TST_DIR ] && tar xJSf $srcdir/bitlk-images.tar.xz --no-same-owner
[ -n "$VALG" ] && valgrind_setup && CRYPTSETUP=valgrind_run
echo "HEADER CHECK" echo "HEADER CHECK"
for file in $(ls $TST_DIR/bitlk-*) ; do for file in $(ls $TST_DIR/bitlk-*) ; do
echo -n " $file" echo -n " $file"