From 8cca8d6a39db167c708e18943d156e3c7b6c6850 Mon Sep 17 00:00:00 2001 From: Rbb666 Date: Fri, 5 Sep 2025 11:59:51 +0800 Subject: [PATCH] fix ci problem. --- .github/utest/default.cfg | 5 +++-- .github/utest/dfs/dfs.cfg | 8 +++----- .github/utest/kernel/object.cfg | 8 +++----- .github/workflows/utest_auto_run.yml | 8 ++++++-- examples/utest/testcases/kernel/object_tc.c | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/utest/default.cfg b/.github/utest/default.cfg index 493d9ad2ff..d60ab3a3e7 100644 --- a/.github/utest/default.cfg +++ b/.github/utest/default.cfg @@ -1,2 +1,3 @@ -CONFIG_RT_USING_CI_ACTION=y -CONFIG_RT_CONSOLEBUF_SIZE=1024 \ No newline at end of file +# dependencies +CONFIG_RT_CONSOLEBUF_SIZE=1024 +CONFIG_RT_USING_CI_ACTION=y \ No newline at end of file diff --git a/.github/utest/dfs/dfs.cfg b/.github/utest/dfs/dfs.cfg index 1da9b7689c..d78ea0df33 100644 --- a/.github/utest/dfs/dfs.cfg +++ b/.github/utest/dfs/dfs.cfg @@ -1,12 +1,10 @@ -CONFIG_UTEST_OBJECT_TC=y - # dependencies -CONFIG_RT_USING_CI_ACTION=y CONFIG_RT_CONSOLEBUF_SIZE=1024 +CONFIG_RT_NAME_MAX=24 +CONFIG_RT_USING_CI_ACTION=y CONFIG_RT_UTEST_DFS_API_TC=y CONFIG_RT_UTEST_POSIX_API_TC=y CONFIG_RT_UTEST_DFS_MNT_PATH="" CONFIG_RT_UTEST_DFS_FS_TYPE="elm" -CONFIG_RT_UTEST_DFS_BLOCK_DEV="sd0" -CONFIG_RT_NAME_MAX=24 +CONFIG_RT_UTEST_DFS_BLOCK_DEV="sd0" \ No newline at end of file diff --git a/.github/utest/kernel/object.cfg b/.github/utest/kernel/object.cfg index 1528276610..9e5d313b29 100644 --- a/.github/utest/kernel/object.cfg +++ b/.github/utest/kernel/object.cfg @@ -1,7 +1,5 @@ -CONFIG_UTEST_OBJECT_TC=y - # dependencies +CONFIG_RT_CONSOLEBUF_SIZE=1024 CONFIG_RT_USING_CI_ACTION=y -CONFIG_RT_USING_DEVICE=y -CONFIG_RT_USING_SEMAPHORE=y -CONFIG_RT_NAME_MAX=24 +CONFIG_UTEST_OBJECT_TC=y +CONFIG_UTEST_THR_STACK_SIZE=8192 \ No newline at end of file diff --git a/.github/workflows/utest_auto_run.yml b/.github/workflows/utest_auto_run.yml index 2fa2e4a80e..eed0d9ae3c 100644 --- a/.github/workflows/utest_auto_run.yml +++ b/.github/workflows/utest_auto_run.yml @@ -46,12 +46,16 @@ jobs: config_file: - "default.cfg" - - "kernel/object.cfg" include: - # dfs.cfg only run on qemu-vexpress-a9 + # only run on qemu-vexpress-a9 + - platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" } + config_file: "kernel/object.cfg" + - platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" } config_file: "dfs/dfs.cfg" + + - platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" } config_file: "cpp11/cpp11.cfg" env: diff --git a/examples/utest/testcases/kernel/object_tc.c b/examples/utest/testcases/kernel/object_tc.c index 2afeda3492..e710d132e2 100644 --- a/examples/utest/testcases/kernel/object_tc.c +++ b/examples/utest/testcases/kernel/object_tc.c @@ -310,7 +310,7 @@ static rt_err_t testcase_cleanup(void) static void test_object_suite(void) { -#ifdef RT_NAME_MAX < 10 +#if RT_NAME_MAX < 10 rt_kprintf("Error: Please increase \'RT_NAME_MAX\' to be greater than 10.\n"); return; #endif