diff options
| author | Joel Kitching <kitching@google.com> | 2020-01-22 11:59:47 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-03 17:44:30 +0000 |
| commit | fb253e8ddf5cc882769420ca0ed8f14131c758de (patch) | |
| tree | ce2d7d65b68893c0e59dfaaf8d3e382fecfbf49f /tests/futility/test_show_vs_verify.sh | |
| parent | 708bce40ba1a3539acff50ea73b737f75dbe5918 (diff) | |
| download | vboot-stabilize-12881.B.tar.gz | |
vboot: unify common.sh for testing scriptsstabilize-12881.B
Use tests/common.sh instead of tests/futility/common.sh.
Correct SCRIPT_DIR value to allow running run_test_scripts.sh
standalone without using Makefile.
BUG=b:124141368, chromium:605348
TEST=make clean && make runfutiltests
BRANCH=none
Change-Id: I107952826ea9a3a3816d9c13206aa48bee63ac6c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2014236
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'tests/futility/test_show_vs_verify.sh')
| -rwxr-xr-x | tests/futility/test_show_vs_verify.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/futility/test_show_vs_verify.sh b/tests/futility/test_show_vs_verify.sh index b575d160..4981a38d 100755 --- a/tests/futility/test_show_vs_verify.sh +++ b/tests/futility/test_show_vs_verify.sh @@ -28,7 +28,7 @@ ${FUTILITY} verify ${DEVKEYS}/firmware.keyblock \ #### firmware vblock # Get some bits to look at -${FUTILITY} dump_fmap -x ${SCRIPTDIR}/data/bios_peppy_mp.bin \ +${FUTILITY} dump_fmap -x ${SCRIPT_DIR}/futility/data/bios_peppy_mp.bin \ GBB:${TMP}.gbb VBLOCK_A:${TMP}.vblock_a FW_MAIN_A:${TMP}.fw_main_a ${FUTILITY} gbb -g -k ${TMP}.rootkey ${TMP}.gbb @@ -53,20 +53,21 @@ ${FUTILITY} verify ${TMP}.vblock_a \ #### kernel partition -${FUTILITY} show ${SCRIPTDIR}/data/rec_kernel_part.bin +${FUTILITY} show ${SCRIPT_DIR}/futility/data/rec_kernel_part.bin -${FUTILITY} show ${SCRIPTDIR}/data/rec_kernel_part.bin \ +${FUTILITY} show ${SCRIPT_DIR}/futility/data/rec_kernel_part.bin \ --publickey ${DEVKEYS}/kernel_subkey.vbpubk -${FUTILITY} show ${SCRIPTDIR}/data/rec_kernel_part.bin \ +${FUTILITY} show ${SCRIPT_DIR}/futility/data/rec_kernel_part.bin \ --publickey ${DEVKEYS}/recovery_key.vbpubk -if ${FUTILITY} verify ${SCRIPTDIR}/data/rec_kernel_part.bin ; then false ; fi +if ${FUTILITY} verify ${SCRIPT_DIR}/futility/data/rec_kernel_part.bin ; \ + then false ; fi -if ${FUTILITY} verify ${SCRIPTDIR}/data/rec_kernel_part.bin \ +if ${FUTILITY} verify ${SCRIPT_DIR}/futility/data/rec_kernel_part.bin \ --publickey ${DEVKEYS}/kernel_subkey.vbpubk ; then false ; fi -${FUTILITY} verify ${SCRIPTDIR}/data/rec_kernel_part.bin \ +${FUTILITY} verify ${SCRIPT_DIR}/futility/data/rec_kernel_part.bin \ --publickey ${DEVKEYS}/recovery_key.vbpubk |