tests: exit with error code if mktemp fails

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

diff --git a/tests/_test_encrypted_state b/tests/_test_encrypted_state
index 08d0c91215c88f24ecae7809f1fa5c56abea1f7a..87c6f4a6a239ee6a7fd951662256da1f577fdcee 100755 (executable)
--- a/tests/_test_encrypted_state
+++ b/tests/_test_encrypted_state
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-encrypted-state"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 KEY=1234567890abcdef1234567890abcdef

diff --git a/tests/_test_getcap b/tests/_test_getcap
index 4c6d734e1f9f0c19695e6508e1e9ecb059e84950..b262ecf06e405739edbf50fd103046c70fb18918 100755 (executable)
--- a/tests/_test_getcap
+++ b/tests/_test_getcap
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-getcap"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock

diff --git a/tests/_test_hashing b/tests/_test_hashing
index 0a8db43debbd917cbbefb7563e24c4ec957cf027..7c46a206def76fd4c63db71c26490236f215e4db 100755 (executable)
--- a/tests/_test_hashing
+++ b/tests/_test_hashing
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-hashing"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock

diff --git a/tests/_test_hashing2 b/tests/_test_hashing2
index 6a27c9941b460e79f85a82b45d7abcaad3eb8068..5ea09e6208075a5dadaebfcbf69f5f2e182bd5a7 100755 (executable)
--- a/tests/_test_hashing2
+++ b/tests/_test_hashing2
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-hashing2"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock

diff --git a/tests/_test_init b/tests/_test_init
index 8dd00eda73b813b18d5485e1e93448191e039d09..edda5d47da092cf9c6cb2906224342d7b6b5fb0f 100755 (executable)
--- a/tests/_test_init
+++ b/tests/_test_init
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-init"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-TPM_PATH=$(mktemp -d)
+TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 PID_FILE=$TPM_PATH/swtpm.pid

diff --git a/tests/_test_locality b/tests/_test_locality
index ffa5695d0f6398ee8191ac48c3bfa2f665e497ab..9e8c0039b35591c67f33a053a245da4c5b2e7a3c 100755 (executable)
--- a/tests/_test_locality
+++ b/tests/_test_locality
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-locality"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock

diff --git a/tests/_test_migration_key b/tests/_test_migration_key
index a04ebf65d6ba2d31089857f623f9aeff698e8337..8d9443d9e35ef3c3a860961cc1dc2ee648c432ce 100755 (executable)
--- a/tests/_test_migration_key
+++ b/tests/_test_migration_key
@@ -11,20 +11,20 @@ SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
 MIGRATION_PASSWORD="migration"
 VOLATILESTATE=${TESTDIR}/data/migkey1/volatilestate.bin
 
-tpmstatedir=$(mktemp -d)
+tpmstatedir="$(mktemp -d)"
 if [ -z "$tpmstatedir" ]; then
        echo "Could not create temporary directory."
        exit 1
 fi
 
-migpwdfile=$(mktemp)
+migpwdfile="$(mktemp)"
 if [ -z "$migpwdfile" ]; then
        echo "Could not create temporary file."
        exit 1
 fi
 echo -n "$MIGRATION_PASSWORD" > $migpwdfile
 
-volatilestatefile=$(mktemp)
+volatilestatefile="$(mktemp)"
 if [ -z "$volatilestatefile" ]; then
        echo "Could not create temporary file."
        exit 1

diff --git a/tests/_test_print_states b/tests/_test_print_states
index bea4e3fc2f18d74b53482ea9c433933f80795ee1..46afe911f7eb26b8425f4a89b81049c2479a77d3 100755 (executable)
--- a/tests/_test_print_states
+++ b/tests/_test_print_states
@@ -20,7 +20,7 @@ function cleanup()
 
 # Test 1: No states
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 msg="$(${SWTPM_EXE} ${SWTPM_IFACE} --print-states --tpmstate dir=${workdir} 2>&1)"
 
 if [ $? -ne 0 ]; then
@@ -43,7 +43,7 @@ cleanup
 
 # Test 2: Existing state
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 statefile="${workdir}/tpm-00.permall"
 dummydata="DUMMY"
 echo $dummydata > ${statefile}

diff --git a/tests/_test_save_load_encrypted_state b/tests/_test_save_load_encrypted_state
index 6f2287a68f81447cee37522afb5a6e403ff503d2..50df42a799ba644774d3e0b90c9a50d81ad1c004 100755 (executable)
--- a/tests/_test_save_load_encrypted_state
+++ b/tests/_test_save_load_encrypted_state
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="${VTPM_NAME:-vtpm-test-save-load-encrypted-state}"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 KEY=1234567890abcdef1234567890abcdef
@@ -18,8 +18,8 @@ SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock
 SWTPM_CTRL_UNIX_PATH=${TPM_PATH}/unix-ctrl.sock
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}
 
-keyfile=$(mktemp)
-logfile=$(mktemp)
+keyfile="$(mktemp)" || exit 1
+logfile="$(mktemp)" || exit 1
 echo "$KEY" > $keyfile
 
 function cleanup()

diff --git a/tests/_test_save_load_state b/tests/_test_save_load_state
index 0dfe48d095a618fd96f179455cb93ea7a5c3c36a..5324f3c3af9cea215bc54fc0e76b2bca614618ef 100755 (executable)
--- a/tests/_test_save_load_state
+++ b/tests/_test_save_load_state
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="${VTPM_NAME:-vtpm-test-save-load-state}"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 MY_VOLATILE_STATE_FILE=$TPM_PATH/my.volatilestate
@@ -24,7 +24,7 @@ if [ ${SWTPM_TEST_LINEAR_FILE:-0} -ne 0 ]; then
        BACKEND_PARAM="--tpmstate backend-uri=file://$LINEAR_STATE_FILE"
 fi
 
