libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[utest] optimize the utest to support new CI

Browse Source
This commit is contained in:
Meco Man 2024-12-21 01:16:17 -05:00
parent fc1abf46a9
commit a9746edc08
1 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
components/utilities/utest/utest.c
View File

@ -191,7 +191,7 @@ static int utest_help(void)
return 0; return 0;
} }
static void utest_run(const char *utest_name) static void utest_do_run(const char *utest_name)
{ {
rt_size_t i; rt_size_t i;
rt_uint32_t index; rt_uint32_t index;
@ -300,17 +300,38 @@ static void utest_run(const char *utest_name)
} }
} }
static void utest_thr_entry(const char *utest_name) static void utest_thr_entry(void *para)
{ {
/* see commit:0dc7b9a for details */ char *utest_name = (char *)para;
rt_thread_mdelay(1000); rt_thread_mdelay(1000); /* see commit:0dc7b9a for details */
rt_kprintf("\n");
utest_run(utest_name); utest_do_run(utest_name);
} }
long utest_testcase_run(int argc, char** argv) static void utest_thread_create(const char *utest_name)
{ {
rt_thread_t tid = RT_NULL;
tid = rt_thread_create("utest",
utest_thr_entry, (void *)utest_name,
UTEST_THREAD_STACK_SIZE, UTEST_THREAD_PRIORITY, 10);
if (tid != RT_NULL)
{
rt_thread_startup(tid);
}
}
#ifdef RT_USING_CI_ACTION
static int utest_ci_action(void)
{
tc_loop = 1;
utest_thread_create(RT_NULL);
return RT_EOK;
}
INIT_APP_EXPORT(utest_ci_action);
#endif /* RT_USING_CI_ACTION */
int utest_testcase_run(int argc, char** argv)
{
static char utest_name[UTEST_NAME_MAX_LEN]; static char utest_name[UTEST_NAME_MAX_LEN];
rt_memset(utest_name, 0x0, sizeof(utest_name)); rt_memset(utest_name, 0x0, sizeof(utest_name));
@ -318,28 +339,22 @@ long utest_testcase_run(int argc, char** argv)
if (argc == 1) if (argc == 1)
{ {
utest_run(RT_NULL); utest_thread_create(RT_NULL);
return 0;
} }
else if (argc == 2 || argc == 3 || argc == 4) else if (argc == 2 || argc == 3 || argc == 4)
{ {
if (rt_strcmp(argv[1], "-thread") == 0) if (rt_strcmp(argv[1], "-thread") == 0)
{ {
rt_thread_t tid = RT_NULL;
if (argc == 3 || argc == 4) if (argc == 3 || argc == 4)
{ {
rt_strncpy(utest_name, argv[2], sizeof(utest_name) -1); rt_strncpy(utest_name, argv[2], sizeof(utest_name) -1);
if (argc == 4)
if (argc == 4) tc_loop = atoi(argv[3]);
}
tid = rt_thread_create("utest",
(void (*)(void *))utest_thr_entry, utest_name,
UTEST_THREAD_STACK_SIZE, UTEST_THREAD_PRIORITY, 10);
if (tid != NULL)
{ {
rt_thread_startup(tid); tc_loop = atoi(argv[3]);
} }
} }
utest_thread_create(utest_name);
}
else if (rt_strcmp(argv[1], "-help") == 0) else if (rt_strcmp(argv[1], "-help") == 0)
{ {
utest_help(); utest_help();
@ -347,8 +362,11 @@ long utest_testcase_run(int argc, char** argv)
else else
{ {
rt_strncpy(utest_name, argv[1], sizeof(utest_name) -1); rt_strncpy(utest_name, argv[1], sizeof(utest_name) -1);
if (argc == 3) tc_loop = atoi(argv[2]); if (argc == 3)
utest_run(utest_name); {
tc_loop = atoi(argv[2]);
}
utest_do_run(utest_name);
} }
} }
else else
@ -356,7 +374,8 @@ long utest_testcase_run(int argc, char** argv)
LOG_E("[ error ] at (%s:%d), in param error.", __func__, __LINE__); LOG_E("[ error ] at (%s:%d), in param error.", __func__, __LINE__);
utest_help(); utest_help();
} }
return 0;
return RT_EOK;
} }
MSH_CMD_EXPORT_ALIAS(utest_testcase_run, utest_run, utest_run [-thread or -help] [testcase name] [loop num]); MSH_CMD_EXPORT_ALIAS(utest_testcase_run, utest_run, utest_run [-thread or -help] [testcase name] [loop num]);