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/gen_fuzz_test_cases.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/gen_fuzz_test_cases.sh')
| -rwxr-xr-x | tests/gen_fuzz_test_cases.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/gen_fuzz_test_cases.sh b/tests/gen_fuzz_test_cases.sh index 97c22304..9ca2043f 100755 --- a/tests/gen_fuzz_test_cases.sh +++ b/tests/gen_fuzz_test_cases.sh @@ -26,19 +26,21 @@ function generate_fuzzing_images { echo "Generating key blocks..." # Firmware key block - RSA8192/SHA512 root key, RSA4096/SHA512 firmware # signing key. - ${BIN_DIR}/vbutil_keyblock --pack ${TESTCASE_DIR}/firmware.keyblock \ + ${FUTILITY} vbutil_keyblock \ + --pack ${TESTCASE_DIR}/firmware.keyblock \ --datapubkey ${TESTKEY_DIR}/key_rsa4096.sha512.vbpubk \ --signprivate ${TESTKEY_DIR}/key_rsa8192.sha1.vbprivk # Kernel key block - RSA4096/SHA512 kernel signing subkey, RSA4096/SHA512 # kernel signing key. - ${BIN_DIR}/vbutil_keyblock --pack ${TESTCASE_DIR}/kernel.keyblock \ + ${FUTILITY} vbutil_keyblock \ + --pack ${TESTCASE_DIR}/kernel.keyblock \ --datapubkey ${TESTKEY_DIR}/key_rsa4096.sha512.vbpubk \ --signprivate ${TESTKEY_DIR}/key_rsa4096.sha1.vbprivk \ --flags 15 echo "Generating signed firmware test image..." - ${BIN_DIR}/vbutil_firmware \ + ${FUTILITY} vbutil_firmware \ --vblock ${TESTCASE_DIR}/firmware.vblock \ --keyblock ${TESTCASE_DIR}/firmware.keyblock\ --signprivate ${TESTKEY_DIR}/key_rsa4096.sha256.vbprivk \ @@ -49,7 +51,7 @@ function generate_fuzzing_images { cp ${TESTKEY_DIR}/key_rsa8192.sha512.vbpubk ${TESTCASE_DIR}/root_key.vbpubk echo "Generating signed kernel test image..." - ${BIN_DIR}/vbutil_kernel \ + ${FUTILITY} vbutil_kernel \ --pack ${TESTCASE_DIR}/kernel.vblock.image \ --keyblock ${TESTCASE_DIR}/kernel.keyblock \ --signprivate ${TESTKEY_DIR}/key_rsa4096.sha256.vbprivk \ |