tests: Apply patches to IBM TSS2 test suite

[swtpm.git] / tests / _test_tpm2_savestate

diff --git a/tests/_test_tpm2_savestate b/tests/_test_tpm2_savestate
index aa7731b0410d411f0e704d8966cfe24a90fd1c85..46f1b084d6ebed2f33cb68895a251637b81c1ce9 100755 (executable)
--- a/tests/_test_tpm2_savestate
+++ b/tests/_test_tpm2_savestate
@@ -19,7 +19,7 @@ function cleanup()
 {
        pid=${SWTPM_PID}
        if [ -n "$pid" ]; then
-               kill -9 $pid
+               kill_quiet -9 $pid
        fi
        rm -rf $TPM_PATH
 }
@@ -33,9 +33,9 @@ rm -f $STATE_FILE $VOLATILE_STATE_FILE 2>/dev/null
 
 run_swtpm ${SWTPM_INTERFACE} --tpm2
 
-ps aux | grep $SWTPM | grep -v grep
+display_processes_by_name "$SWTPM"
 
-kill -0 ${SWTPM_PID}
+kill_quiet -0 ${SWTPM_PID}
 if [ $? -ne 0 ]; then
        echo "Error: ${SWTPM_INTERFACE} TPM did not start."
        exit 1
@@ -48,7 +48,7 @@ if [ $? -ne 0 ]; then
        exit 1
 fi
 
-kill -0 ${SWTPM_PID} 2>/dev/null
+kill_quiet -0 ${SWTPM_PID} 2>/dev/null
 if [ $? -ne 0 ]; then
        echo "Error: ${SWTPM_INTERFACE} TPM not running anymore after INIT."
        exit 1
@@ -85,7 +85,7 @@ swtpm_open_cmddev ${SWTPM_INTERFACE} 100
 # Read PCR 10
 #                         length         CC            count       hashalg         sz
 RES=$(swtpm_cmd_tx ${SWTPM_INTERFACE} '\x80\x01\x00\x00\x00\x14\x00\x00\x01\x7e\x00\x00\x00\x01\x00\x0b\x03\x00\x04\x00')
-exp=' 80 01 00 00 00 3e 00 00 00 00 00 00 00 16 00 00 00 01 00 0b 03 00 04 00 00 00 00 01 00 20 c3 ba a5 62 69 08 26 72 c3 db 3d 11 0a 10 74 a1 a7 a6 ea 43 e8 82 16 1a af 4b ea a6 83 17 e4 b8'
+exp=' 80 01 00 00 00 3e 00 00 00 00 00 00 00 15 00 00 00 01 00 0b 03 00 04 00 00 00 00 01 00 20 c3 ba a5 62 69 08 26 72 c3 db 3d 11 0a 10 74 a1 a7 a6 ea 43 e8 82 16 1a af 4b ea a6 83 17 e4 b8'
 if [ "$RES" != "$exp" ]; then
        echo "Error: (1) Did not get expected result from TPM2_PCRRead(10)"
        echo "expected: $exp"
@@ -126,7 +126,7 @@ swtpm_open_cmddev ${SWTPM_INTERFACE} 100
 # Read PCR 10
 #                                                   length         CC            count       hashalg         sz
 RES=$(swtpm_cmd_tx ${SWTPM_INTERFACE} '\x80\x01\x00\x00\x00\x14\x00\x00\x01\x7e\x00\x00\x00\x01\x00\x0b\x03\x00\x04\x00')
-exp=' 80 01 00 00 00 3e 00 00 00 00 00 00 00 1b 00 00 00 01 00 0b 03 00 04 00 00 00 00 01 00 20 c3 ba a5 62 69 08 26 72 c3 db 3d 11 0a 10 74 a1 a7 a6 ea 43 e8 82 16 1a af 4b ea a6 83 17 e4 b8'
+exp=' 80 01 00 00 00 3e 00 00 00 00 00 00 00 19 00 00 00 01 00 0b 03 00 04 00 00 00 00 01 00 20 c3 ba a5 62 69 08 26 72 c3 db 3d 11 0a 10 74 a1 a7 a6 ea 43 e8 82 16 1a af 4b ea a6 83 17 e4 b8'
 if [ "$RES" != "$exp" ]; then
        echo "Error: (2) Did not get expected result from TPM2_PCR_Read(10)"
        echo "expected: $exp"
@@ -140,10 +140,7 @@ if [ $? -ne 0 ]; then
        exit 1
 fi
 
-sleep 0.5
-
-kill -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 4; then
        echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
        exit 1
 fi