tests: check that *.so token helpers are compiled.

This commit is contained in:
Milan Broz
2022-11-04 21:44:16 +01:00
parent f35b9cc99b
commit ea05e4307e
2 changed files with 6 additions and 2 deletions

View File

@@ -1,7 +1,9 @@
#!/bin/bash #!/bin/bash
[ -z "$CRYPTSETUP_PATH" ] && { [ -z "$CRYPTSETUP_PATH" ] && {
export LD_PRELOAD=./fake_token_path.so TOKEN_PATH="./fake_token_path.so"
[ ! -f $TOKEN_PATH ] && { echo "Please compile $TOKEN_PATH."; exit 77; }
export LD_PRELOAD=$TOKEN_PATH
CRYPTSETUP_PATH=".." CRYPTSETUP_PATH=".."
} }
CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup

View File

@@ -66,6 +66,8 @@ CRYPTENROLL_LD_PRELOAD=""
# if CRYPTSETUP_PATH is defined, we run against installed binaries, # if CRYPTSETUP_PATH is defined, we run against installed binaries,
# otherwise we compile systemd tokens from source # otherwise we compile systemd tokens from source
[ -z "$CRYPTSETUP_PATH" ] && { [ -z "$CRYPTSETUP_PATH" ] && {
TOKEN_PATH=fake_token_path.so
[ -f $TOKEN_PATH ] || skip "Please compile $TOKEN_PATH."
INSTALL_PATH=$(pwd)/external-tokens/install INSTALL_PATH=$(pwd)/external-tokens/install
make -C .. install DESTDIR=$INSTALL_PATH make -C .. install DESTDIR=$INSTALL_PATH
PC_FILE="$(find $INSTALL_PATH -name 'libcryptsetup.pc')" PC_FILE="$(find $INSTALL_PATH -name 'libcryptsetup.pc')"
@@ -89,7 +91,7 @@ CRYPTENROLL_LD_PRELOAD=""
cp $SYSTEMD_PATH/build/libcryptsetup-token-*.so ../.libs/ cp $SYSTEMD_PATH/build/libcryptsetup-token-*.so ../.libs/
cp $SYSTEMD_PATH/build/src/shared/*.so ../.libs/ cp $SYSTEMD_PATH/build/src/shared/*.so ../.libs/
export LD_PRELOAD="${LD_PRELOAD-}:$CRYPTSETUP_PATH/tests/fake_token_path.so" export LD_PRELOAD="${LD_PRELOAD-}:$CRYPTSETUP_PATH/tests/$TOKEN_PATH"
CRYPTENROLL_LD_PRELOAD="$CRYPTSETUP_PATH/.libs/libcryptsetup.so" CRYPTENROLL_LD_PRELOAD="$CRYPTSETUP_PATH/.libs/libcryptsetup.so"
} }
CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup