diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-06-02 20:28:41 +0200 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-06-05 16:50:13 +0200 |
| commit | 18fa5c8283528253a9a4d8af42ceac61cd23c42b (patch) | |
| tree | e0f9c2545cee782d6cd7eaf9f1f065cc68b2f1e4 /test/TEST-70-TPM2/test.sh | |
| parent | ci: Report results from CIFuzz using SARIF (diff) | |
| download | systemd-18fa5c8283528253a9a4d8af42ceac61cd23c42b.tar.xz systemd-18fa5c8283528253a9a4d8af42ceac61cd23c42b.zip | |
test: move TPM2-related setup stuff into test-functions
And hide it all behind $TEST_SETUP_SWTPM.
Diffstat (limited to 'test/TEST-70-TPM2/test.sh')
| -rwxr-xr-x | test/TEST-70-TPM2/test.sh | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/test/TEST-70-TPM2/test.sh b/test/TEST-70-TPM2/test.sh index f448a4a5f1..727d159094 100755 --- a/test/TEST-70-TPM2/test.sh +++ b/test/TEST-70-TPM2/test.sh @@ -5,6 +5,7 @@ set -e TEST_DESCRIPTION="cryptenroll/cryptsetup with TPM2 devices" IMAGE_NAME="tpm2" TEST_NO_NSPAWN=1 +TEST_SETUP_SWTPM=1 TEST_REQUIRE_INSTALL_TESTS=0 # shellcheck source=test/test-functions @@ -24,22 +25,4 @@ test_append_files() { inst_binary openssl } -TEST_70_TPM_DEVICE="tpm-tis" -if [[ "$(uname -m)" == "ppc64le" ]]; then - # tpm-spapr support was introduced in qemu 5.0.0. Skip test for old qemu versions. - qemu_min_version "5.0.0" || exit 0 - TEST_70_TPM_DEVICE="tpm-spapr" -fi - -TEST_70_at_exit() { - [[ -n "${TEST_70_SWTPM_PID:-}" ]] && kill "$TEST_70_SWTPM_PID" &>/dev/null - [[ -n "${TEST_70_TPM_STATE:-}" ]] && rm -rf "$TEST_70_TPM_STATE" -} - -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 "$@" |