summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/vboot_api_devmode_tests.c36
-rw-r--r--tests/vboot_api_kernel_tests.c36
-rw-r--r--tests/vboot_audio_tests.c1
3 files changed, 36 insertions, 37 deletions
diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_api_devmode_tests.c
index 271f3428..cc24cee9 100644
--- a/tests/vboot_api_devmode_tests.c
+++ b/tests/vboot_api_devmode_tests.c
@@ -231,21 +231,21 @@ uint32_t VbExKeyboardRead(void) {
now = current_time;
if (kbd_fire_key && now >= kbd_fire_at) {
- VBDEBUG((" VbExKeyboardRead() - returning %d at %d msec\n",
- kbd_fire_key, now));
+ VB2_DEBUG(" VbExKeyboardRead() - returning %d at %d msec\n",
+ kbd_fire_key, now);
tmp = kbd_fire_key;
kbd_fire_key = 0;
return tmp;
}
- VBDEBUG((" VbExKeyboardRead() - returning %d at %d msec\n",
- 0, now));
+ VB2_DEBUG(" VbExKeyboardRead() - returning %d at %d msec\n",
+ 0, now);
return 0;
}
void VbExSleepMs(uint32_t msec) {
current_ticks += (uint64_t)msec * TICKS_PER_MSEC;
current_time = current_ticks / TICKS_PER_MSEC;
- VBDEBUG(("VbExSleepMs(%d) -> %d\n", msec, current_time));
+ VB2_DEBUG("VbExSleepMs(%d) -> %d\n", msec, current_time);
}
uint64_t VbExGetTimer(void) {
@@ -253,7 +253,7 @@ uint64_t VbExGetTimer(void) {
}
VbError_t VbExBeep(uint32_t msec, uint32_t frequency) {
- VBDEBUG(("VbExBeep(%d, %d) at %d msec\n", msec, frequency, current_time));
+ VB2_DEBUG("VbExBeep(%d, %d) at %d msec\n", msec, frequency, current_time);
if (current_event < max_events &&
msec == expected_event[current_event].msec &&
@@ -271,31 +271,31 @@ VbError_t VbExBeep(uint32_t msec, uint32_t frequency) {
VbError_t VbExDisplayScreen(uint32_t screen_type, uint32_t locale) {
switch(screen_type) {
case VB_SCREEN_BLANK:
- VBDEBUG(("VbExDisplayScreen(BLANK)\n"));
+ VB2_DEBUG("VbExDisplayScreen(BLANK)\n");
break;
case VB_SCREEN_DEVELOPER_WARNING:
- VBDEBUG(("VbExDisplayScreen(DEV)\n"));
+ VB2_DEBUG("VbExDisplayScreen(DEV)\n");
break;
case VB_SCREEN_DEVELOPER_EGG:
- VBDEBUG(("VbExDisplayScreen(EGG)\n"));
+ VB2_DEBUG("VbExDisplayScreen(EGG)\n");
break;
case VB_SCREEN_RECOVERY_REMOVE:
- VBDEBUG(("VbExDisplayScreen(REMOVE)\n"));
+ VB2_DEBUG("VbExDisplayScreen(REMOVE)\n");
break;
case VB_SCREEN_RECOVERY_INSERT:
- VBDEBUG(("VbExDisplayScreen(INSERT)\n"));
+ VB2_DEBUG("VbExDisplayScreen(INSERT)\n");
break;
case VB_SCREEN_RECOVERY_NO_GOOD:
- VBDEBUG(("VbExDisplayScreen(NO_GOOD)\n"));
+ VB2_DEBUG("VbExDisplayScreen(NO_GOOD)\n");
break;
case VB_SCREEN_OS_BROKEN:
- VBDEBUG(("VbExDisplayScreen(BROKEN)\n"));
+ VB2_DEBUG("VbExDisplayScreen(BROKEN)\n");
break;
default:
- VBDEBUG(("VbExDisplayScreen(%d)\n", screen_type));
+ VB2_DEBUG("VbExDisplayScreen(%d)\n", screen_type);
}
- VBDEBUG((" current_time is %d msec\n", current_time));
+ VB2_DEBUG(" current_time is %d msec\n", current_time);
return VBERROR_SUCCESS;
}
@@ -307,7 +307,7 @@ static void VbBootDeveloperSoundTest(void) {
int num_tests = sizeof(test) / sizeof(test_case_t);
for (i=0; i<num_tests; i++) {
- VBDEBUG(("STARTING %s ...\n", test[i].name));
+ VB2_DEBUG("STARTING %s ...\n", test[i].name);
ResetMocks();
gbb.flags = test[i].gbb_flags;
beep_return = test[i].beep_return;
@@ -316,8 +316,8 @@ static void VbBootDeveloperSoundTest(void) {
max_events = test[i].num_events;
expected_event = test[i].notes;
(void) VbBootDeveloper(&ctx, &cparams);
- VBDEBUG(("INFO: matched %d total %d expected %d\n",
- matched_events, current_event, test[i].num_events));
+ VB2_DEBUG("INFO: matched %d total %d expected %d\n",
+ matched_events, current_event, test[i].num_events);
TEST_TRUE(matched_events == test[i].num_events &&
current_event == test[i].num_events, test[i].name);
}
diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c
index 1d80dc4b..3214d442 100644
--- a/tests/vboot_api_kernel_tests.c
+++ b/tests/vboot_api_kernel_tests.c
@@ -232,7 +232,7 @@ VbError_t VbExDiskGetInfo(VbDiskInfo **infos_ptr, uint32_t *count,
int i;
int num_disks = 0;
- VBDEBUG(("My %s\n", __FUNCTION__));
+ VB2_DEBUG("My %s\n", __FUNCTION__);
*infos_ptr = mock_disks;
@@ -248,14 +248,14 @@ VbError_t VbExDiskGetInfo(VbDiskInfo **infos_ptr, uint32_t *count,
t->disks_to_provide[i].flags;
mock_disks[num_disks].handle = (VbExDiskHandle_t)
t->disks_to_provide[i].diskname;
- VBDEBUG((" mock_disk[%d] %" PRIu64 " %" PRIu64
- " 0x%x %s\n", i,
- mock_disks[num_disks].bytes_per_lba,
- mock_disks[num_disks].lba_count,
- mock_disks[num_disks].flags,
- (mock_disks[num_disks].handle
- ? (char *)mock_disks[num_disks].handle
- : "0")));
+ VB2_DEBUG(" mock_disk[%d] %" PRIu64 " %" PRIu64
+ " 0x%x %s\n", i,
+ mock_disks[num_disks].bytes_per_lba,
+ mock_disks[num_disks].lba_count,
+ mock_disks[num_disks].flags,
+ (mock_disks[num_disks].handle
+ ? (char *)mock_disks[num_disks].handle
+ : "0"));
num_disks++;
} else {
mock_disks[num_disks].handle =
@@ -268,8 +268,8 @@ VbError_t VbExDiskGetInfo(VbDiskInfo **infos_ptr, uint32_t *count,
else
*count = num_disks;
- VBDEBUG((" *count=%" PRIu32 "\n", *count));
- VBDEBUG((" return 0x%x\n", t->diskgetinfo_return_val));
+ VB2_DEBUG(" *count=%" PRIu32 "\n", *count);
+ VB2_DEBUG(" return 0x%x\n", t->diskgetinfo_return_val);
return t->diskgetinfo_return_val;
}
@@ -278,8 +278,8 @@ VbError_t VbExDiskFreeInfo(VbDiskInfo *infos,
VbExDiskHandle_t preserve_handle)
{
got_load_disk = (const char *)preserve_handle;
- VBDEBUG(("%s(): got_load_disk = %s\n", __FUNCTION__,
- got_load_disk ? got_load_disk : "0"));
+ VB2_DEBUG("%s(): got_load_disk = %s\n", __FUNCTION__,
+ got_load_disk ? got_load_disk : "0");
return VBERROR_SUCCESS;
}
@@ -287,9 +287,9 @@ VbError_t LoadKernel(struct vb2_context *ctx, LoadKernelParams *params,
VbCommonParams *cparams)
{
got_find_disk = (const char *)params->disk_handle;
- VBDEBUG(("%s(%d): got_find_disk = %s\n", __FUNCTION__,
- load_kernel_calls,
- got_find_disk ? got_find_disk : "0"));
+ VB2_DEBUG("%s(%d): got_find_disk = %s\n", __FUNCTION__,
+ load_kernel_calls,
+ got_find_disk ? got_find_disk : "0");
if (t->external_expected[load_kernel_calls] !=
!!(params->boot_flags & BOOT_FLAG_EXTERNAL_GPT))
got_external_mismatch++;
@@ -300,8 +300,8 @@ void vb2_nv_set(struct vb2_context *ctx,
enum vb2_nv_param param,
uint32_t value)
{
- VBDEBUG(("%s(): got_recovery_request_val = %d (0x%x)\n", __FUNCTION__,
- value, value));
+ VB2_DEBUG("%s(): got_recovery_request_val = %d (0x%x)\n", __FUNCTION__,
+ value, value);
got_recovery_request_val = value;
}
diff --git a/tests/vboot_audio_tests.c b/tests/vboot_audio_tests.c
index c392c0d9..07ca438e 100644
--- a/tests/vboot_audio_tests.c
+++ b/tests/vboot_audio_tests.c
@@ -59,7 +59,6 @@ void FixChecksum(VbDevMusic *hdr) {
/* Reset mock data (for use before each test) */
static void ResetMocks(void) {
- VBDEBUG(("ResetMocks()\n"));
memset(&cparams, 0, sizeof(cparams));
cparams.gbb_data = &gbb;
cparams.gbb = &gbb;
View Lorry Controller Status