tests: Increase timeout for shutdown for running with valgrind

To avoid timeouts when running the tests with valgrind, increase
the timeout until the swtpm process must have terminated after a
shutdown signal to 4 seconds.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

tests/_test_encrypted_state

@@ -244,7 +244,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile

tests/_test_getcap

@@ -78,7 +78,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_hashing

@@ -170,7 +170,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_hashing2

@@ -196,7 +196,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_init

@@ -110,7 +110,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_locality

@@ -112,7 +112,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_save_load_encrypted_state

@@ -284,7 +284,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile
@@ -352,7 +352,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile
@@ -426,7 +426,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile

tests/_test_save_load_state

@@ -283,7 +283,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile

tests/_test_setbuffersize

@@ -93,7 +93,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_swtpm_bios

@@ -151,7 +151,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_encrypted_state

@@ -246,7 +246,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile

tests/_test_tpm2_getcap

@@ -79,7 +79,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_hashing

@@ -167,7 +167,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_init

@@ -96,7 +96,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_locality

@@ -144,7 +144,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_save_load_encrypted_state

@@ -250,7 +250,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile
@@ -318,7 +318,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile
@@ -365,7 +365,7 @@ if [ $? -eq 0 ]; then
 	exit 1
 fi
 
-if ! wait_process_gone ${SWTPM_PID} 1; then
+if ! wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM not running anymore after failed INIT."
 	echo "TPM Logfile:"
 	cat $logfile
@@ -394,7 +394,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile

tests/_test_tpm2_save_load_state

@@ -256,7 +256,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile

tests/_test_tpm2_save_load_state_da_timeout

@@ -310,7 +310,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile

tests/_test_tpm2_savestate

@@ -140,7 +140,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_setbuffersize

@@ -114,7 +114,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_swtpm_bios

@@ -60,7 +60,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if ! wait_process_gone ${SWTPM_PID} 1; then
+if ! wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM not running anymore after INIT."
 	exit 1
 fi
@@ -148,7 +148,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_volatilestate

@@ -220,7 +220,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_wrongorder

@@ -105,7 +105,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_volatilestate

@@ -215,7 +215,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_wrongorder

@@ -105,7 +105,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone ${SWTPM_PID} 1; then
+if wait_process_gone ${SWTPM_PID} 4; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/test_ctrlchannel

@@ -146,7 +146,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: TPM should not be running anymore."
 	exit 1
 fi
@@ -380,7 +380,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: Socket TPM should not be running anymore."
 	exit 1
 fi
@@ -448,7 +448,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: Socket TPM should not be running anymore."
 	exit 1
 fi
@@ -580,7 +580,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: Socket TPM should not be running anymore."
 	exit 1
 fi

tests/test_ctrlchannel2

@@ -105,7 +105,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: TPM should not be running anymore."
 	exit 1
 fi
@@ -291,7 +291,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: Socket TPM should not be running anymore."
 	exit 1
 fi
@@ -351,7 +351,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: Socket TPM should not be running anymore."
 	exit 1
 fi
@@ -466,7 +466,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: Socket TPM should not be running anymore."
 	exit 1
 fi

tests/test_ctrlchannel4

@@ -119,7 +119,7 @@ if [ "$res" != "$exp" ]; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: TPM should not be running anymore."
 	exit 1
 fi

tests/test_tpm2_ctrlchannel2

@@ -111,7 +111,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: TPM should not be running anymore."
 	exit 1
 fi
@@ -305,7 +305,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: TPM should not be running anymore."
 	exit 1
 fi
@@ -361,7 +361,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: TPM should not be running anymore."
 	exit 1
 fi
@@ -481,7 +481,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: TPM should not be running anymore."
 	exit 1
 fi

tests/test_vtpm_proxy

@@ -114,7 +114,7 @@ if wait_file_gone $PID_FILE 2; then
 	exit 1
 fi
 
-if wait_process_gone $PID 1; then
+if wait_process_gone ${PID} 4; then
 	echo "Error: TPM should not be running anymore."
 	exit 1
 fi