Merge 4.16

Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e
This commit is contained in:
Jeremy Soller
2022-03-04 07:19:45 -07:00
parent af64e5d166
commit d97e25ac13
3138 changed files with 317025 additions and 23253 deletions

View File

@@ -42,7 +42,7 @@ static void test_console_log_level(void **state)
for (int i = 0; i < ARRAY_SIZE(combinations); i++) {
console_loglevel = combinations[i].log_lvl;
assert_int_equal(combinations[i].behavior,
console_log_level(combinations[i].msg_lvl));
console_log_level(combinations[i].msg_lvl));
}
}
@@ -61,8 +61,7 @@ static int teardown_console_log_level(void **state)
int main(void)
{
const struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(test_console_log_level,
setup_console_log_level,
cmocka_unit_test_setup_teardown(test_console_log_level, setup_console_log_level,
teardown_console_log_level),
};