tests: Derive support for CUSE from SWTPM_EXE help screen

Use 'swtpm --help | grep cuse' to determine whether CUSE interface is supported and CUSE related tests need to run. Make sure that SWTPM_EXE is available when test_cuse is sourced. Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
stefanberger · Aug 26, 2024 · 7f8aa8b · 7f8aa8b
1 parent 54e2aef
commit 7f8aa8b
Show file tree

Hide file tree

Showing 43 changed files with 48 additions and 44 deletions.
diff --git a/tests/_test_encrypted_state b/tests/_test_encrypted_state
@@ -34,8 +34,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_getcap b/tests/_test_getcap
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_hashing b/tests/_test_hashing
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_hashing2 b/tests/_test_hashing2
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_init b/tests/_test_init
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_locality b/tests/_test_locality
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_migration_key b/tests/_test_migration_key
@@ -45,8 +45,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 # make a backup of the volatile state
 TPM_PATH=$tpmstatedir

diff --git a/tests/_test_print_capabilities b/tests/_test_print_capabilities
@@ -8,8 +8,8 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 PATH=$ROOT/src/swtpm:$PATH
 
-[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 if ! msg="$(${SWTPM_EXE} "${SWTPM_IFACE}" --print-capabilities 2>&1)"; then
 	echo "Error: Could not pass --print-capabilities"

diff --git a/tests/_test_print_states b/tests/_test_print_states
@@ -8,8 +8,8 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 PATH=$ROOT/src/swtpm:$PATH
 
-[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 trap "cleanup" SIGTERM EXIT
 

diff --git a/tests/_test_resume_volatile b/tests/_test_resume_volatile
@@ -30,8 +30,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 TPM_PATH=$tpmstatedir
 VOLATILE_STATE_FILE="$TPM_PATH/tpm-00.volatilestate"

diff --git a/tests/_test_save_load_encrypted_state b/tests/_test_save_load_encrypted_state
@@ -34,8 +34,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_save_load_state b/tests/_test_save_load_state
@@ -38,8 +38,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_setbuffersize b/tests/_test_setbuffersize
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_swtpm_bios b/tests/_test_swtpm_bios
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_avoid_da_lockout b/tests/_test_tpm2_avoid_da_lockout
@@ -24,9 +24,9 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
 source "${TESTDIR}/test_common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--tpm2 \

diff --git a/tests/_test_tpm2_derived_keys b/tests/_test_tpm2_derived_keys
@@ -30,8 +30,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 TPM_PATH=$tpmstatedir
 

diff --git a/tests/_test_tpm2_encrypted_state b/tests/_test_tpm2_encrypted_state
@@ -34,8 +34,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_file_permissions b/tests/_test_tpm2_file_permissions
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 SWTPM_SETUP_CONF=${TPM_PATH}/swtpm_setup.conf
 
 cat <<_EOF_ > "${SWTPM_SETUP_CONF}"

diff --git a/tests/_test_tpm2_getcap b/tests/_test_tpm2_getcap
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_hashing b/tests/_test_tpm2_hashing
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_hashing2 b/tests/_test_tpm2_hashing2
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_hashing3 b/tests/_test_tpm2_hashing3
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_init b/tests/_test_tpm2_init
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_locality b/tests/_test_tpm2_locality
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_migration_key b/tests/_test_tpm2_migration_key
@@ -46,8 +46,8 @@ logfile="$(mktemp)" || exit 1
 SWTPM_CMD_UNIX_PATH=${tpmstatedir}/unix-cmd.sock
 SWTPM_CTRL_UNIX_PATH=${tpmstatedir}/unix-ctrl.sock
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 # make a backup of the volatile state
 TPM_PATH=$tpmstatedir

diff --git a/tests/_test_tpm2_print_capabilities b/tests/_test_tpm2_print_capabilities
@@ -8,8 +8,8 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 PATH=$ROOT/src/swtpm:$PATH
 
-[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 if ! msg="$(${SWTPM_EXE} "${SWTPM_IFACE}" --tpm2 --print-capabilities 2>&1)"; then
 	echo "Error: Could not pass --print-capabilities"

diff --git a/tests/_test_tpm2_print_states b/tests/_test_tpm2_print_states
@@ -8,8 +8,8 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 PATH=$ROOT/src/swtpm:$PATH
 
-[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 trap "cleanup" SIGTERM EXIT
 

diff --git a/tests/_test_tpm2_probe b/tests/_test_tpm2_probe
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_resume_volatile b/tests/_test_tpm2_resume_volatile
@@ -30,8 +30,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 TPM_PATH=$tpmstatedir
 VOLATILE_STATE_FILE="$TPM_PATH/tpm2-00.volatilestate"

diff --git a/tests/_test_tpm2_save_load_encrypted_state b/tests/_test_tpm2_save_load_encrypted_state
@@ -34,8 +34,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_save_load_state b/tests/_test_tpm2_save_load_state
@@ -31,8 +31,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_save_load_state_da_timeout b/tests/_test_tpm2_save_load_state_da_timeout
@@ -32,8 +32,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_save_load_state_locking b/tests/_test_tpm2_save_load_state_locking
@@ -28,8 +28,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--migration release-lock-outgoing \

diff --git a/tests/_test_tpm2_savestate b/tests/_test_tpm2_savestate
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_setbuffersize b/tests/_test_tpm2_setbuffersize
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_swtpm_bios b/tests/_test_tpm2_swtpm_bios
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_volatilestate b/tests/_test_tpm2_volatilestate
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm2_wrongorder b/tests/_test_tpm2_wrongorder
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 

diff --git a/tests/_test_tpm_probe b/tests/_test_tpm_probe
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null