diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2015-01-27 13:59:35 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-01-28 11:13:58 +0000 |
| commit | 5fb14634b9f7618592b9e88d9aa74b2111f15ee1 (patch) | |
| tree | 6f75ab835a0229adf8ce216f732ac7f6bb70d4b3 | |
| parent | 40890c5cbb0b55dad12ff03873dff7789eb3f130 (diff) | |
| download | vboot-5fb14634b9f7618592b9e88d9aa74b2111f15ee1.tar.gz | |
futility: extract vb2_verify_fw to an external test
The vb2_verify_fw command is used only in a host-side test. It
doesn't need to be built into futility. This makes it a separate
executable used just for that test.
BUG=chromium:231547
BRANCH=none
TEST=make VBOOT2=1 runtests
Note that tests/vb2_firmware_tests.sh still passes, now using an
external vb2_verify_fw executable instead of a futility command.
Change-Id: Iee58df065e7a762369c5e691f6c2093de9122ed2
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/243630
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | tests/vb20_verify_fw.c (renamed from futility/cmd_vb2_verify_fw.c) | 7 | ||||
| -rwxr-xr-x | tests/vb2_firmware_tests.sh | 4 |
3 files changed, 6 insertions, 14 deletions
@@ -596,11 +596,6 @@ FUTIL_SRCS = \ futility/traversal.c \ futility/vb1_helper.c -ifneq (${VBOOT2},) -FUTIL_SRCS += \ - futility/cmd_vb2_verify_fw.c -endif - # List of commands built in futility and futility_s. FUTIL_STATIC_CMD_LIST = ${BUILD}/gen/futility_static_cmds.c FUTIL_CMD_LIST = ${BUILD}/gen/futility_cmds.c @@ -679,9 +674,11 @@ TEST20_NAMES = \ tests/vb20_api_tests \ tests/vb20_common_tests \ tests/vb20_common2_tests \ + tests/vb20_verify_fw.c \ tests/vb20_common3_tests \ tests/vb20_misc_tests \ - tests/vb20_rsa_padding_tests + tests/vb20_rsa_padding_tests \ + tests/vb20_verify_fw TEST21_NAMES = \ tests/vb21_api_tests \ diff --git a/futility/cmd_vb2_verify_fw.c b/tests/vb20_verify_fw.c index 53079bb1..e070ff39 100644 --- a/futility/cmd_vb2_verify_fw.c +++ b/tests/vb20_verify_fw.c @@ -11,7 +11,6 @@ #include "2sysincludes.h" #include "2api.h" -#include "futility.h" const char *gbb_fname; const char *vblock_fname; @@ -137,7 +136,7 @@ static void print_help(const char *progname) printf("Usage: %s <gbb> <vblock> <body>\n", progname); } -static int do_vb2_verify_fw(int argc, char *argv[]) +int main(int argc, char *argv[]) { struct vb2_context ctx; uint8_t workbuf[16384] __attribute__ ((aligned (VB2_WORKBUF_ALIGN))); @@ -210,7 +209,3 @@ static int do_vb2_verify_fw(int argc, char *argv[]) return 0; } - -DECLARE_FUTIL_COMMAND(vb2_verify_fw, do_vb2_verify_fw, - "Verifies firmware using vboot2 library", - print_help); diff --git a/tests/vb2_firmware_tests.sh b/tests/vb2_firmware_tests.sh index fccacda2..4150572e 100755 --- a/tests/vb2_firmware_tests.sh +++ b/tests/vb2_firmware_tests.sh @@ -52,7 +52,7 @@ ${FUTILITY} vbutil_firmware \ echo 'Verifying test firmware using vb2_verify_fw' -# Verify the firmware using vboot2 utility -${FUTILITY} vb2_verify_fw gbb.test vblock.test body.test +# Verify the firmware using vboot2 checks +${BUILD_RUN}/tests/vb20_verify_fw gbb.test vblock.test body.test happy 'vb2_verify_fw succeeded' |