diff options
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/futility/test_dump_fmap.sh | 2 | ||||
-rwxr-xr-x | tests/futility/test_gbb_utility.sh | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/futility/test_dump_fmap.sh b/tests/futility/test_dump_fmap.sh index bcdb27e6..5a58a0c8 100755 --- a/tests/futility/test_dump_fmap.sh +++ b/tests/futility/test_dump_fmap.sh @@ -10,7 +10,7 @@ TMP="$me.tmp" cd "$OUTDIR" # Good FMAP -"$FUTILITY" dump_fmap -f "${SCRIPTDIR}/data_fmap.bin" > "$TMP" +"$FUTILITY" dump_fmap -F "${SCRIPTDIR}/data_fmap.bin" > "$TMP" cmp "${SCRIPTDIR}/data_fmap_expect_f.txt" "$TMP" "$FUTILITY" dump_fmap -p "${SCRIPTDIR}/data_fmap.bin" > "$TMP" diff --git a/tests/futility/test_gbb_utility.sh b/tests/futility/test_gbb_utility.sh index 3d8e576b..3dc7d351 100755 --- a/tests/futility/test_gbb_utility.sh +++ b/tests/futility/test_gbb_utility.sh @@ -22,9 +22,11 @@ ${FUTILITY} gbb_utility -s --flags=0xdeadbeef ${TMP}.blob ${FUTILITY} gbb_utility -g --flags ${TMP}.blob | grep -i 0xdeadbeef # HWID length should include the terminating null - this is too long -if ${FUTILITY} gbb_utility -s -i "0123456789ABCDEF" ${TMP}.blob; then false; fi +if ${FUTILITY} gbb_utility -s --hwid="0123456789ABCDEF" ${TMP}.blob; then + false; +fi # This works -${FUTILITY} gbb_utility -s -i "0123456789ABCDE" ${TMP}.blob +${FUTILITY} gbb_utility -s --hwid="0123456789ABCDE" ${TMP}.blob # Read it back? ${FUTILITY} gbb_utility -g ${TMP}.blob | grep "0123456789ABCDE" @@ -184,7 +186,7 @@ if ${FUTILITY} gbb_utility -g ${TMP}.blob.bad; then false; fi # hwid_size == 0 doesn't complain, but can't be set cat ${TMP}.blob | ${REPLACE} 0x14 0x00 > ${TMP}.blob.bad ${FUTILITY} gbb_utility -g ${TMP}.blob.bad -if ${FUTILITY} gbb_utility -s -i "A" ${TMP}.blob.bad; then false; fi +if ${FUTILITY} gbb_utility -s --hwid="A" ${TMP}.blob.bad; then false; fi # rootkey_size == 0 gives warning, gets nothing, can't be set cat ${TMP}.blob | ${REPLACE} 0x1c 0x00 > ${TMP}.blob.bad @@ -213,7 +215,7 @@ if ${FUTILITY} gbb_utility -s --recoverykey ${TMP}.data2 ${TMP}.blob.bad; then f # See that the digest is updated properly. hwid="123456789ABCDEF" -${FUTILITY} gbb_utility -s -i ${hwid} ${TMP}.blob +${FUTILITY} gbb_utility -s --hwid=${hwid} ${TMP}.blob expect=$(echo -n "$hwid" | sha256sum | cut -d ' ' -f 1) [ $(echo -n ${expect} | wc -c) == "64" ] ${FUTILITY} gbb_utility -g --digest ${TMP}.blob | grep ${expect} |