diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2014-09-05 12:52:27 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-09-12 03:39:40 +0000 |
| commit | a1d9fe6eecf82540d31d34bba988e4838d295302 (patch) | |
| tree | 94bc87f0c92ca76f85fcfcbd8a709bb6d776b778 /tests/vb2_firmware_tests.sh | |
| parent | a19b00dfd0c17681b71bd61994854dff3f3576a3 (diff) | |
| download | vboot-a1d9fe6eecf82540d31d34bba988e4838d295302.tar.gz | |
futility: stop using the symlink names in utility scripts
We still create the symlinks (FOO -> futility), but this
change invokes those built-in functions with "futility FOO ..."
instead of using the FOO symlink.
Note that the scripts/ directory is unchanged. That's a
separate CL, since we don't have tests for that.
BUG=chromium:231547
BRANCH=ToT
TEST=make runtests
In addition to running "make runtests", I temporarily
modified the Makefile to avoid creating the symlinks at all.
The tests still passed.
Change-Id: I96863259b9df02a3611f759a7509bf4090ae03e8
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/216717
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'tests/vb2_firmware_tests.sh')
| -rwxr-xr-x | tests/vb2_firmware_tests.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/vb2_firmware_tests.sh b/tests/vb2_firmware_tests.sh index e1981dba..fccacda2 100755 --- a/tests/vb2_firmware_tests.sh +++ b/tests/vb2_firmware_tests.sh @@ -24,24 +24,25 @@ echo 'This is a test firmware body. This is only a test. Lalalalala' \ > body.test # Pack keys using original vboot utilities -${BIN_DIR}/vbutil_key --pack rootkey.test \ +${FUTILITY} vbutil_key --pack rootkey.test \ --key ${TESTKEY_DIR}/key_rsa8192.keyb --algorithm 11 -${BIN_DIR}/vbutil_key --pack fwsubkey.test \ +${FUTILITY} vbutil_key --pack fwsubkey.test \ --key ${TESTKEY_DIR}/key_rsa4096.keyb --algorithm 7 -${BIN_DIR}/vbutil_key --pack kernkey.test \ +${FUTILITY} vbutil_key --pack kernkey.test \ --key ${TESTKEY_DIR}/key_rsa2048.keyb --algorithm 4 # Create a GBB with the root key -${BIN_DIR}/gbb_utility -c 128,2400,0,0 gbb.test -${BIN_DIR}/gbb_utility gbb.test -s --hwid='Test GBB' --rootkey=rootkey.test +${FUTILITY} gbb_utility -c 128,2400,0,0 gbb.test +${FUTILITY} gbb_utility gbb.test -s --hwid='Test GBB' \ + --rootkey=rootkey.test # Keyblock with firmware subkey is signed by root key -${BIN_DIR}/vbutil_keyblock --pack keyblock.test \ +${FUTILITY} vbutil_keyblock --pack keyblock.test \ --datapubkey fwsubkey.test \ --signprivate ${TESTKEY_DIR}/key_rsa8192.sha512.vbprivk # Firmware preamble is signed with the firmware subkey -${BIN_DIR}/vbutil_firmware \ +${FUTILITY} vbutil_firmware \ --vblock vblock.test \ --keyblock keyblock.test \ --signprivate ${TESTKEY_DIR}/key_rsa4096.sha256.vbprivk \ @@ -52,6 +53,6 @@ ${BIN_DIR}/vbutil_firmware \ echo 'Verifying test firmware using vb2_verify_fw' # Verify the firmware using vboot2 utility -${BIN_DIR}/futility vb2_verify_fw gbb.test vblock.test body.test +${FUTILITY} vb2_verify_fw gbb.test vblock.test body.test happy 'vb2_verify_fw succeeded' |