Ver código fonte

fix ci problem.

Rbb666 1 semana atrás
pai
commit
8cca8d6a39

+ 3 - 2
.github/utest/default.cfg

@@ -1,2 +1,3 @@
-CONFIG_RT_USING_CI_ACTION=y
-CONFIG_RT_CONSOLEBUF_SIZE=1024
+# dependencies
+CONFIG_RT_CONSOLEBUF_SIZE=1024
+CONFIG_RT_USING_CI_ACTION=y

+ 3 - 5
.github/utest/dfs/dfs.cfg

@@ -1,12 +1,10 @@
-CONFIG_UTEST_OBJECT_TC=y
-
 # dependencies
 # dependencies
-CONFIG_RT_USING_CI_ACTION=y
 CONFIG_RT_CONSOLEBUF_SIZE=1024
 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_DFS_API_TC=y
 CONFIG_RT_UTEST_POSIX_API_TC=y
 CONFIG_RT_UTEST_POSIX_API_TC=y
 CONFIG_RT_UTEST_DFS_MNT_PATH=""
 CONFIG_RT_UTEST_DFS_MNT_PATH=""
 CONFIG_RT_UTEST_DFS_FS_TYPE="elm"
 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"

+ 3 - 5
.github/utest/kernel/object.cfg

@@ -1,7 +1,5 @@
-CONFIG_UTEST_OBJECT_TC=y
-
 # dependencies
 # dependencies
+CONFIG_RT_CONSOLEBUF_SIZE=1024
 CONFIG_RT_USING_CI_ACTION=y
 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

+ 6 - 2
.github/workflows/utest_auto_run.yml

@@ -46,12 +46,16 @@ jobs:
 
 
         config_file:
         config_file:
           - "default.cfg"
           - "default.cfg"
-          - "kernel/object.cfg"
 
 
         include:
         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":"" }
           - 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"
             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"
             config_file: "cpp11/cpp11.cfg"
 
 
     env:
     env:

+ 1 - 1
examples/utest/testcases/kernel/object_tc.c

@@ -310,7 +310,7 @@ static rt_err_t testcase_cleanup(void)
 
 
 static void test_object_suite(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");
     rt_kprintf("Error: Please increase \'RT_NAME_MAX\' to be greater than 10.\n");
     return;
     return;
 #endif
 #endif