summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2014-11-12 16:20:50 -0800
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-11-14 23:56:55 +0000
commitefa37b87f2b4cd4b4f515e96201502ae0408cec7 (patch)
treebfa936c35d93779b80d1c864e36fca91a62b31ab /Makefile
parent7c1eee09eff54c6e60a3b261e6df790c11331695 (diff)
downloadvboot-efa37b87f2b4cd4b4f515e96201502ae0408cec7.tar.gz
vboot2: Add api-level functions to use new data structures
And associated unit tests. And fix a memory overwrite in the old vb_api_tests.c, which apparently didn't touch a critical piece of the shared work buffer, but was still wrong. (This was a problem in the test, not in the code being tested.) BUG=chromium:423882 BRANCH=none TEST=VBOOT2=1 make runtests Change-Id: I322fb7e6bb5214b0adcf5d6d48a0cd238abba88e Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/229738 Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 07aabaf1..b1f5cbe9 100644
--- a/Makefile
+++ b/Makefile
@@ -282,6 +282,7 @@ VBSLK_SRCS = \
# Firmware library source needed for smaller library 2
FWLIB2_SRCS = \
firmware/2lib/2api.c \
+ firmware/2lib/2api2.c \
firmware/2lib/2common.c \
firmware/2lib/2common2.c \
firmware/2lib/2crc8.c \
@@ -633,6 +634,7 @@ endif
ifneq (${VBOOT2},)
TEST_NAMES += \
tests/vb2_api_tests \
+ tests/vb2_api2_tests \
tests/vb2_common_tests \
tests/vb2_common2_tests \
tests/vb2_common3_tests \
@@ -936,7 +938,7 @@ tests: ${TEST_BINS}
${TEST_BINS}: ${UTILLIB} ${TESTLIB}
${TEST_BINS}: INCLUDES += -Itests
-${TEST_BINS}: LIBS = ${UTILLIB} ${TESTLIB}
+${TEST_BINS}: LIBS = ${TESTLIB} ${UTILLIB}
${TESTLIB}: ${TESTLIB_OBJS}
@$(PRINTF) " RM $(subst ${BUILD}/,,$@)\n"
@@ -1170,6 +1172,7 @@ runmisctests: test_setup
.PHONY: run2tests
run2tests: test_setup
${RUNTEST} ${BUILD_RUN}/tests/vb2_api_tests
+ ${RUNTEST} ${BUILD_RUN}/tests/vb2_api2_tests
${RUNTEST} ${BUILD_RUN}/tests/vb2_common_tests
${RUNTEST} ${BUILD_RUN}/tests/vb2_common2_tests ${TEST_KEYS}
${RUNTEST} ${BUILD_RUN}/tests/vb2_common3_tests ${TEST_KEYS}