diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2019-02-28 20:05:27 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-05 09:21:44 -0700 |
| commit | 1d6c7bb9773f76aa70ce65822fa001ff72892cd2 (patch) | |
| tree | 3631462d9540df08d13cffa9a7f8e7e9bb3e7899 /fuzz/build.mk | |
| parent | 63bf8f8ba87b23378391b147f1b3e9fdcf3d8dc5 (diff) | |
| download | chrome-ec-1d6c7bb9773f76aa70ce65822fa001ff72892cd2.tar.gz | |
nvmem: test modifications to support the new scheme
This patch includes changes to support testing of the new nvmem
implementation.
Making fizz compatible required duplicating a lot of functionality
available in the test/ directory (fuzz/nvmem_tpm2_mock.c is very
similar to test/nvmem_tpm2_mock.c), but I could not find an easy way
to avoid it.
BRANCH=cr50, cr50-mp
BUG=b:69907320, b:129710256
CQ-DEPEND=CL:1496607
TEST=with the rest of the patches applied 'make buildall -j' succeeds,
which confirms both test and fuzz success.
Change-Id: Ife999b04d22f8ddbe9ea5d35f4c3e21f57592754
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1450278
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Diffstat (limited to 'fuzz/build.mk')
| -rw-r--r-- | fuzz/build.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fuzz/build.mk b/fuzz/build.mk index fda788fd93..76d7d13f5b 100644 --- a/fuzz/build.mk +++ b/fuzz/build.mk @@ -25,7 +25,7 @@ endif # Does your object file need to link against cstdlib? # Yes -> use <obj_name>-rw # Otherwise use <obj_name>-y -cr50_fuzz-rw = cr50_fuzz.o pinweaver_model.o mem_hash_tree.o +cr50_fuzz-rw = cr50_fuzz.o pinweaver_model.o mem_hash_tree.o nvmem_tpm2_mock.o host_command_fuzz-y = host_command_fuzz.o usb_pd_fuzz-y = usb_pd_fuzz.o @@ -35,6 +35,9 @@ $(out)/RW/fuzz/pinweaver_model.o: ${CR50_PROTO_HEADERS} $(out)/RW/fuzz/cr50_fuzz.o: ${CR50_PROTO_HEADERS} $(out)/RW/fuzz/cr50_fuzz.o: CPPFLAGS+=${LIBPROTOBUF_MUTATOR_CFLAGS} +TPM2_LIB_ROOT := $(CROS_WORKON_SRCROOT)/src/third_party/tpm2 +$(out)/RW/fuzz/nvmem_tpm2_mock.o: CFLAGS += -I$(TPM2_LIB_ROOT) + $(out)/cr50_fuzz.exe: $(out)/cryptoc/libcryptoc.a \ $(out)/gen/fuzz/cr50_fuzz.pb.o \ $(out)/gen/fuzz/pinweaver/pinweaver.pb.o \ |