tests: Replace ${SWTPM}.pid with swtpm.pid in PID filename in 2 test cases

The PID filename was generated using the ${SWTPM} environment variable,
which caused test failures if set to a URL for example. Replace it with
'swptm'.

This issue was reported in issue #454.

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

diff --git a/tests/_test_swtpm_bios b/tests/_test_swtpm_bios
index 7db427cafc4a3bbdb948910e07517286669f748d..5397e2a7382b4194088b51c035a9337d69241f8a 100755 (executable)
--- a/tests/_test_swtpm_bios
+++ b/tests/_test_swtpm_bios
@@ -12,7 +12,7 @@ SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
 TPM_PATH=$(mktemp -d)
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
-PID_FILE=$TPM_PATH/${SWTPM}.pid
+PID_FILE=$TPM_PATH/swtpm.pid
 SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock
 SWTPM_CTRL_UNIX_PATH=${TPM_PATH}/unix-ctrl.sock
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}

diff --git a/tests/_test_tpm2_swtpm_bios b/tests/_test_tpm2_swtpm_bios
index bf5c88dacbdad32e56e4ae0f25a685fd46540beb..85d1d01d86f5b3d3a706f7f2f83382661e44e1be 100755 (executable)
--- a/tests/_test_tpm2_swtpm_bios
+++ b/tests/_test_tpm2_swtpm_bios
@@ -11,7 +11,7 @@ SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
 TPM_PATH=$(mktemp -d)
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
-PID_FILE=$TPM_PATH/${SWTPM}.pid
+PID_FILE=$TPM_PATH/SWTPM.pid
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}
 SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock
 SWTPM_CTRL_UNIX_PATH=${TPM_PATH}/unix-ctrl.sock