diff options
Diffstat (limited to 'tests/futility/test_show_contents.sh')
| -rwxr-xr-x | tests/futility/test_show_contents.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/futility/test_show_contents.sh b/tests/futility/test_show_contents.sh index fddebe81..9b3431d2 100755 --- a/tests/futility/test_show_contents.sh +++ b/tests/futility/test_show_contents.sh @@ -28,7 +28,7 @@ for file in $SHOW_FILES; do outfile="show.${file//\//_}" gotfile="${OUTDIR}/${outfile}" wantfile="${SRCDIR}/tests/futility/expect_output/${outfile}" - ( cd "${SRCDIR}" && ${FUTILITY} show "${file}" ) | tee "${gotfile}" + ( cd "${SRCDIR}" && "${FUTILITY}" show "${file}" ) | tee "${gotfile}" # Uncomment this to update the expected output #cp "${gotfile}" "${wantfile}" @@ -47,7 +47,7 @@ for file in $VBUTIL_KEY_FILES; do outfile="vbutil_key.${file//\//_}" gotfile="${OUTDIR}/${outfile}" wantfile="${SRCDIR}/tests/futility/expect_output/${outfile}" - ( cd "${SRCDIR}" && ${FUTILITY} vbutil_key --unpack "${file}" ) \ + ( cd "${SRCDIR}" && "${FUTILITY}" vbutil_key --unpack "${file}" ) \ | tee "${gotfile}" # Uncomment this to update the expected output @@ -62,7 +62,7 @@ file="tests/devkeys/kernel.keyblock" outfile="vbutil_keyblock.${file//\//_}" gotfile="${OUTDIR}/${outfile}" wantfile="${SRCDIR}/tests/futility/expect_output/${outfile}" -( cd "${SRCDIR}" && ${FUTILITY} vbutil_keyblock --unpack "${file}" \ +( cd "${SRCDIR}" && "${FUTILITY}" vbutil_keyblock --unpack "${file}" \ --signpubkey "tests/devkeys/kernel_subkey.vbpubk" ) \ | tee "${gotfile}" @@ -82,7 +82,7 @@ wantfile="${SRCDIR}/tests/futility/expect_output/${outfile}" # arbitrary non-zero numbers so we can verify they're printed # properly. dd bs=1024 count=16 if=/dev/urandom of="${TMP}.fw_main" -${FUTILITY} vbutil_firmware --vblock "${TMP}.vblock.old" \ +"${FUTILITY}" vbutil_firmware --vblock "${TMP}.vblock.old" \ --keyblock "${KEYDIR}/firmware.keyblock" \ --signprivate "${KEYDIR}/firmware_data_key.vbprivk" \ --version 12 \ @@ -91,7 +91,7 @@ ${FUTILITY} vbutil_firmware --vblock "${TMP}.vblock.old" \ --flags 42 # Verify -${FUTILITY} vbutil_firmware --verify "${TMP}.vblock.old" \ +"${FUTILITY}" vbutil_firmware --verify "${TMP}.vblock.old" \ --signpubkey "${KEYDIR}/root_key.vbpubk" \ --fv "${TMP}.fw_main" | tee "${gotfile}" @@ -102,5 +102,5 @@ diff "${wantfile}" "${gotfile}" # cleanup -rm -rf "${TMP}*" +rm -rf "${TMP}"* exit 0 |