diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 7 insertions, 19 deletions
@@ -427,13 +427,9 @@ TLCL_SRCS = \ firmware/lib/tpm2_lite/marshaling.c endif -# Support real TPM unless BIOS sets MOCK_TPM -ifeq (${MOCK_TPM},) -FWLIB_SRCS += \ - firmware/lib/secdata_tpm.c -else +# Support real TPM unless MOCK_TPM is set +ifneq (${MOCK_TPM},) FWLIB_SRCS += \ - firmware/lib/mocked_secdata_tpm.c \ firmware/lib/tpm_lite/mocked_tlcl.c endif @@ -723,16 +719,12 @@ TEST_NAMES = \ tests/vboot_kernel_tests \ tests/verify_kernel -ifeq (${MOCK_TPM},) -# secdata_tpm_tests and tlcl_tests only work when MOCK_TPM is disabled -TEST_NAMES += \ - tests/secdata_tpm_tests -ifeq (${TPM2_MODE},) +ifeq (${MOCK_TPM}${TPM2_MODE},) +# tlcl_tests only works when MOCK_TPM is disabled # TODO(apronin): tests for TPM2 case? TEST_NAMES += \ tests/tlcl_tests endif -endif TEST_FUTIL_NAMES = \ tests/futility/binary_editor \ @@ -1284,15 +1276,11 @@ runtestscripts: test_setup genfuzztestcases .PHONY: runmisctests runmisctests: test_setup -ifeq (${MOCK_TPM},) -# secdata_tpm_tests and tlcl_tests only work when MOCK_TPM is disabled - ${RUNTEST} ${BUILD_RUN}/tests/secdata_tpm_tests -ifeq (${TPM2_MODE},) -# TODO(apronin): tests for TPM2 case? + ${RUNTEST} ${BUILD_RUN}/tests/subprocess_tests +ifeq (${MOCK_TPM}${TPM2_MODE},) +# tlcl_tests only works when MOCK_TPM is disabled ${RUNTEST} ${BUILD_RUN}/tests/tlcl_tests endif -endif - ${RUNTEST} ${BUILD_RUN}/tests/subprocess_tests ${RUNTEST} ${BUILD_RUN}/tests/utility_string_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_devmode_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel2_tests |