-logfile=$(mktemp)
+logfile="$(mktemp)" || exit 1
 
 function cleanup()
 {

diff --git a/tests/_test_setbuffersize b/tests/_test_setbuffersize
index d39708c4977d676048d166d235ea85577c0cf5ef..6d15758784064f6bd0ece935b9ed4e580da74025 100755 (executable)
--- a/tests/_test_setbuffersize
+++ b/tests/_test_setbuffersize
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-setbuffersize"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock

diff --git a/tests/_test_swtpm_bios b/tests/_test_swtpm_bios
index 5397e2a7382b4194088b51c035a9337d69241f8a..df86b25c58b2f4d598533c6a688b932ff99456bc 100755 (executable)
--- a/tests/_test_swtpm_bios
+++ b/tests/_test_swtpm_bios
@@ -9,7 +9,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 SWTPM_BIOS=$ROOT/src/swtpm_bios/swtpm_bios
 VTPM_NAME="vtpm-test-swtpm-bios"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-TPM_PATH=$(mktemp -d)
+TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 PID_FILE=$TPM_PATH/swtpm.pid

diff --git a/tests/_test_tpm2_encrypted_state b/tests/_test_tpm2_encrypted_state
index cde4166f65b7f04465073cad1333c100d753aa2b..c4bc082e46dd1e831fcf3de8b5097538bfc3a253 100755 (executable)
--- a/tests/_test_tpm2_encrypted_state
+++ b/tests/_test_tpm2_encrypted_state
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME=${VTPM_NAME:-vtpm-test-tpm2-encrypted-state}
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 KEY=1234567890abcdef1234567890abcdef

diff --git a/tests/_test_tpm2_file_permissions b/tests/_test_tpm2_file_permissions
index 71638da7c2e14f9c427e4551f6f98fb81d87b4ae..15da4649a28a352f223706ac977672c173d03755 100644 (file)
--- a/tests/_test_tpm2_file_permissions
+++ b/tests/_test_tpm2_file_permissions
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-file-permissions"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=${TPM_PATH}/tpm2-00.permall
 VOLATILE_STATE_FILE=${TPM_PATH}/tpm2-00.volatilestate
 PIDFILE=${TPM_PATH}/swtpm.pid

diff --git a/tests/_test_tpm2_getcap b/tests/_test_tpm2_getcap
index f9d9d078329dd881444d1fe5a718417674682d1d..4b47ed9823e6d63cd161830c635862f04c5ccdde 100755 (executable)
--- a/tests/_test_tpm2_getcap
+++ b/tests/_test_tpm2_getcap
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-getcap"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}

diff --git a/tests/_test_tpm2_hashing b/tests/_test_tpm2_hashing
index 6c0bfeee132c34330e6d7ac8a0c2586cb4bb2caf..958005949f9d0f87f43268886254e4afec2c849d 100755 (executable)
--- a/tests/_test_tpm2_hashing
+++ b/tests/_test_tpm2_hashing
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-hashing"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}

diff --git a/tests/_test_tpm2_hashing2 b/tests/_test_tpm2_hashing2
index 6287e96c72b753b7fcd0f89fbd3ac72471b4da57..ce0906dc2b5aee369d8b080242ae5e53ae5e9962 100755 (executable)
--- a/tests/_test_tpm2_hashing2
+++ b/tests/_test_tpm2_hashing2
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-hashing2"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}

diff --git a/tests/_test_tpm2_hashing3 b/tests/_test_tpm2_hashing3
index 6682c545d051341856873748bbafe5c53b3f6737..9641b7a2a8a0d52c45ae9cad7c9c9963c9282951 100755 (executable)
--- a/tests/_test_tpm2_hashing3
+++ b/tests/_test_tpm2_hashing3
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-hashing3"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}

diff --git a/tests/_test_tpm2_init b/tests/_test_tpm2_init
index bc3189c467a256af6edaf1052a3a5870aee1f28b..be35b5b7fd0932bc841ee55491d069e2b356ea3f 100755 (executable)
--- a/tests/_test_tpm2_init
+++ b/tests/_test_tpm2_init
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-init"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}

diff --git a/tests/_test_tpm2_locality b/tests/_test_tpm2_locality
index 364537e70c8f474536d1e484075ebe344e1c6b7c..3102e741b11c7df5a9f04a2213137952f2223fe9 100755 (executable)
--- a/tests/_test_tpm2_locality
+++ b/tests/_test_tpm2_locality
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-locality"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}

diff --git a/tests/_test_tpm2_migration_key b/tests/_test_tpm2_migration_key
index dbc1a6b0fdb8460b983894e99b75b4c39e37c3fa..791f50c7933fde0ada55ee3ffa276cc2d519984a 100755 (executable)
--- a/tests/_test_tpm2_migration_key
+++ b/tests/_test_tpm2_migration_key
@@ -23,25 +23,25 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-tpmstatedir=$(mktemp -d)
+tpmstatedir="$(mktemp -d)"
 if [ -z "$tpmstatedir" ]; then
        echo "Could not create temporary directory."
        exit 1
 fi
 
-migpwdfile=$(mktemp)
+migpwdfile="$(mktemp)"
 if [ -z "$migpwdfile" ]; then
        echo "Could not create temporary file."
        exit 1
 fi
 echo -n "$MIGRATION_PASSWORD" > $migpwdfile
 
-volatilestatefile=$(mktemp)
+volatilestatefile="$(mktemp)"
 if [ -z "$volatilestatefile" ]; then
        echo "Could not create temporary file."
        exit 1
 fi
-logfile=$(mktemp)
+logfile="$(mktemp)" || exit 1
 
 SWTPM_CMD_UNIX_PATH=${tpmstatedir}/unix-cmd.sock
 SWTPM_CTRL_UNIX_PATH=${tpmstatedir}/unix-ctrl.sock

diff --git a/tests/_test_tpm2_print_states b/tests/_test_tpm2_print_states
index 94ccf5a6b5efbca66b9c54766f1f8573233588af..f8195cc4079c5809e54ccc5fcced09524a747bff 100755 (executable)
--- a/tests/_test_tpm2_print_states
+++ b/tests/_test_tpm2_print_states
@@ -15,12 +15,12 @@ trap "cleanup" SIGTERM EXIT
 
 function cleanup()
 {
-       rm -rf ${workdir}
+       rm -rf "${workdir}"
 }
 
 # Test 1: No states
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 msg="$(${SWTPM_EXE} ${SWTPM_IFACE} --print-states --tpm2 --tpmstate dir=${workdir} 2>&1)"
 
 if [ $? -ne 0 ]; then
@@ -43,7 +43,7 @@ cleanup
 
 # Test 2: Existing state
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 statefile="${workdir}/tpm2-00.permall"
 dummydata="DUMMY"
 echo $dummydata > ${statefile}

diff --git a/tests/_test_tpm2_probe b/tests/_test_tpm2_probe
index 2ca046c0062431e3c44a715529ba37a7f9882649..39054a09ca97d195beb4425a718a050bec42252f 100755 (executable)
--- a/tests/_test_tpm2_probe
+++ b/tests/_test_tpm2_probe
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-probe"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}

diff --git a/tests/_test_tpm2_resume_volatile b/tests/_test_tpm2_resume_volatile
index 9f0f47bc71bccbe2e0eb738c95dd029008fec1d7..00337b29ab9fc22ee3e58da324fbc753dc69066d 100755 (executable)
--- a/tests/_test_tpm2_resume_volatile
+++ b/tests/_test_tpm2_resume_volatile
@@ -10,7 +10,7 @@ VTPM_NAME=${vtpm-test-tpm2-resume-volatile:-VTPM_NAME}
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}
 
