diff options
| author | Joel Kitching <kitching@google.com> | 2019-08-29 16:17:01 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-31 20:49:20 +0000 |
| commit | b90e507556283b02b5dffb7191cb99ea22dea087 (patch) | |
| tree | 3c546542c68990c87cc7bb36f25abcd3654814a9 | |
| parent | 33655b34f36efa06fc82c0cd5b8ee7674538f72b (diff) | |
| download | vboot-b90e507556283b02b5dffb7191cb99ea22dea087.tar.gz | |
vboot: prevent some tests from running when MOCK_TPM=1
tlcl_tests and rollback_index2_tests only work when
MOCK_TPM is disabled.
BUG=b:124141368, chromium:972956
TEST=make clean && make runtests
BRANCH=none
Change-Id: I3d09e2b02c72e2ee1b1b89769e433cc5cd513163
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1776278
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -705,8 +705,9 @@ TEST_NAMES = \ tests/vboot_kernel_tests \ tests/verify_kernel -ifeq (${TPM2_MODE},) +ifeq (${TPM2_MODE}${MOCK_TPM},) # TODO(apronin): tests for TPM2 case? +# tlcl_tests and rollback_index2_tests only work when MOCK_TPM is disabled TEST_NAMES += \ tests/tlcl_tests \ tests/rollback_index2_tests @@ -1294,7 +1295,9 @@ runtestscripts: test_setup genfuzztestcases .PHONY: runmisctests runmisctests: test_setup ${RUNTEST} ${BUILD_RUN}/tests/ec_sync_tests -ifeq (${TPM2_MODE},) +ifeq (${TPM2_MODE}${MOCK_TPM},) +# TODO(apronin): tests for TPM2 case? +# tlcl_tests and rollback_index2_tests only work when MOCK_TPM is disabled ${RUNTEST} ${BUILD_RUN}/tests/tlcl_tests ${RUNTEST} ${BUILD_RUN}/tests/rollback_index2_tests endif |