diff options
| author | Joel Kitching <kitching@google.com> | 2019-07-22 14:21:35 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-07-24 06:53:41 +0000 |
| commit | e050a2c88fc963cb97d9794849e9e2b60fabbe77 (patch) | |
| tree | f037b8c93a7dc4b8a5d23c9b7a643d1dedfc71e0 /tests | |
| parent | 34abb32ed2e48ccad95320c37fb001df8e3442fd (diff) | |
| download | vboot-e050a2c88fc963cb97d9794849e9e2b60fabbe77.tar.gz | |
vboot: deprecate VbExError function
Convert uses of this function to call VB2_DEBUG and manually
exit if necessary.
BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none
Change-Id: I9006b1a9c66645757d33310d96207233b88eaed5
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1710340
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tpm_lite/tpmtest_enable.c | 4 | ||||
| -rw-r--r-- | tests/tpm_lite/tpmtest_writelimit.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/tpm_lite/tpmtest_enable.c b/tests/tpm_lite/tpmtest_enable.c index 645cd467..c2fe54b0 100644 --- a/tests/tpm_lite/tpmtest_enable.c +++ b/tests/tpm_lite/tpmtest_enable.c @@ -8,6 +8,7 @@ #include <stdio.h> +#include "2common.h" #include "host_common.h" #include "tlcl.h" #include "tlcl_tests.h" @@ -27,7 +28,8 @@ int main(int argc, char** argv) { TPM_CHECK(TlclGetFlags(&disable, &deactivated, NULL)); printf("disable is %d, deactivated is %d\n", disable, deactivated); if (disable == 1 || deactivated == 1) { - VbExError("failed to enable or activate"); + VB2_DEBUG("failed to enable or activate"); + return 1; } printf("TEST SUCCEEDED\n"); return 0; diff --git a/tests/tpm_lite/tpmtest_writelimit.c b/tests/tpm_lite/tpmtest_writelimit.c index 66dcc036..cedcd831 100644 --- a/tests/tpm_lite/tpmtest_writelimit.c +++ b/tests/tpm_lite/tpmtest_writelimit.c @@ -10,6 +10,7 @@ #include <stdint.h> #include <stdlib.h> +#include "2common.h" #include "host_common.h" #include "tlcl.h" #include "tlcl_tests.h" @@ -39,8 +40,9 @@ int main(int argc, char** argv) { VbAssert(i >= TPM_MAX_NV_WRITES_NOOWNER); break; default: - VbExError("unexpected error code %d (0x%x)\n", + VB2_DEBUG("unexpected error code %d (0x%x)\n", result, result); + exit(1); } } } |