-tpmstatedir="$(mktemp -d)"
+tpmstatedir="$(mktemp -d)" || exit 1
 if [ -z "$tpmstatedir" ]; then
        echo "Could not create temporary directory"
        exit 1

diff --git a/tests/_test_tpm2_save_load_encrypted_state b/tests/_test_tpm2_save_load_encrypted_state
index 70be3a8aa022c9ca6c5a9489b3006e675172aede..f065ca55f344df8def1e766b41c28a2ed357fb90 100755 (executable)
--- a/tests/_test_tpm2_save_load_encrypted_state
+++ b/tests/_test_tpm2_save_load_encrypted_state
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="${VTPM_NAME:-vtpm-test-tpm2-save-load-encrypted-state}"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 KEY=1234567890abcdef1234567890abcdef
@@ -18,8 +18,8 @@ SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}
 SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock
 SWTPM_CTRL_UNIX_PATH=${TPM_PATH}/unix-ctrl.sock
 
-keyfile=$(mktemp)
-logfile=$(mktemp)
+keyfile="$(mktemp)" || exit 1
+logfile="$(mktemp)" || exit 1
 echo "$KEY" > $keyfile
 
 function cleanup()

diff --git a/tests/_test_tpm2_save_load_state b/tests/_test_tpm2_save_load_state
index f5e3f59bb6fbda59eef75d9bbab2aa8d267fb2a3..e360d94677b39ae559d1969eb7c2a4cb25149a58 100755 (executable)
--- a/tests/_test_tpm2_save_load_state
+++ b/tests/_test_tpm2_save_load_state
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="${VTPM_NAME:-vtpm-tpm2-test-save-load-state}"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 MY_VOLATILE_STATE_FILE=$TPM_PATH/my.volatilestate
@@ -17,7 +17,7 @@ SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}
 SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock
 SWTPM_CTRL_UNIX_PATH=${TPM_PATH}/unix-ctrl.sock
 
-logfile=$(mktemp)
+logfile="$(mktemp)" || exit 1
 
 function cleanup()
 {

diff --git a/tests/_test_tpm2_save_load_state_da_timeout b/tests/_test_tpm2_save_load_state_da_timeout
index 8567480adfb6dc760075f773b142d1b7b197be38..37a872e5d60ec9bdfcf3a5015f1b67bc5b7d6415 100755 (executable)
--- a/tests/_test_tpm2_save_load_state_da_timeout
+++ b/tests/_test_tpm2_save_load_state_da_timeout
@@ -9,7 +9,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="${VTPM_NAME:-vtpm-tpm2-test-save-load-state-da-timeout}"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 MY_VOLATILE_STATE_FILE=$TPM_PATH/my.volatilestate
@@ -18,7 +18,7 @@ SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}
 SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock
 SWTPM_CTRL_UNIX_PATH=${TPM_PATH}/unix-ctrl.sock
 
-logfile=$(mktemp)
+logfile="$(mktemp)" || exit 1
 
 function cleanup()
 {

diff --git a/tests/_test_tpm2_savestate b/tests/_test_tpm2_savestate
index 46f1b084d6ebed2f33cb68895a251637b81c1ce9..50040840157ce05fdb98efe4a8d4ffcd3e72e3a7 100755 (executable)
--- a/tests/_test_tpm2_savestate
+++ b/tests/_test_tpm2_savestate
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-savestate"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}

diff --git a/tests/_test_tpm2_setbuffersize b/tests/_test_tpm2_setbuffersize
index d04283373a15d6e03f3e12172a273c836bd03c3c..e738363a54fec6037e138880d5a505687da98804 100755 (executable)
--- a/tests/_test_tpm2_setbuffersize
+++ b/tests/_test_tpm2_setbuffersize
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-setbuffersize"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 OUTFILE=$TPM_PATH/output
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate

diff --git a/tests/_test_tpm2_swtpm_bios b/tests/_test_tpm2_swtpm_bios
index 85d1d01d86f5b3d3a706f7f2f83382661e44e1be..dbe9318aa23c73f110a459779e3b1eddbc936c56 100755 (executable)
--- a/tests/_test_tpm2_swtpm_bios
+++ b/tests/_test_tpm2_swtpm_bios
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-swtpm-bios"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-TPM_PATH=$(mktemp -d)
+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

diff --git a/tests/_test_tpm2_volatilestate b/tests/_test_tpm2_volatilestate
index 7b7cb66ab754ff94160ae1ceacceef87dd572900..65a930f465cad35bdfac3ae2a89973426d2a6a70 100755 (executable)
--- a/tests/_test_tpm2_volatilestate
+++ b/tests/_test_tpm2_volatilestate
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-volatilestate"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 SWTPM_CMD_UNIX_PATH=$TPM_PATH/unix-cmd.sock

diff --git a/tests/_test_tpm2_wrongorder b/tests/_test_tpm2_wrongorder
index 0c8de98b5c88b5495c8c551ff8baf78a7bd4a1b8..c0ba4ed74bb7398f5fd415ba1bb8cfdbcaf95916 100755 (executable)
--- a/tests/_test_tpm2_wrongorder
+++ b/tests/_test_tpm2_wrongorder
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm2-wrongorder"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}

diff --git a/tests/_test_tpm_probe b/tests/_test_tpm_probe
index 0e13c20d9b4650ef0c560ca52a693db43cb3115f..57e1d4e9dd8e82df8b39a0e956ce6e55597e3db6 100755 (executable)
--- a/tests/_test_tpm_probe
+++ b/tests/_test_tpm_probe
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-tpm-probe"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}

diff --git a/tests/_test_volatilestate b/tests/_test_volatilestate
index ee99371f07ae4ab687383228ca7f0e60c54c3023..f8c7872dc370de3043cbdd6eccf9770240b2b4ed 100755 (executable)
--- a/tests/_test_volatilestate
+++ b/tests/_test_volatilestate
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-volatilestate"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock

diff --git a/tests/_test_wrongorder b/tests/_test_wrongorder
index 4e274e1326bbe736bc26055c0ad7c10ad3da82a1..2fee147dad76517a005b1977be61c851223def30 100755 (executable)
--- a/tests/_test_wrongorder
+++ b/tests/_test_wrongorder
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 VTPM_NAME="vtpm-test-wrongorder"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 LOG_FILE=$TPM_PATH/tpm-00.log
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate

diff --git a/tests/test_commandline b/tests/test_commandline
index ca0b2aa205d122f7196d39861bb44522e5154f1a..f894e7a3cbba1c1def36ffd0cce4428beac687e7 100755 (executable)
--- a/tests/test_commandline
+++ b/tests/test_commandline
@@ -15,7 +15,7 @@ TESTDIR=${abs_top_testdir:=$(dirname "$0")}
 source ${TESTDIR}/common
 skip_test_no_tpm12 "${SWTPM_EXE}"
 
-TPMDIR=`mktemp -d`
+TPMDIR="$(mktemp -d)" || exit 1
 PID_FILE=$TPMDIR/${SWTPM}.pid
 LOG_FILE=$TPMDIR/${SWTPM}.log
 
@@ -105,7 +105,7 @@ cleanup
 
 # Test 2: test port, directory and terminate command line parameters (-t)
 #         that causes the swtpm process to exit upon connection close
-TPMDIR=`mktemp -d`
+TPMDIR="$(mktemp -d)" || exit 1
 
 $SWTPM_EXE socket \
        --flags not-need-init \
@@ -177,7 +177,7 @@ echo "Test 3 passed"
 cleanup
 
 # Test 4: --tpmstate backend-uri=dir:// parameter test
-TPMDIR=`mktemp -d`
+TPMDIR="$(mktemp -d)" || exit 1
 PID_FILE=$TPMDIR/${SWTPM}.pid
 FILEMODE=641
 

diff --git a/tests/test_ctrlchannel b/tests/test_ctrlchannel
index 4ed20068bb90feeca72dbab0ddecfdd855251127..58d11a9b21c9b9df7fd254a2e3fe9271fbd05987 100755 (executable)
--- a/tests/test_ctrlchannel
+++ b/tests/test_ctrlchannel
@@ -5,7 +5,7 @@
 ROOT=${abs_top_builddir:-$(dirname "$0")/..}
 TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
-TPMDIR=`mktemp -d`
+TPMDIR="$(mktemp -d)" || exit 1
 SWTPM_CTRL_UNIX_PATH=$TPMDIR/sock
 PID_FILE=$TPMDIR/swtpm.pid
 LOG_FILE=$TPMDIR/swtpm.log

diff --git a/tests/test_ctrlchannel2 b/tests/test_ctrlchannel2
index 0236d30c8b3bfab73119da0fae381ce1ac0f18a6..43c2b11faa292e7a5525aa4b7d8a0f74e5ddd0bb 100755 (executable)
--- a/tests/test_ctrlchannel2
+++ b/tests/test_ctrlchannel2
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 SWTPM=swtpm
 SWTPM_EXE=${SWTPM_EXE:-$ROOT/src/swtpm/$SWTPM}
 SWTPM_IOCTL=${SWTPM_IOCTL:-$ROOT/src/swtpm_ioctl/swtpm_ioctl}
-TPMDIR=`mktemp -d`
+TPMDIR="$(mktemp -d)" || exit 1
 PID_FILE=$TPMDIR/${SWTPM}.pid
 SOCK_PATH=$TPMDIR/sock
 CMD_PATH=$TPMDIR/cmd

diff --git a/tests/test_ctrlchannel3 b/tests/test_ctrlchannel3
index b084511f1583a144f487c15671342af4943d3e26..15c7a85b6eea3b5b4fbc6f693d61ee4269c1eb03 100755 (executable)
--- a/tests/test_ctrlchannel3
+++ b/tests/test_ctrlchannel3
@@ -5,7 +5,7 @@
 ROOT=${abs_top_builddir:-$(dirname "$0")/..}
 TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
-TPMDIR=`mktemp -d`
+TPMDIR="$(mktemp -d)" || exit 1
 SWTPM_CTRL_UNIX_PATH=$TPMDIR/sock
 PID_FILE=$TPMDIR/swtpm.pid
 LOG_FILE=$TPMDIR/swtpm.log

diff --git a/tests/test_ctrlchannel4 b/tests/test_ctrlchannel4
index 81deb232f32a79e4deba41b1f81980eec00cf661..22eb7b22e478600bb8a9f7657d28d31be4457657 100755 (executable)
--- a/tests/test_ctrlchannel4
+++ b/tests/test_ctrlchannel4
@@ -5,7 +5,7 @@
 ROOT=${abs_top_builddir:-$(dirname "$0")/..}
 TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
-TPMDIR=`mktemp -d`
+TPMDIR="$(mktemp -d)" || exit 1
 SWTPM_CTRL_UNIX_PATH=$TPMDIR/sock
 PID_FILE=$TPMDIR/swtpm.pid
 LOG_FILE=$TPMDIR/swtpm.log

diff --git a/tests/test_parameters b/tests/test_parameters
index d280887bf68dda4033afe7b042d332ba588afb15..7c105c7c0a9ae98f7a9168582ad4842db27535ba 100755 (executable)
--- a/tests/test_parameters
+++ b/tests/test_parameters
@@ -67,7 +67,7 @@ skip_test_no_tpm12 "${SWTPM_EXE}"
 
 SWTPM=swtpm
 SWTPM_EXE=${SWTPM_EXE:-$ROOT/src/swtpm/$SWTPM}
-TPMDIR=$(mktemp -d)
+TPMDIR="$(mktemp -d)" || exit 1
 SWTPM_SETUP_CONF=$SRCDIR/samples/swtpm_setup.conf
 # filesystem privileges require to run swtpm_setup as root during test
 TPMAUTHORING="$ROOT/src/swtpm_setup/swtpm_setup --config ${SWTPM_SETUP_CONF}"

diff --git a/tests/test_samples_create_tpmca b/tests/test_samples_create_tpmca
index 714c9664d2b07516ae51b6db618bc5a5a2dbd763..da77e2d6628a4e8c0731361d6197bd520f283bd8 100755 (executable)
--- a/tests/test_samples_create_tpmca
+++ b/tests/test_samples_create_tpmca
@@ -38,7 +38,7 @@ TCSD_LISTEN_PORT=65436
 SRK_PASSWORD=srk
 OWNER_PASSWORD=owner
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 
 TCSD_CONF=${workdir}/tcsd.conf
 TCSD_SYSTEM_PS_FILE=${workdir}/system_ps_file

diff --git a/tests/test_swtpm_cert b/tests/test_swtpm_cert
index 74b3e000cc774a2b9701c3f3cbaf1fb1fd33d909..aef6cfb7ffb41c02e44ae1b64e4a9629a760abfe 100755 (executable)
--- a/tests/test_swtpm_cert
+++ b/tests/test_swtpm_cert
@@ -7,17 +7,16 @@ TESTDIR=${abs_top_testdir:=$(dirname "$0")}
 
 SWTPM_CERT=${SWTPM_CERT:-${ROOT}/src/swtpm_cert/swtpm_cert}
 
-cert=$(mktemp)
-pwdfile=$(mktemp)
-
 trap "cleanup" SIGTERM EXIT
 
-
 function cleanup()
 {
        rm -f "${cert}" "${pwdfile}"
 }
 
+cert="$(mktemp)" || exit 1
+pwdfile="$(mktemp)" || exit 1
+
 function check_cert_size()
 {
        local cert="$1"

diff --git a/tests/test_swtpm_setup_create_cert b/tests/test_swtpm_setup_create_cert
index 06e837e5bfc8435ef7fc692205b499977ab0580d..00205c37bf163a39f2f8c696cc5ce9b579f43938 100755 (executable)
--- a/tests/test_swtpm_setup_create_cert
+++ b/tests/test_swtpm_setup_create_cert
@@ -11,7 +11,7 @@ skip_test_no_tpm12 "${SWTPM_EXE}"
 
 SWTPM_LOCALCA=${ROOT}/src/swtpm_localca/swtpm_localca
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 
 SIGNINGKEY=${workdir}/signingkey.pem
 ISSUERCERT=${workdir}/issuercert.pem

diff --git a/tests/test_swtpm_setup_file_backend b/tests/test_swtpm_setup_file_backend
index 49baca30b1d5e3133c92d8808f89cb51479f268f..1056d49fe95a4f1c2608b0fe20ea5e77cd32cf35 100755 (executable)
--- a/tests/test_swtpm_setup_file_backend
+++ b/tests/test_swtpm_setup_file_backend
@@ -11,7 +11,7 @@ skip_test_no_tpm12 "${SWTPM_EXE}"
 
 SWTPM_SETUP_CONF=$SRCDIR/samples/swtpm_setup.conf
 
-state_save_dir=$(mktemp -d)
+state_save_dir="$(mktemp -d)" || exit 1
 state_save=${state_save_dir}/swtpm-test.state.save
 
 trap "cleanup" SIGTERM EXIT
@@ -23,7 +23,7 @@ function cleanup()
 
 # Test 1: no dummy file, create new state
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 statefile="${workdir}/swtpm-test.state"
 
 $SWTPM_SETUP \
@@ -52,7 +52,7 @@ rm -rf ${workdir}
 
 # Test 2: --overwrite with dummy state file
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 statefile="${workdir}/swtpm-test.state"
 cp ${state_save} ${statefile}
 
@@ -82,7 +82,7 @@ rm -rf ${workdir}
 
 # Test 3: neither "--overwrite" nor "--not-overwrite" with dummy state file
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 statefile="${workdir}/swtpm-test.state"
 cp ${state_save} ${statefile}
 

diff --git a/tests/test_swtpm_setup_misc b/tests/test_swtpm_setup_misc
index 9b53dbc30222e568db0e86f6318023d73a9fa91d..f8d7ef1f3e442f0e1ba011758bcfe057afb1cbc2 100755 (executable)
--- a/tests/test_swtpm_setup_misc
+++ b/tests/test_swtpm_setup_misc
@@ -20,7 +20,7 @@ function cleanup()
        rm -rf ${workdir}
 }
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 
 FILES="swtpm-localca.conf swtpm-localca.options swtpm_setup.conf"
 
@@ -53,7 +53,7 @@ fi
 echo "Test 1: Ok"
 cleanup
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 
 XDG_CONFIG_HOME="${workdir}" ${SWTPM_SETUP} \
        --create-config-files skip-if-exist 1>/dev/null

diff --git a/tests/test_swtpm_setup_overwrite b/tests/test_swtpm_setup_overwrite
index 55bc2c47ac4e2012939edbeb524b7f3e34556416..e4575871240ea7eadbbf26660bbfe4bbdd37a9e6 100755 (executable)
--- a/tests/test_swtpm_setup_overwrite
+++ b/tests/test_swtpm_setup_overwrite
@@ -21,7 +21,7 @@ function cleanup()
 
 # Test 1: --not-overwrite with dummy state file
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 statefile="${workdir}/${STATEBASENAME}"
 dummydata="DUMMY"
 echo $dummydata > ${statefile}
@@ -52,7 +52,7 @@ cleanup
 
 # Test 2: --overwrite with dummy state file
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 statefile="${workdir}/${STATEBASENAME}"
 dummydata="DUMMY"
 echo $dummydata > ${statefile}
@@ -83,7 +83,7 @@ cleanup
 
 # Test 3: neither "--overwrite" nor "--not-overwrite" with dummy state file
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 statefile="${workdir}/${STATEBASENAME}"
 dummydata="DUMMY"
 echo $dummydata > ${statefile}

diff --git a/tests/test_tpm12 b/tests/test_tpm12
index d6ed82fa21a076eda5638e32fb890ea44df8fe0e..688b50cdaa2895107b74be8b155a2425ca59007f 100755 (executable)
--- a/tests/test_tpm12
+++ b/tests/test_tpm12
@@ -26,7 +26,7 @@ trap "cleanup" EXIT
 source ${TESTDIR}/common
 skip_test_no_tpm12 "${SWTPM_EXE}"
 
-WORKDIR=$(mktemp -d)
+WORKDIR="$(mktemp -d)" || exit 1
 TESTLOG=${WORKDIR}/test.log
 
 # variables used by the TPM 1.2 test suite

diff --git a/tests/test_tpm2_ctrlchannel2 b/tests/test_tpm2_ctrlchannel2
index 335c4b8caee22619d047d5799a0ddd56388e0136..13f92c684ac64db8cce93bca69ada134de7557fb 100755 (executable)
--- a/tests/test_tpm2_ctrlchannel2
+++ b/tests/test_tpm2_ctrlchannel2
@@ -8,7 +8,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 SWTPM=swtpm
 SWTPM_EXE=${SWTPM_EXE:-$ROOT/src/swtpm/$SWTPM}
 SWTPM_IOCTL=${SWTPM_IOCTL:-$ROOT/src/swtpm_ioctl/swtpm_ioctl}
-TPMDIR=`mktemp -d`
+TPMDIR="$(mktemp -d)" || exit 1
 PID_FILE=$TPMDIR/${SWTPM}.pid
 SOCK_PATH=$TPMDIR/sock
 CMD_PATH=$TPMDIR/cmd

diff --git a/tests/test_tpm2_ibmtss2 b/tests/test_tpm2_ibmtss2
index d5eb115873e38bac27b6bf9688dc6e5caf286c53..674c058507516964248ecf0cfac6c487a74d28a9 100755 (executable)
--- a/tests/test_tpm2_ibmtss2
+++ b/tests/test_tpm2_ibmtss2
@@ -30,7 +30,7 @@ trap "cleanup" EXIT
 source ${TESTDIR}/common
 skip_test_no_tpm20 "${SWTPM_EXE}"
 
-WORKDIR=$(mktemp -d)
+WORKDIR="$(mktemp -d)" || exit 1
 
 REGLOG=${WORKDIR}/reglog
 

diff --git a/tests/test_tpm2_parameters b/tests/test_tpm2_parameters
index 7add76bb5b0ada95afb6c8f74057b733270df090..4e940049f5881c0bbd9e809ec4212f8a5bad4a92 100755 (executable)
--- a/tests/test_tpm2_parameters
+++ b/tests/test_tpm2_parameters
@@ -64,7 +64,7 @@ exec 101<${TESTDIR}/data/pwdfile.txt
 
 SWTPM=swtpm
 SWTPM_EXE=$ROOT/src/swtpm/$SWTPM
-TPMDIR=$(mktemp -d)
+TPMDIR="$(mktemp -d)" || exit 1
 SWTPM_SETUP_CONF=$SRCDIR/samples/swtpm_setup.conf
 TPMAUTHORING="$ROOT/src/swtpm_setup/swtpm_setup --tpm2 --config ${SWTPM_SETUP_CONF}"
 PATH=${ROOT}/src/swtpm_bios:$PATH

diff --git a/tests/test_tpm2_partial_reads b/tests/test_tpm2_partial_reads
index 30a7c5d2473379640fbd9f66b2f94d7f5df177a3..8ebd8437224969027efa770ecf980fa211b28d39 100755 (executable)
--- a/tests/test_tpm2_partial_reads
+++ b/tests/test_tpm2_partial_reads
@@ -11,7 +11,7 @@ export SWTPM_INTERFACE=cuse
 
 VTPM_NAME="vtpm-test-tpm2-partial-reads"
 SWTPM_DEV_NAME="/dev/${VTPM_NAME}"
-export TPM_PATH=$(mktemp -d)
+export TPM_PATH="$(mktemp -d)" || exit 1
 CMD_PATH="${TPM_PATH}/cmd"
 
 function cleanup()

diff --git a/tests/test_tpm2_samples_create_tpmca.test b/tests/test_tpm2_samples_create_tpmca.test
index 5e002a142efda91cfe91a3bdefd6d2466cc55908..372b371a37d8b05572b0bbf1f86878c2665941ff 100755 (executable)
--- a/tests/test_tpm2_samples_create_tpmca.test
+++ b/tests/test_tpm2_samples_create_tpmca.test
@@ -52,7 +52,7 @@ SWTPM_SERVER_PORT=65455
 SWTPM_CTRL_PORT=65454
 SWTPM_FAKE_CTRL_PORT=65456
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 
 SWTPM_LOCALCA_DIR="${workdir}/my localca"
 SWTPM_LOCALCA_CONF="${workdir}/my localca/swtpm-localca.conf"

diff --git a/tests/test_tpm2_save_load_state_2 b/tests/test_tpm2_save_load_state_2
index 84af9ba66943d951a510ae9fd5fd42228c4699cb..26b1705b07327b56b38edd1714fedf48dae946b7 100755 (executable)
--- a/tests/test_tpm2_save_load_state_2
+++ b/tests/test_tpm2_save_load_state_2
@@ -25,7 +25,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 SWTPM=swtpm
 SWTPM_EXE=${SWTPM_EXE:-$ROOT/src/swtpm/$SWTPM}
 SWTPM_IOCTL=$ROOT/src/swtpm_ioctl/swtpm_ioctl
-TPMDIR=`mktemp -d`
+TPMDIR="$(mktemp -d)" || exit 1
 PID_FILE=$TPMDIR/${SWTPM}.pid
 SOCK_PATH=$TPMDIR/sock
 CMD_PATH=$TPMDIR/cmd

diff --git a/tests/test_tpm2_save_load_state_2_block b/tests/test_tpm2_save_load_state_2_block
index 6408ab572c11b0ae0d9a4cbf64618949986476e1..cc151ff3c6af3f07716f7e03e235a6c4b6fe3450 100755 (executable)
--- a/tests/test_tpm2_save_load_state_2_block
+++ b/tests/test_tpm2_save_load_state_2_block
@@ -10,7 +10,7 @@ if [ "$(id -u)" -ne 0 ]; then
        exit 77
 fi
 
-STATEDIR=$(mktemp -d)
+STATEDIR="$(mktemp -d)" || exit 1
 STATEIMG=$STATEDIR/tpm2.img
 STATEFILE=""
 

diff --git a/tests/test_tpm2_save_load_state_3 b/tests/test_tpm2_save_load_state_3
index 7f15b2063e485b3b90d901caa5131a4751b188b7..42ba8d60928758091e39fc9e2fa68e9027c8452f 100755 (executable)
--- a/tests/test_tpm2_save_load_state_3
+++ b/tests/test_tpm2_save_load_state_3
@@ -25,7 +25,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 SWTPM=swtpm
 SWTPM_EXE=${SWTPM_EXE:-$ROOT/src/swtpm/$SWTPM}
 SWTPM_IOCTL=$ROOT/src/swtpm_ioctl/swtpm_ioctl
-TPMDIR=`mktemp -d`
+TPMDIR="$(mktemp -d)" || exit 1
 PID_FILE=$TPMDIR/${SWTPM}.pid
 SOCK_PATH=$TPMDIR/sock
 CMD_PATH=$TPMDIR/cmd

diff --git a/tests/test_tpm2_swtpm_cert b/tests/test_tpm2_swtpm_cert
index b2badb207670fdb1cd76a7026d68ab18718b62b7..4319cc85120c23e730d0ef57679fecc725e1f8ec 100755 (executable)
--- a/tests/test_tpm2_swtpm_cert
+++ b/tests/test_tpm2_swtpm_cert
@@ -7,7 +7,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 SWTPM_CERT=${SWTPM_CERT:-${ROOT}/src/swtpm_cert/swtpm_cert}
 
-cert=$(mktemp)
+cert="$(mktemp)" || exit 1
 
 trap "cleanup" SIGTERM EXIT
 

diff --git a/tests/test_tpm2_swtpm_cert_ecc b/tests/test_tpm2_swtpm_cert_ecc
index 43b74594c1409de7fe8809a3fd26fef1dc05e9ce..79a0488fb7e6820ecc98512d3e277bc2a4ee0332 100755 (executable)
--- a/tests/test_tpm2_swtpm_cert_ecc
+++ b/tests/test_tpm2_swtpm_cert_ecc
@@ -7,7 +7,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 SWTPM_CERT=${SWTPM_CERT:-${ROOT}/src/swtpm_cert/swtpm_cert}
 
-cert=$(mktemp)
+cert="$(mktemp)" || exit 1
 
 trap "cleanup" SIGTERM EXIT
 

diff --git a/tests/test_tpm2_swtpm_localca b/tests/test_tpm2_swtpm_localca
index 8cc018309db5bfc1f44e2fea8dd7d529db84ef30..0d6e1439580ab5cd8af73ca1d7a16c19690ff7c2 100755 (executable)
--- a/tests/test_tpm2_swtpm_localca
+++ b/tests/test_tpm2_swtpm_localca
@@ -9,7 +9,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 SWTPM_LOCALCA=${TOPBUILD}/src/swtpm_localca/swtpm_localca
 
-workdir=$(mktemp -d "/tmp/path with spaces.XXXXXX")
+workdir="$(mktemp -d "/tmp/path with spaces.XXXXXX")" || exit 1
 
 ek="80" # 2048 bit key must have highest bit set
 for ((i = 1; i < 256; i++)); do

diff --git a/tests/test_tpm2_swtpm_localca_pkcs11.test b/tests/test_tpm2_swtpm_localca_pkcs11.test
index 1dc5ef7e1e276abcff437ed0d9dc8c1ab689e7bb..c81989d85e33c787c4eb4ab4d6b82b4f3935f674 100755 (executable)
--- a/tests/test_tpm2_swtpm_localca_pkcs11.test
+++ b/tests/test_tpm2_swtpm_localca_pkcs11.test
@@ -9,7 +9,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 SWTPM_LOCALCA=${TOPBUILD}/src/swtpm_localca/swtpm_localca
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 if [ $? -ne 0 ]; then
        exit 1
 fi

diff --git a/tests/test_tpm2_swtpm_setup_create_cert b/tests/test_tpm2_swtpm_setup_create_cert
index 635277bf8937ce3c122ec3b1b43c5ae7907b1b62..6f43155694b62f98d76281b9164f3158e06cab6b 100755 (executable)
--- a/tests/test_tpm2_swtpm_setup_create_cert
+++ b/tests/test_tpm2_swtpm_setup_create_cert
@@ -12,7 +12,7 @@ skip_test_no_tpm20 "${SWTPM_EXE}"
 
 SWTPM_LOCALCA=${TOPBUILD}/src/swtpm_localca/swtpm_localca
 
-workdir=$(mktemp -d "/tmp/path with spaces.XXXXXX")
+workdir="$(mktemp -d "/tmp/path with spaces.XXXXXX")" || exit 1
 
 SIGNINGKEY=${workdir}/signingkey.pem
 ISSUERCERT=${workdir}/issuercert.pem

diff --git a/tests/test_tpm2_swtpm_setup_overwrite b/tests/test_tpm2_swtpm_setup_overwrite
index 742af41ac41695bef74fcfdd777bf0f7517222c4..eac7e4d92907bfe1f1dd726ecc822be1dff02802 100755 (executable)
--- a/tests/test_tpm2_swtpm_setup_overwrite
+++ b/tests/test_tpm2_swtpm_setup_overwrite
@@ -21,7 +21,7 @@ function cleanup()
 
 # Test 1: --not-overwrite with dummy state file
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 statefile="${workdir}/${STATEBASENAME}"
 dummydata="DUMMY"
 echo $dummydata > ${statefile}
@@ -53,7 +53,7 @@ cleanup
 
 # Test 2: --overwrite with dummy state file
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 statefile="${workdir}/${STATEBASENAME}"
 dummydata="DUMMY"
 echo $dummydata > ${statefile}
@@ -85,7 +85,7 @@ cleanup
 
 # Test 3: neither "--overwrite" nor "--not-overwrite" with dummy state file
 
-workdir=$(mktemp -d)
+workdir="$(mktemp -d)" || exit 1
 statefile="${workdir}/${STATEBASENAME}"
 dummydata="DUMMY"
 echo $dummydata > ${statefile}

diff --git a/tests/test_tpm2_vtpm_proxy b/tests/test_tpm2_vtpm_proxy
index 900d99f81d556c5255107d3dfd10a5b741f36d0f..b80e5c400f367aec6509ca3b55c8eb9dc28fb1e4 100755 (executable)
--- a/tests/test_tpm2_vtpm_proxy
+++ b/tests/test_tpm2_vtpm_proxy
@@ -13,7 +13,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 SWTPM=swtpm
 SWTPM_EXE=$ROOT/src/swtpm/$SWTPM
-TPM_PATH=$(mktemp -d)
+TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm2-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm2-00.volatilestate
 PID_FILE=$TPM_PATH/${SWTPM}.pid

diff --git a/tests/test_vtpm_proxy b/tests/test_vtpm_proxy
index 41badb032cd9ccbc24d753bdcbaf6e0a0ffcbf1d..e13b64137ed966dda62bbbd64622363b5d360652 100755 (executable)
--- a/tests/test_vtpm_proxy
+++ b/tests/test_vtpm_proxy
@@ -13,7 +13,7 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 SWTPM=swtpm
 SWTPM_EXE=${SWTPM_EXE:-$ROOT/src/swtpm/$SWTPM}
-TPM_PATH=$(mktemp -d)
+TPM_PATH="$(mktemp -d)" || exit 1
 STATE_FILE=$TPM_PATH/tpm-00.permall
 VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
 PID_FILE=$TPM_PATH/${SWTPM}.pid