mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2025-11-25 02:35:22 +00:00
vboot_reference: fix unittest when building with clang.
When linking vboot_api_kernel4_tests, there are two VbBootNormal()
available, the gcc chooses the one in vboot_api_kernel4_tests.c and
the test passes, the clang chooses the one in vboot_api_kernel.c and
make the unittest fail. This CL makes the one in vboot_api_kernel.c
a weak symbol so that clang can choose the one in
vboot_api_kernel4_tests.c
BUG=chromium:498469
BRANCH=none
TEST=CC=x86_64-cros-linux-gnu-clang FEATURES='test'
emerge-amd64-generic vboot_reference
Change-Id: Ibcb78ee055fc9485dbc2bcc1d1cf98144a1a3b64
Reviewed-on: https://chromium-review.googlesource.com/276504
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
This commit is contained in:
committed by
ChromeOS Commit Bot
parent
d7f0f93fa8
commit
637ff03502
@@ -36,6 +36,11 @@
|
|||||||
*/
|
*/
|
||||||
typedef uint32_t VbError_t;
|
typedef uint32_t VbError_t;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define test_mockable for mocking functions.
|
||||||
|
*/
|
||||||
|
#define test_mockable __attribute__((weak))
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Predefined error numbers. Success is 0. Errors are non-zero, but differ
|
* Predefined error numbers. Success is 0. Errors are non-zero, but differ
|
||||||
* between functions. For example, the TPM functions may pass through TPM
|
* between functions. For example, the TPM functions may pass through TPM
|
||||||
|
|||||||
@@ -238,7 +238,8 @@ int VbUserConfirms(VbCommonParams *cparams, uint32_t confirm_flags)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
VbError_t VbBootNormal(VbCommonParams *cparams, LoadKernelParams *p)
|
VbError_t test_mockable
|
||||||
|
VbBootNormal(VbCommonParams *cparams, LoadKernelParams *p)
|
||||||
{
|
{
|
||||||
/* Boot from fixed disk only */
|
/* Boot from fixed disk only */
|
||||||
VBDEBUG(("Entering %s()\n", __func__));
|
VBDEBUG(("Entering %s()\n", __func__));
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ uint64_t VbExGetTimer(void)
|
|||||||
return (uint64_t)tv.tv_sec * 1000000 + (uint64_t)tv.tv_usec;
|
return (uint64_t)tv.tv_sec * 1000000 + (uint64_t)tv.tv_usec;
|
||||||
}
|
}
|
||||||
|
|
||||||
VbError_t VbExNvStorageRead(uint8_t *buf)
|
VbError_t test_mockable VbExNvStorageRead(uint8_t *buf)
|
||||||
{
|
{
|
||||||
return VBERROR_SUCCESS;
|
return VBERROR_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user