From 54d07e3aafed327a43db3ec5703ce41eb9fe6aeb Mon Sep 17 00:00:00 2001 From: Mimi Zohar Date: Fri, 16 Oct 2020 08:22:06 -0400 Subject: [PATCH] travis: retry sending tssstartup The software TPM might not be listening for commands yet. Try re-sending the tssstartup. Reported-by: Ken Goldman Signed-off-by: Mimi Zohar --- tests/boot_aggregate.test | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/boot_aggregate.test b/tests/boot_aggregate.test index d58c54f..edebf1d 100755 --- a/tests/boot_aggregate.test +++ b/tests/boot_aggregate.test @@ -97,8 +97,20 @@ swtpm_init() { return "$SKIP" fi - echo "INFO: Walking ${BINARY_BIOS_MEASUREMENTS} initializing the software TPM" + echo "INFO: Sending software TPM startup" "${TSSDIR}/tssstartup" + if [ $? -ne 0 ]; then + echo "INFO: Retry sending software TPM startup" + sleep 1 + "${TSSDIR}/tssstartup" + fi + + if [ $? -ne 0 ]; then + echo "INFO: Software TPM startup failed" + return "$SKIP" + fi + + echo "INFO: Walking ${BINARY_BIOS_MEASUREMENTS} initializing the software TPM" # $(${TSSDIR}/tsseventextend -tpm -if "${BINARY_BIOS_MEASUREMENTS}" -v) 2>&1 > /dev/null "${TSSDIR}/tsseventextend" -tpm -if "${BINARY_BIOS_MEASUREMENTS}" -v > /dev/null 2>&1 }