From b90e507556283b02b5dffb7191cb99ea22dea087 Mon Sep 17 00:00:00 2001
From: Joel Kitching <kitching@google.com>
Date: Thu, 29 Aug 2019 16:17:01 +0800
Subject: 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>
---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a9d5d5df..f4caaaa8 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-- 
cgit v1.2.1