Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[utest] add device find #8959

Merged
merged 4 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/action_utest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
- {UTEST: "kernel/irq", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/irq.conf", SD_FILE: "sd.bin", RUN: "yes"}
- {UTEST: "kernel/timer", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/timer.conf", SD_FILE: "sd.bin", RUN: "yes"}
- {UTEST: "kernel/thread", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/thread.conf", SD_FILE: "sd.bin", RUN: "yes"}
- {UTEST: "kernel/device", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/device.conf", SD_FILE: "sd.bin", RUN: "yes"}
- {UTEST: "kernel/atomic", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/atomic.conf", SD_FILE: "sd.bin", RUN: "yes"}
- {UTEST: "kernel/atomic_c11", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/atomic_c11.conf", SD_FILE: "sd.bin", RUN: "yes"}
- {UTEST: "components/utest", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "utest_self/self.conf", SD_FILE: "sd.bin", RUN: "yes"}
Expand Down
4 changes: 4 additions & 0 deletions examples/utest/configs/kernel/device.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CONFIG_UTEST_DEVICE_TC=y
# dependencies
CONFIG_RT_USING_TIMER_SOFT=y
CONFIG_RT_USING_THREAD=y
4 changes: 4 additions & 0 deletions examples/utest/testcases/kernel/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ config UTEST_THREAD_TC
select RT_USING_TIMER_SOFT
select RT_USING_THREAD

config UTEST_DEVICE_TC
bool "device test"
default n

config UTEST_ATOMIC_TC
bool "atomic test"
default n
Expand Down
3 changes: 3 additions & 0 deletions examples/utest/testcases/kernel/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ if GetDepend(['UTEST_MAILBOX_TC']):
if GetDepend(['UTEST_THREAD_TC']):
src += ['thread_tc.c']

if GetDepend(['UTEST_DEVICE_TC']):
src += ['device_tc.c']

if GetDepend(['UTEST_ATOMIC_TC']):
src += ['atomic_tc.c']

Expand Down
59 changes: 59 additions & 0 deletions examples/utest/testcases/kernel/device_tc.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Copyright (c) 2006-2024, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2024-05-20 Shell the first version
*/
#include <rtthread.h>
#include <stdlib.h>
#include "utest.h"

static void test_rt_device_find(void)
{
char _device_name[RT_NAME_MAX + 1] = {0};
rt_device_t console;
rt_device_t device1, device2, device3;

console = rt_console_get_device();
uassert_not_null(console);
rt_memcpy(_device_name, console->parent.name, RT_NAME_MAX);

/* Test finding a device */
device1 = rt_device_find(_device_name);
uassert_true(device1 == console);

/* Test finding another device */
device2 = rt_device_find(RT_CONSOLE_DEVICE_NAME);
if (rt_strcmp(RT_CONSOLE_DEVICE_NAME, _device_name) == 0)
{
uassert_true(device2 == device1);
}
else
{
uassert_not_null(device2);
uassert_true(device2 != device1);
}

/* Test finding a device 3 */
device3 = rt_device_find(console->parent.name);
uassert_true(device1 == device3);
}

static rt_err_t utest_tc_init(void)
{
return RT_EOK;
}

static rt_err_t utest_tc_cleanup(void)
{
return RT_EOK;
}

static void testcase(void)
{
UTEST_UNIT_RUN(test_rt_device_find);
}
UTEST_TC_EXPORT(testcase, "testcases.kernel.device.find", utest_tc_init, utest_tc_cleanup, 5);
16 changes: 6 additions & 10 deletions src/object.c
Original file line number Diff line number Diff line change
Expand Up @@ -627,10 +627,11 @@ rt_err_t rt_object_for_each(rt_uint8_t type, rt_object_iter_t iter, void *data)

static rt_err_t _match_name(struct rt_object *obj, void *data)
{
const char *name = *(const char **)data;
void **rc = data;
const char *name = rc[0];
if (rt_strncmp(obj->name, name, RT_NAME_MAX) == 0)
{
*(rt_object_t *)data = obj;
rc[1] = obj;

/* notify an early break of loop, but not on error */
return 1;
Expand All @@ -654,21 +655,16 @@ static rt_err_t _match_name(struct rt_object *obj, void *data)
*/
rt_object_t rt_object_find(const char *name, rt_uint8_t type)
{
void *data = (void *)name;
void *data[2] = {(void *)name, RT_NULL};
polarvid marked this conversation as resolved.
Show resolved Hide resolved

/* parameter check */
if (name == RT_NULL) return RT_NULL;

/* which is invoke in interrupt status */
RT_DEBUG_NOT_IN_INTERRUPT;

rt_object_for_each(type, _match_name, &data);
if (data != name)
{
return data;
}

return RT_NULL;
rt_object_for_each(type, _match_name, data);
return data[1];
}

/**
Expand Down
Loading