From ea05e4307e7c3c80700ac33bda6003371704a1b4 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Fri, 4 Nov 2022 21:44:16 +0100 Subject: [PATCH] tests: check that *.so token helpers are compiled. --- tests/ssh-test-plugin | 4 +++- tests/systemd-tokens-test | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/ssh-test-plugin b/tests/ssh-test-plugin index d3b584ea..0a440b93 100755 --- a/tests/ssh-test-plugin +++ b/tests/ssh-test-plugin @@ -1,7 +1,9 @@ #!/bin/bash [ -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=$CRYPTSETUP_PATH/cryptsetup diff --git a/tests/systemd-tokens-test b/tests/systemd-tokens-test index 2808ab6f..0c7637d0 100755 --- a/tests/systemd-tokens-test +++ b/tests/systemd-tokens-test @@ -66,6 +66,8 @@ CRYPTENROLL_LD_PRELOAD="" # if CRYPTSETUP_PATH is defined, we run against installed binaries, # otherwise we compile systemd tokens from source [ -z "$CRYPTSETUP_PATH" ] && { + TOKEN_PATH=fake_token_path.so + [ -f $TOKEN_PATH ] || skip "Please compile $TOKEN_PATH." INSTALL_PATH=$(pwd)/external-tokens/install make -C .. install DESTDIR=$INSTALL_PATH 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/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" } CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup