diff options
Diffstat (limited to 'test/common')
| -rw-r--r-- | test/common/cmd_ut_common.c | 1 | ||||
| -rw-r--r-- | test/common/cread.c | 2 | ||||
| -rw-r--r-- | test/common/cyclic.c | 20 | ||||
| -rw-r--r-- | test/common/event.c | 1 | ||||
| -rw-r--r-- | test/common/test_autoboot.c | 1 |
5 files changed, 13 insertions, 12 deletions
diff --git a/test/common/cmd_ut_common.c b/test/common/cmd_ut_common.c index 2c0267801b2..2f03a58af47 100644 --- a/test/common/cmd_ut_common.c +++ b/test/common/cmd_ut_common.c @@ -6,7 +6,6 @@ * Unit tests for common functions */ -#include <common.h> #include <command.h> #include <test/common.h> #include <test/suites.h> diff --git a/test/common/cread.c b/test/common/cread.c index 4edc7739604..e159caed041 100644 --- a/test/common/cread.c +++ b/test/common/cread.c @@ -3,8 +3,8 @@ * Copyright 2023 Google LLC */ -#include <common.h> #include <cli.h> +#include <time.h> #include <test/common.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/common/cyclic.c b/test/common/cyclic.c index 6e758e89dbd..51a07c576b6 100644 --- a/test/common/cyclic.c +++ b/test/common/cyclic.c @@ -3,7 +3,6 @@ * Copyright (C) 2022 Stefan Roese <sr@denx.de> */ -#include <common.h> #include <cyclic.h> #include <dm.h> #include <test/common.h> @@ -13,22 +12,27 @@ #include <linux/delay.h> /* Test that cyclic function is called */ -static bool cyclic_active = false; +static struct cyclic_test { + struct cyclic_info cyclic; + bool called; +} cyclic_test; -static void cyclic_test(void *ctx) +static void test_cb(struct cyclic_info *c) { - cyclic_active = true; + struct cyclic_test *t = container_of(c, struct cyclic_test, cyclic); + t->called = true; } static int dm_test_cyclic_running(struct unit_test_state *uts) { - cyclic_active = false; - ut_assertnonnull(cyclic_register(cyclic_test, 10 * 1000, "cyclic_demo", - NULL)); + cyclic_test.called = false; + cyclic_register(&cyclic_test.cyclic, test_cb, 10 * 1000, "cyclic_test"); /* Execute all registered cyclic functions */ schedule(); - ut_asserteq(true, cyclic_active); + ut_asserteq(true, cyclic_test.called); + + cyclic_unregister(&cyclic_test.cyclic); return 0; } diff --git a/test/common/event.c b/test/common/event.c index b462694fc3b..de433d34f22 100644 --- a/test/common/event.c +++ b/test/common/event.c @@ -6,7 +6,6 @@ * Written by Simon Glass <sjg@chromium.org> */ -#include <common.h> #include <dm.h> #include <event.h> #include <test/common.h> diff --git a/test/common/test_autoboot.c b/test/common/test_autoboot.c index 42a1e4ab1fa..4ba1dcc8091 100644 --- a/test/common/test_autoboot.c +++ b/test/common/test_autoboot.c @@ -6,7 +6,6 @@ */ #include <autoboot.h> -#include <common.h> #include <test/common.h> #include <test/test.h> #include <test/ut.h> |