tests: Remove SWTPM variable and usage

SWTPM was set to 'swtpm' and only for uninstalled tests. Remove it and replace its usage with 'swtpm' everywhere. Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
stefanberger · Aug 27, 2024 · 4ef45bc · 4ef45bc
1 parent ec792ce
commit 4ef45bc
Show file tree

Hide file tree

Showing 33 changed files with 52 additions and 55 deletions.
diff --git a/tests/_test_encrypted_state b/tests/_test_encrypted_state
@@ -43,7 +43,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--key "file=$keyfile,mode=aes-cbc,format=hex,remove" \
 	--log "file=$logfile"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -143,7 +143,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--key "file=$binkeyfile,mode=aes-cbc,format=binary,remove" \
 	--log "file=$logfile"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error (2): ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_hashing b/tests/_test_hashing
@@ -33,7 +33,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_hashing2 b/tests/_test_hashing2
@@ -33,7 +33,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_init b/tests/_test_init
@@ -40,7 +40,7 @@ run_swtpm "${SWTPM_INTERFACE}" \
 	--tpmstate "dir=$TPM_PATH" \
 	--pid "file=$PID_FILE"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_locality b/tests/_test_locality
@@ -33,7 +33,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_migration_key b/tests/_test_migration_key
@@ -55,7 +55,7 @@ cp "${TESTDIR}"/data/tpmstate1/* "$TPM_PATH"
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--migration-key "pwdfile=$migpwdfile,remove=false,kdf=sha512"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -149,7 +149,7 @@ echo "Test 1: Ok"
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--migration-key "pwdfile=$migpwdfile,remove=false,kdf=sha512"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -194,7 +194,7 @@ echo "Test 2: Ok"
 # This time we make this fail since we don't provide the migration key
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -231,7 +231,7 @@ echo "Test 3: Ok"
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--migration-key "pwdfile=$migpwdfile,remove=true,kdf=sha512"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_resume_volatile b/tests/_test_resume_volatile
@@ -41,7 +41,7 @@ cp "${TESTDIR}"/data/tpmstate1/* "${TPM_PATH}"
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -92,7 +92,7 @@ cp "${TESTDIR}"/data/tpmstate2/* "${TPM_PATH}"
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--key "pwdfile=${TESTDIR}/data/tpmstate2/pwdfile.txt,kdf=sha512"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -145,7 +145,7 @@ cp "${TESTDIR}"/data/tpmstate2b/* "${TPM_PATH}"
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--key "pwdfile=${TESTDIR}/data/tpmstate2b/pwdfile.txt,mode=aes-256-cbc"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_save_load_encrypted_state b/tests/_test_save_load_encrypted_state
@@ -45,7 +45,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--log "file=$logfile"
 exec 101>&-
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -290,7 +290,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--log "file=$logfile"
 exec 101>&-
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -364,7 +364,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--key "pwdfile=$keyfile,mode=aes-256-cbc" \
 	--log "file=$logfile"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_save_load_state b/tests/_test_save_load_state
@@ -47,7 +47,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	${BACKEND_PARAM:+${BACKEND_PARAM}} \
 	--log "file=$logfile"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_swtpm_bios b/tests/_test_swtpm_bios
@@ -34,7 +34,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 run_swtpm "${SWTPM_INTERFACE}" --tpmstate "dir=$TPM_PATH" --pid "file=$PID_FILE"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_encrypted_state b/tests/_test_tpm2_encrypted_state
@@ -44,7 +44,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--log "file=$logfile" \
 	--tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -145,7 +145,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--log "file=$logfile" \
 	--tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error (2): ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_getcap b/tests/_test_tpm2_getcap
@@ -33,7 +33,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_hashing b/tests/_test_tpm2_hashing
@@ -34,7 +34,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_hashing2 b/tests/_test_tpm2_hashing2
@@ -33,7 +33,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_hashing3 b/tests/_test_tpm2_hashing3
@@ -33,7 +33,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_init b/tests/_test_tpm2_init
@@ -37,7 +37,7 @@ fi
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_locality b/tests/_test_tpm2_locality
@@ -33,7 +33,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_migration_key b/tests/_test_tpm2_migration_key
@@ -126,7 +126,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--tpm2 \
 	--migration-key "pwdfile=$migpwdfile,remove=false,kdf=sha512"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -177,7 +177,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--log "file=${logfile}" \
 	--tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -222,7 +222,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--tpm2 \
 	--migration-key "pwdfile=$migpwdfile,remove=true,kdf=sha512"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: TPM did not start."

diff --git a/tests/_test_tpm2_probe b/tests/_test_tpm2_probe
@@ -33,7 +33,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_resume_volatile b/tests/_test_tpm2_resume_volatile
@@ -41,7 +41,7 @@ cp "${TESTDIR}"/data/tpm2state1/* "${TPM_PATH}"
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: CUSE TPM did not start."
@@ -92,7 +92,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--tpm2 \
 	--key "pwdfile=${TESTDIR}/data/tpm2state2/pwdfile.txt,kdf=sha512"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: CUSE TPM did not start."
@@ -146,7 +146,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--tpm2 \
 	--key "pwdfile=${TESTDIR}/data/tpm2state2b/pwdfile.txt,mode=aes-256-cbc"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: CUSE TPM did not start."

diff --git a/tests/_test_tpm2_save_load_encrypted_state b/tests/_test_tpm2_save_load_encrypted_state
@@ -44,7 +44,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--log "file=$logfile" \
 	--tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -256,7 +256,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--log "file=$logfile" \
 	--tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -333,7 +333,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--log "file=$logfile" \
 	--tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_save_load_state b/tests/_test_tpm2_save_load_state
@@ -40,7 +40,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--log "file=$logfile,level=20" \
 	--tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_save_load_state_da_timeout b/tests/_test_tpm2_save_load_state_da_timeout
@@ -41,7 +41,7 @@ TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--log "file=$logfile,level=20" \
 	--tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_savestate b/tests/_test_tpm2_savestate
@@ -33,7 +33,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git 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)" || exit 1
 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
@@ -34,7 +34,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 run_swtpm "${SWTPM_INTERFACE}" --tpm2 --tpmstate "dir=$TPM_PATH" --pid "file=$PID_FILE"
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_volatilestate b/tests/_test_tpm2_volatilestate
@@ -33,7 +33,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."
@@ -107,7 +107,7 @@ fi
 # Start the TPM again
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."

diff --git a/tests/_test_tpm2_wrongorder b/tests/_test_tpm2_wrongorder
@@ -33,7 +33,7 @@ rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2
 
-display_processes_by_name "$SWTPM"
+display_processes_by_name "swtpm"
 
 if ! kill_quiet -0 "${SWTPM_PID}"; then
 	echo "Error: ${SWTPM_INTERFACE} TPM did not start."