From ab0bcaf732a5b0afd70f19ae58eb1c89bbf9209f Mon Sep 17 00:00:00 2001
From: Jakub Czapiga <jacz@semihalf.com>
Date: Mon, 14 Jun 2021 09:32:11 +0200
Subject: [PATCH] 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>
---
 src/console/init.c           |  3 +--
 tests/console/Makefile.inc   |  4 ----
 tests/console/routing-test.c | 27 ++++++++++++++++++---------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/console/init.c b/src/console/init.c
index 6fa48498a8..a2ceb58018 100644
--- a/src/console/init.c
+++ b/src/console/init.c
@@ -13,8 +13,7 @@
 static int console_inited;
 static int console_loglevel;
 
-int get_log_level(void);
-int get_log_level(void)
+static inline int get_log_level(void)
 {
 	if (console_inited == 0)
 		return -1;
diff --git a/tests/console/Makefile.inc b/tests/console/Makefile.inc
index 2218652e9e..0bbead09d9 100644
--- a/tests/console/Makefile.inc
+++ b/tests/console/Makefile.inc
@@ -4,11 +4,7 @@ tests-y += routing-with-cbmemcons-test
 tests-y += routing-without-cbmemcons-test
 
 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-mocks += get_log_level
 
 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-mocks += get_log_level
diff --git a/tests/console/routing-test.c b/tests/console/routing-test.c
index 33bf167e25..ea90342999 100644
--- a/tests/console/routing-test.c
+++ b/tests/console/routing-test.c
@@ -1,18 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include "../console/init.c"
+
 #include <console/console.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
 #include <tests/test.h>
 
-/* stub */
-static int log_level = 0;
-int get_log_level(void)
-{
-	return log_level;
-}
-
 struct log_combinations_t {
 	int log_lvl;
 	int msg_lvl;
@@ -45,16 +40,30 @@ struct log_combinations_t {
 static void test_console_log_level(void **state)
 {
 	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,
 			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)
 {
 	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);