Proxmox-Port/swtpm
1
0
Fork 0
mirror of https://github.com/stefanberger/swtpm.git synced 2026-01-13 19:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: Move setting CERRTOOL variable to tests-common

Browse Source 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2021-02-26 20:32:10 -05:00 committed by Stefan Berger
parent ef1407f56d
commit e5bb6f4ec5
6 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/common
View File

@ -7,6 +7,13 @@ SWTPM_SETUP=${SWTPM_SETUP:-${ROOT}/src/swtpm_setup/swtpm_setup}
SWTPM_CERT=${SWTPM_CERT:-${ROOT}/src/swtpm_cert/swtpm_cert}
ECHO=$(type -P echo)
case "$(uname -s)" in
Darwin)
CERTTOOL=gnutls-certtool;;
*)
CERTTOOL=certtool;;
esac
# Note: Do not use file descriptors above 127 due to OpenBSD.
# Kill a process quietly

7
tests/test_samples_create_tpmca
View File

@ -76,13 +76,6 @@ function cleanup()
trap "cleanup" SIGTERM EXIT
source ${TESTDIR}/common
case "$(uname -s)" in
Darwin)
CERTTOOL=gnutls-certtool;;
*)
CERTTOOL=certtool;;
esac
PATH=${ROOT}/src/swtpm_bios:${ROOT}/src/swtpm_cert:${PATH}
# run the test with the given owner and SRK passwords

7
tests/test_tpm2_samples_create_tpmca
View File

@ -85,13 +85,6 @@ function cleanup()
trap "cleanup" SIGTERM EXIT
source ${TESTDIR}/common
case "$(uname -s)" in
Darwin)
CERTTOOL=gnutls-certtool;;
*)
CERTTOOL=certtool;;
esac
PATH=${ROOT}/src/swtpm_bios:${ROOT}/src/swtpm_cert:${PATH}
# Run the tests

9
tests/test_tpm2_samples_swtpm_localca
View File

@ -22,6 +22,8 @@ CERTSERIAL=${workdir}/certserial
PATH=${TOPBUILD}/src/swtpm_cert:$PATH
source ${TESTDIR}/common
trap "cleanup" SIGTERM EXIT
function cleanup()
@ -29,13 +31,6 @@ function cleanup()
rm -rf "${workdir}"
}
case "$(uname -s)" in
Darwin)
CERTTOOL=gnutls-certtool;;
*)
CERTTOOL=certtool;;
esac
cat <<_EOF_ > "${workdir}/swtpm-localca.conf"
statedir=${workdir}
signingkey = ${SIGNINGKEY}

9
tests/test_tpm2_samples_swtpm_localca_pkcs11
View File

@ -33,6 +33,8 @@ CERTSERIAL=${workdir}/certserial
PATH=${TOPBUILD}/src/swtpm_cert:$PATH
source ${TESTDIR}/common
trap "cleanup" SIGTERM EXIT
function cleanup()
@ -41,13 +43,6 @@ function cleanup()
${TESTDIR}/softhsm_setup teardown
}
case "$(uname -s)" in
Darwin)
CERTTOOL=gnutls-certtool;;
*)
CERTTOOL=certtool;;
esac
unset GNUTLS_PIN
export PIN="abcdef"

7
tests/test_tpm2_save_load_state_3
View File

@ -49,13 +49,6 @@ source ${TESTDIR}/common
trap "cleanup" SIGTERM EXIT
case "$(uname -s)" in
Darwin)
CERTTOOL=gnutls-certtool;;
*)
CERTTOOL=certtool;;
esac
function cleanup()
{
rm -rf $TPMDIR