summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMattias Nissler <mnissler@chromium.org>2018-02-23 12:04:23 +0100
committerchrome-bot <chrome-bot@chromium.org>2018-04-09 05:52:55 -0700
commit13fcffe754b3b451dea54b5079fe9b7e30d685d1 (patch)
tree6ca568aed95aa7bda6bc163817f191f715560005 /Makefile
parent96766893f35e25c0dffe9e7961c5f74728479772 (diff)
downloadvboot-13fcffe754b3b451dea54b5079fe9b7e30d685d1.tar.gz
tpm_lite: Drop FOR_TEST for tlcl.c
firmware/lib/tpm_lite.c turned off CHROMEOS_ENVIRONMENT if FOR_TEST is enabled, resulting in a situation where code specific to CHROMEOS_ENVIRONMENT couldn't be tested. Fortunately, AFAICS tlcl_tests does not use FOR_TEST for anything useful any longer, so just drop it. BRANCH=None BUG=None TEST=FEATURES=test emerge-$BOARD -v1 vboot_reference Change-Id: I7f08ef6d2343bc60a6d2982c3cc7bae0507d94d5 Reviewed-on: https://chromium-review.googlesource.com/937703 Commit-Ready: Mattias Nissler <mnissler@chromium.org> Tested-by: Mattias Nissler <mnissler@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 0 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 1f3e7f66..0480bc59 100644
--- a/Makefile
+++ b/Makefile
@@ -390,7 +390,6 @@ TLCL_SRCS = \
firmware/lib/tpm2_lite/tlcl.c \
firmware/lib/tpm2_lite/marshaling.c
endif
-TLCL_OBJS_FOR_TEST = $(TLCL_SRCS:%.c=${BUILD}/%_for_test.o)
# Support real TPM unless BIOS sets MOCK_TPM
ifeq (${MOCK_TPM},)
@@ -1288,12 +1287,6 @@ ${BUILD}/tests/rollback_index2_tests: \
TEST_OBJS += ${BUILD}/firmware/lib/rollback_index_for_test.o
endif
-${BUILD}/tests/tlcl_tests: OBJS += \
- ${TLCL_OBJS_FOR_TEST}
-${BUILD}/tests/tlcl_tests: \
- ${TLCL_OBJS_FOR_TEST}
-TEST_OBJS += ${TLCL_OBJS_FOR_TEST}
-
ifeq (${TPM2_MODE},)
# TODO(apronin): tests for TPM2 case?
TLCL_TEST_BINS = $(addprefix ${BUILD}/,${TLCL_TEST_NAMES})