diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2016-09-22 12:44:18 -0700 |
|---|---|---|
| committer | Brian Norris <briannorris@chromium.org> | 2016-09-22 21:24:31 +0000 |
| commit | 0ea5e1ec4a15994a23d732988f46e74e52d8dadd (patch) | |
| tree | 8d8b43cfe994776b75b435cd2840c3183b21dd7a | |
| parent | 6f2ea5b7319e3bf097cdf64770abfa61ed9cb8db (diff) | |
| download | vboot-0ea5e1ec4a15994a23d732988f46e74e52d8dadd.tar.gz | |
Fix test failures when TPM2_MODE is defined
An earlier commit had added this:
ifeq (${TPM2_MODE},)
# TODO(apronin): tests for TPM2 case?
TEST_NAMES += \
tests/tlcl_tests \
tests/rollback_index2_tests
endif
but left this:
.PHONY: runmisctests
runmisctests: test_setup
${RUNTEST} ${BUILD_RUN}/tests/rollback_index2_tests
[...]
${RUNTEST} ${BUILD_RUN}/tests/tlcl_tests
So if TPM2_MODE is not null, those two test targets won't be
built. This CL puts those two into the same guard, so that
they won't be attempted if they're not built.
BUG=chrome-os-partner:57727
BRANCH=all
TEST=manual
Before, this fails:
FEATURES=test emerge-reef vboot_reference
Now, it passes.
Change-Id: Ic00f9f867d3d9c719d797907f00fda8bc5044504
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/388711
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1409,11 +1409,13 @@ runtestscripts: test_setup genfuzztestcases .PHONY: runmisctests runmisctests: test_setup +ifeq (${TPM2_MODE},) + ${RUNTEST} ${BUILD_RUN}/tests/tlcl_tests ${RUNTEST} ${BUILD_RUN}/tests/rollback_index2_tests +endif ${RUNTEST} ${BUILD_RUN}/tests/rollback_index3_tests ${RUNTEST} ${BUILD_RUN}/tests/rsa_utility_tests ${RUNTEST} ${BUILD_RUN}/tests/stateful_util_tests - ${RUNTEST} ${BUILD_RUN}/tests/tlcl_tests ${RUNTEST} ${BUILD_RUN}/tests/utility_string_tests ${RUNTEST} ${BUILD_RUN}/tests/utility_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_devmode_tests |