shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-10 00:58:20 +03:00
Code

Merge pull request #23939 from mrc0mmand/TEST-70-fix-cleanup

Browse Source 
Fix cleanup in TEST-70-TPM2
This commit is contained in:
Yu Watanabe 2022-07-08 05:44:12 +09:00 committed by GitHub
commit cd34a381ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/TEST-70-TPM2/test.sh
View File

@ -14,7 +14,6 @@ command -v swtpm >/dev/null 2>&1 || exit 0
command -v tpm2_pcrextend >/dev/null 2>&1 || exit 0 command -v tpm2_pcrextend >/dev/null 2>&1 || exit 0
test_append_files() { test_append_files() {
(
local workspace="${1:?}" local workspace="${1:?}"
instmods tpm tpm_tis tpm_ibmvtpm instmods tpm tpm_tis tpm_ibmvtpm
@ -26,20 +25,24 @@ test_append_files() {
if get_bool "$LOOKS_LIKE_DEBIAN"; then if get_bool "$LOOKS_LIKE_DEBIAN"; then
inst_library "/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/libgcc_s.so.1" inst_library "/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/libgcc_s.so.1"
fi fi
)
} }
machine="$(uname -m)" TEST_70_TPM_DEVICE="tpm-tis"
tpmdevice="tpm-tis" if [[ "$(uname -m)" == "ppc64le" ]]; then
if [ "$machine" = "ppc64le" ]; then
# tpm-spapr support was introduced in qemu 5.0.0. Skip test for old qemu versions. # tpm-spapr support was introduced in qemu 5.0.0. Skip test for old qemu versions.
qemu_min_version "5.0.0" || exit 0 qemu_min_version "5.0.0" || exit 0
tpmdevice="tpm-spapr" TEST_70_TPM_DEVICE="tpm-spapr"
fi fi
tpmstate=$(mktemp -d) TEST_70_at_exit() {
swtpm socket --tpm2 --tpmstate dir="$tpmstate" --ctrl type=unixio,path="$tpmstate/sock" & [[ -n "${TEST_70_SWTPM_PID:-}" ]] && kill "$TEST_70_SWTPM_PID" &>/dev/null
trap 'kill %%; rm -rf $tpmstate' SIGINT EXIT [[ -n "${TEST_70_TPM_STATE:-}" ]] && rm -rf "$TEST_70_TPM_STATE"
QEMU_OPTIONS="-chardev socket,id=chrtpm,path=$tpmstate/sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device $tpmdevice,tpmdev=tpm0" }
TEST_70_TPM_STATE="$(mktemp -d)"
swtpm socket --tpm2 --tpmstate dir="$TEST_70_TPM_STATE" --ctrl type=unixio,path="$TEST_70_TPM_STATE/sock" &
TEST_70_SWTPM_PID=$!
add_at_exit_handler TEST_70_at_exit
QEMU_OPTIONS+=" -chardev socket,id=chrtpm,path=$TEST_70_TPM_STATE/sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device $TEST_70_TPM_DEVICE,tpmdev=tpm0"
do_test "$@" do_test "$@"

29
test/test-functions
View File

@ -60,6 +60,33 @@ get_bool() {
fi fi
} }
# Since in Bash we can have only one handler per signal, let's overcome this
# limitation by having one global handler for the EXIT signal which executes
# all registered handlers
_AT_EXIT_HANDLERS=()
_at_exit() {
set +e
# Run the EXIT handlers in reverse order
for ((i = ${#_AT_EXIT_HANDLERS[@]} - 1; i >= 0; i--)); do
ddebug "Running EXIT handler '${_AT_EXIT_HANDLERS[$i]}'"
"${_AT_EXIT_HANDLERS[$i]}"
done
}
trap _at_exit EXIT
add_at_exit_handler() {
local handler="${1?}"
if [[ "$(type -t "$handler")" != "function" ]]; then
dfatal "'$handler' is not a function"
exit 1
fi
_AT_EXIT_HANDLERS+=("$handler")
}
# Decide if we can (and want to) run qemu with KVM acceleration. # Decide if we can (and want to) run qemu with KVM acceleration.
# Check if nested KVM is explicitly enabled (TEST_NESTED_KVM). If not, # Check if nested KVM is explicitly enabled (TEST_NESTED_KVM). If not,
# check if it's not explicitly disabled (TEST_NO_KVM) and we're not already # check if it's not explicitly disabled (TEST_NO_KVM) and we're not already
@ -1238,7 +1265,7 @@ cleanup_loopdev() {
fi fi
} }
trap cleanup_loopdev EXIT INT QUIT PIPE add_at_exit_handler cleanup_loopdev
create_empty_image() { create_empty_image() {
if [ -z "${IMAGE_NAME:=}" ]; then if [ -z "${IMAGE_NAME:=}" ]; then