GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/console/init.c: Make get_log_level static inline again 

CB:55356 removed static inline declarations from get_log_level(). This
commit puts them back. It also changes the method of accessing static
symbols in tests/console/routing-test to source file inclusion like
in CB:46458 to avoid changing tested source file.

Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
Change-Id: Iaa5dcbccb327f819374967be51ef642b1fb25e7b
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55473
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Jakub Czapiga 2021-06-14 09:32:11 +02:00 committed by Patrick Georgi
parent 2d2d61c7e1
commit ab0bcaf732
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/console/init.c
View File

@ -13,8 +13,7 @@
static int console_inited; static int console_inited;
static int console_loglevel; static int console_loglevel;
int get_log_level(void); static inline int get_log_level(void)
int get_log_level(void)
{ {
if (console_inited == 0) if (console_inited == 0)
return -1; return -1;

4
tests/console/Makefile.inc
View File

@ -4,11 +4,7 @@ tests-y += routing-with-cbmemcons-test
tests-y += routing-without-cbmemcons-test tests-y += routing-without-cbmemcons-test
routing-with-cbmemcons-test-srcs += tests/console/routing-test.c routing-with-cbmemcons-test-srcs += tests/console/routing-test.c
routing-with-cbmemcons-test-srcs += src/console/init.c
routing-with-cbmemcons-test-config += CONFIG_CONSOLE_CBMEM=1 routing-with-cbmemcons-test-config += CONFIG_CONSOLE_CBMEM=1
routing-with-cbmemcons-test-mocks += get_log_level
routing-without-cbmemcons-test-srcs += tests/console/routing-test.c routing-without-cbmemcons-test-srcs += tests/console/routing-test.c
routing-without-cbmemcons-test-srcs += src/console/init.c
routing-without-cbmemcons-test-config += CONFIG_CONSOLE_CBMEM=0 routing-without-cbmemcons-test-config += CONFIG_CONSOLE_CBMEM=0
routing-without-cbmemcons-test-mocks += get_log_level

27
tests/console/routing-test.c
View File

@ -1,18 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include "../console/init.c"
#include <console/console.h> #include <console/console.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <tests/test.h> #include <tests/test.h>
/* stub */
static int log_level = 0;
int get_log_level(void)
{
return log_level;
}
struct log_combinations_t { struct log_combinations_t {
int log_lvl; int log_lvl;
int msg_lvl; int msg_lvl;
@ -45,16 +40,30 @@ struct log_combinations_t {
static void test_console_log_level(void **state) static void test_console_log_level(void **state)
{ {
for (int i = 0; i < ARRAY_SIZE(combinations); i++) { for (int i = 0; i < ARRAY_SIZE(combinations); i++) {
log_level = combinations[i].log_lvl; console_loglevel = combinations[i].log_lvl;
assert_int_equal(combinations[i].behavior, assert_int_equal(combinations[i].behavior,
console_log_level(combinations[i].msg_lvl)); console_log_level(combinations[i].msg_lvl));
} }
} }
static int setup_console_log_level(void **state)
{
console_inited = 1;
return 0;
}
static int teardown_console_log_level(void **state)
{
console_inited = 0;
return 0;
}
int main(void) int main(void)
{ {
const struct CMUnitTest tests[] = { const struct CMUnitTest tests[] = {
cmocka_unit_test(test_console_log_level), cmocka_unit_test_setup_teardown(test_console_log_level,
setup_console_log_level,
teardown_console_log_level),
}; };
return cmocka_run_group_tests(tests, NULL, NULL); return cmocka_run_group_tests(tests, NULL, NULL);