diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-05-25 16:42:44 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-07-26 17:31:54 -0700 |
| commit | ca7251286655fe8865d0089bfc23b42ffececbf3 (patch) | |
| tree | 438e449305363449da687cf635cd35decba023e9 /tests/vb21_host_misc_tests.c | |
| parent | 2afa87360d3a4c357e4bb2d37fdff9cdefbe0ffc (diff) | |
| download | vboot-ca7251286655fe8865d0089bfc23b42ffececbf3.tar.gz | |
vboot: Disambiguate vb2.1 structs and functions
Futility needs to link against both vboot1/vboot2.0 and vboot2.1
functions. This was easy in the past because it did (vboot1 +
vboot2.1) and there's no overlap.
In replacing vboot1 function calls and structs with vboot2.0, now there
are symbol collisions between vboot2.0 and vboot2.1. For example, both
of them use a struct called vb2_signature, but the structs are defined
differently. Functions which operate on those structs also overload.
Rename the vb2.1 structs to start with vb21_ instead of vb2_. Do the
same for vb2.1 functions which operate on vb2.1 data.
BUG=chromium:611535
BRANCH=none
TEST=make runtests
Change-Id: I24defd87cbd9ef64239faf1a8e98ab2372d27539
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/347458
Reviewed-by: Daisuke Nojiri <dnojiri@google.com>
Diffstat (limited to 'tests/vb21_host_misc_tests.c')
| -rw-r--r-- | tests/vb21_host_misc_tests.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/vb21_host_misc_tests.c b/tests/vb21_host_misc_tests.c index 125d0c36..c4af29a0 100644 --- a/tests/vb21_host_misc_tests.c +++ b/tests/vb21_host_misc_tests.c @@ -10,7 +10,7 @@ #include "2sysincludes.h" #include "2common.h" -#include "vb2_common.h" +#include "vb21_common.h" #include "host_common.h" #include "host_misc.h" @@ -35,8 +35,8 @@ static void file_tests(const char *temp_dir) uint8_t *read_data; uint32_t read_size; - uint8_t cbuf[sizeof(struct vb2_struct_common) + 12]; - struct vb2_struct_common *c = (struct vb2_struct_common *)cbuf; + uint8_t cbuf[sizeof(struct vb21_struct_common) + 12]; + struct vb21_struct_common *c = (struct vb21_struct_common *)cbuf; xasprintf(&testfile, "%s/file_tests.dat", temp_dir); @@ -61,7 +61,7 @@ static void file_tests(const char *temp_dir) c->total_size = sizeof(cbuf); c->magic = 0x1234; cbuf[sizeof(cbuf) - 1] = 0xed; /* Some non-zero data at the end */ - TEST_SUCC(vb2_write_object(testfile, c), "vb2_write_object() good"); + TEST_SUCC(vb21_write_object(testfile, c), "vb2_write_object() good"); TEST_SUCC(vb2_read_file(testfile, &read_data, &read_size), "vb2_read_file() object"); TEST_EQ(read_size, c->total_size, " data size"); |