diff options
24 files changed, 51 insertions, 202 deletions
diff --git a/.github/utest/default.cfg b/.github/utest/default.cfg deleted file mode 100644 index d60ab3a3e7..0000000000 --- a/.github/utest/default.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# dependencies -CONFIG_RT_CONSOLEBUF_SIZE=1024 -CONFIG_RT_USING_CI_ACTION=y
\ No newline at end of file diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml deleted file mode 100644 index 74f89dcfe2..0000000000 --- a/.github/workflows/action_utest.yml +++ /dev/null @@ -1,151 +0,0 @@ -name: AutoTestCI - -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the master branch -on: - # Runs at 16:00 UTC (BeiJing 00:00) on the 1st of every month - schedule: - - cron: '0 16 1 * *' - push: - branches: - - master - paths-ignore: - - documentation/** - - '**/README.md' - - '**/README_zh.md' - pull_request: - branches: - - master - paths-ignore: - - documentation/** - - '**/README.md' - - '**/README_zh.md' - -permissions: - contents: read # to fetch code (actions/checkout) - -jobs: - test: - runs-on: ubuntu-22.04 - name: ${{ matrix.legs.UTEST }} - if: github.repository_owner == 'RT-Thread' - strategy: - fail-fast: false - matrix: - legs: - - {UTEST: "kernel/mem", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/mem.conf", SD_FILE: "sd.bin", RUN: "yes"} - - {UTEST: "kernel/ipc", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/ipc.conf", SD_FILE: "sd.bin", RUN: "yes"} - - {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"} - - {UTEST: "components/cpp11", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "cpp11/cpp11.conf", SD_FILE: "sd.bin", RUN: "yes"} - - {UTEST: "kernel/mem/riscv64", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", CONFIG_FILE: "kernel/mem.conf", SD_FILE: "None", RUN: "yes"} - - {UTEST: "kernel/atomic/riscv64", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", CONFIG_FILE: "kernel/atomic.conf", SD_FILE: "None", RUN: "yes"} - - {UTEST: "kernel/atomic_c11/riscv64", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", CONFIG_FILE: "kernel/atomic_c11.conf", SD_FILE: "None", RUN: "yes"} - - {UTEST: "rtsmart/arm", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "rtsmart/base.conf", SD_FILE: "sd.bin", RUN: "no"} - - {UTEST: "rtsmart/aarch64", RTT_BSP: "bsp/qemu-virt64-aarch64", QEMU_ARCH: "aarch64", QEMU_MACHINE: "virt", CONFIG_FILE: "rtsmart/base.conf", SD_FILE: "sd.bin", RUN: "no"} - - {UTEST: "rtsmart/riscv64", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", CONFIG_FILE: "rtsmart/base.conf", SD_FILE: "None", RUN: "yes"} - env: - TEST_QEMU_ARCH: ${{ matrix.legs.QEMU_ARCH }} - TEST_QEMU_MACHINE: ${{ matrix.legs.QEMU_MACHINE }} - TEST_BSP_ROOT: ${{ matrix.legs.RTT_BSP }} - TEST_CONFIG_FILE: ${{ matrix.legs.CONFIG_FILE }} - TEST_SD_FILE: ${{ matrix.legs.SD_FILE }} - steps: - - uses: actions/checkout@main - - - name: Install Tools - shell: bash - run: | - sudo apt-get update - sudo apt-get -yqq install scons qemu-system git - pip3 install kconfiglib - - - name: Install Arm ToolChains - if: ${{ matrix.legs.QEMU_ARCH == 'arm' && matrix.legs.UTEST != 'rtsmart/arm' && success() }} - shell: bash - run: | - wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.3/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 - sudo tar xjf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 -C /opt - /opt/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc --version - echo "RTT_EXEC_PATH=/opt/gcc-arm-none-eabi-10-2020-q4-major/bin" >> $GITHUB_ENV - - - name: Install Arm Musl ToolChains - if: ${{ matrix.legs.QEMU_ARCH == 'arm' && matrix.legs.UTEST == 'rtsmart/arm' && success() }} - shell: bash - run: | - wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.7/arm-linux-musleabi_for_x86_64-pc-linux-gnu_stable.tar.bz2 - sudo tar xjf arm-linux-musleabi_for_x86_64-pc-linux-gnu_stable.tar.bz2 -C /opt - /opt/arm-linux-musleabi_for_x86_64-pc-linux-gnu/bin/arm-linux-musleabi-gcc --version - echo "RTT_EXEC_PATH=/opt/arm-linux-musleabi_for_x86_64-pc-linux-gnu/bin" >> $GITHUB_ENV - echo "RTT_CC_PREFIX=arm-linux-musleabi-" >> $GITHUB_ENV - - - name: Install RISC-V ToolChains - if: ${{ matrix.legs.QEMU_ARCH == 'riscv64' && matrix.legs.UTEST != 'rtsmart/riscv64' && success() }} - run: | - wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.4/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz - sudo tar zxvf riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz -C /opt - /opt/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc --version - echo "RTT_EXEC_PATH=/opt/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin" >> $GITHUB_ENV - - - name: Install RISC-V Musl ToolChains - if: ${{ matrix.legs.QEMU_ARCH == 'riscv64' && matrix.legs.UTEST == 'rtsmart/riscv64' && success() }} - shell: bash - run: | - wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.7/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu_latest.tar.bz2 - sudo tar xjf riscv64-linux-musleabi_for_x86_64-pc-linux-gnu_latest.tar.bz2 -C /opt - /opt/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu/bin/riscv64-unknown-linux-musl-gcc --version - echo "RTT_EXEC_PATH=/opt/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu/bin" >> $GITHUB_ENV - echo "RTT_CC_PREFIX=riscv64-unknown-linux-musl-" >> $GITHUB_ENV - - - name: Install AARCH64 Musl ToolChains - if: ${{ matrix.legs.QEMU_ARCH == 'aarch64' && matrix.legs.UTEST == 'rtsmart/aarch64' && success() }} - shell: bash - run: | - wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.7/aarch64-linux-musleabi_for_x86_64-pc-linux-gnu_stable.tar.bz2 - sudo tar xjf aarch64-linux-musleabi_for_x86_64-pc-linux-gnu_stable.tar.bz2 -C /opt - /opt/aarch64-linux-musleabi_for_x86_64-pc-linux-gnu/bin/aarch64-linux-musleabi-gcc --version - echo "RTT_EXEC_PATH=/opt/aarch64-linux-musleabi_for_x86_64-pc-linux-gnu/bin" >> $GITHUB_ENV - echo "RTT_CC_PREFIX=aarch64-linux-musleabi-" >> $GITHUB_ENV - - - name: CPP11 Preprocessing Toolchain - if: ${{ matrix.legs.QEMU_ARCH == 'arm' && matrix.legs.UTEST == 'components/cpp11' && success() }} - shell: bash - run: | - # Delete the following files - sudo rm -f /opt/gcc-arm-none-eabi-10-2020-q4-major/arm-none-eabi/include/c++/10.2.1/thread - sudo rm -f /opt/gcc-arm-none-eabi-10-2020-q4-major/arm-none-eabi/include/c++/10.2.1/mutex - sudo rm -f /opt/gcc-arm-none-eabi-10-2020-q4-major/arm-none-eabi/include/c++/10.2.1/condition_variable - sudo rm -f /opt/gcc-arm-none-eabi-10-2020-q4-major/arm-none-eabi/include/c++/10.2.1/future - sudo rm -f /opt/gcc-arm-none-eabi-10-2020-q4-major/arm-none-eabi/include/pthread.h - # Clear the contents of the following files - sudo cat /dev/null > /opt/gcc-arm-none-eabi-10-2020-q4-major/arm-none-eabi/include/sys/_pthreadtypes.h - # Clear -fno-exceptions in rtconfig.py - sed -i 's/-fno-exceptions/ /g' $TEST_BSP_ROOT/rtconfig.py - - - name: Build BSP - run: | - echo CONFIG_RT_USING_UTESTCASES=y >> $TEST_BSP_ROOT/.config - cat examples/utest/configs/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config - scons --pyconfig-silent -C $TEST_BSP_ROOT - scons -j$(nproc) --strict -C $TEST_BSP_ROOT - - - name: Start run Test - if: ${{matrix.legs.RUN == 'yes' && success() }} - run: | - git clone https://github.com/armink/UtestRunner.git - pushd $TEST_BSP_ROOT - dd if=/dev/zero of=sd.bin bs=1024 count=65536 - popd - pushd UtestRunner - if [ $TEST_SD_FILE != "None" ]; then - python3 qemu_runner.py --system $TEST_QEMU_ARCH --machine $TEST_QEMU_MACHINE --elf ../$TEST_BSP_ROOT/rtthread.bin --sd ../$TEST_BSP_ROOT/$TEST_SD_FILE - else - python3 qemu_runner.py --system $TEST_QEMU_ARCH --machine $TEST_QEMU_MACHINE --elf ../$TEST_BSP_ROOT/rtthread.bin - fi - cat rtt_console.log - popd diff --git a/.github/workflows/utest_auto_run.yml b/.github/workflows/utest_auto_run.yml index 6fa2fce9f6..a1abf0a1dd 100644 --- a/.github/workflows/utest_auto_run.yml +++ b/.github/workflows/utest_auto_run.yml @@ -1,5 +1,5 @@ # Automation utest run script for the QEMU platform -# Generate the corresponding config configuration for CI based on the configuration file under .github/utest. +# Generate the corresponding config configuration for CI based on the configuration file under examples/utest/configs. name: utest_auto_run @@ -50,19 +50,26 @@ jobs: include: # 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" + config_file: "kernel/kernel_basic.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: "kernel/ipc.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: "kernel/mem.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" + config_file: "kernel/atomic_c11.cfg" + - platform: { UTEST: "RISCV", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", SD_FILE: "None", KERNEL: "standard", "SMP_RUN":"" } + config_file: "kernel/atomic_c11.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" - 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: "lwip/lwip.cfg" - + config_file: "components/lwip.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: "components/netdev.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: "netdev/netdev.cfg" + config_file: "components/dfs.cfg" env: TEST_QEMU_ARCH: ${{ matrix.platform.QEMU_ARCH }} @@ -181,16 +188,16 @@ jobs: run: | # Whether plan to run SMP? if [[ "${{ matrix.platform.SMP_RUN }}" == "smp" ]]; then - cat .github/utest/smp/smp.cfg >> $TEST_BSP_ROOT/.config + cat examples/utest/configs/smp/smp.cfg >> $TEST_BSP_ROOT/.config fi # Is the kernel rtsmart? if [[ "${{ matrix.platform.KERNEL }}" == "rtsmart" ]]; then - cat .github/utest/rtsmart/rtsmart.cfg >> $TEST_BSP_ROOT/.config + cat examples/utest/configs/rtsmart/rtsmart.cfg >> $TEST_BSP_ROOT/.config fi echo CONFIG_RT_USING_UTESTCASES=y >> $TEST_BSP_ROOT/.config - cat .github/utest/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config + cat examples/utest/configs/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config scons --pyconfig-silent -C $TEST_BSP_ROOT scons -j$(nproc) --strict -C $TEST_BSP_ROOT diff --git a/.github/utest/dfs/dfs.cfg b/examples/utest/configs/components/dfs.cfg index d78ea0df33..d78ea0df33 100644 --- a/.github/utest/dfs/dfs.cfg +++ b/examples/utest/configs/components/dfs.cfg diff --git a/.github/utest/lwip/lwip.cfg b/examples/utest/configs/components/lwip.cfg index 7f8b6e53e7..7f8b6e53e7 100644 --- a/.github/utest/lwip/lwip.cfg +++ b/examples/utest/configs/components/lwip.cfg diff --git a/.github/utest/netdev/netdev.cfg b/examples/utest/configs/components/netdev.cfg index d09e790ac4..d09e790ac4 100644 --- a/.github/utest/netdev/netdev.cfg +++ b/examples/utest/configs/components/netdev.cfg diff --git a/.github/utest/cpp11/cpp11.cfg b/examples/utest/configs/cpp11/cpp11.cfg index e30b317cdf..e30b317cdf 100644 --- a/.github/utest/cpp11/cpp11.cfg +++ b/examples/utest/configs/cpp11/cpp11.cfg diff --git a/examples/utest/configs/cpp11/cpp11.conf b/examples/utest/configs/cpp11/cpp11.conf deleted file mode 100644 index 1aa8f2e3b8..0000000000 --- a/examples/utest/configs/cpp11/cpp11.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_UTEST_CPP11_THREAD_TC=y -# dependencies -CONFIG_RT_USING_CPLUSPLUS=y -CONFIG_RT_USING_CPLUSPLUS11=y diff --git a/examples/utest/configs/default.cfg b/examples/utest/configs/default.cfg new file mode 100644 index 0000000000..cb59d0d01e --- /dev/null +++ b/examples/utest/configs/default.cfg @@ -0,0 +1,7 @@ +# dependencies +CONFIG_RT_CONSOLEBUF_SIZE=1024 +CONFIG_RT_USING_CI_ACTION=y + +CONFIG_UTEST_SELF_PASS_TC=y +CONFIG_UTEST_MEMHEAP_TC=y +CONFIG_UTEST_SMALL_MEM_TC=y
\ No newline at end of file diff --git a/examples/utest/configs/kernel/atomic.conf b/examples/utest/configs/kernel/atomic.conf deleted file mode 100644 index 4255cc2d4f..0000000000 --- a/examples/utest/configs/kernel/atomic.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_UTEST_ATOMIC_TC=y -# dependencies -CONFIG_RT_USING_TIMER_SOFT=y -CONFIG_RT_USING_THREAD=y diff --git a/examples/utest/configs/kernel/atomic_c11.conf b/examples/utest/configs/kernel/atomic_c11.cfg index d98963f491..394b81dd7a 100644 --- a/examples/utest/configs/kernel/atomic_c11.conf +++ b/examples/utest/configs/kernel/atomic_c11.cfg @@ -1,4 +1,5 @@ CONFIG_UTEST_ATOMIC_TC=y +CONFIG_RT_USING_CI_ACTION=y # dependencies CONFIG_RT_USING_TIMER_SOFT=y CONFIG_RT_USING_THREAD=y diff --git a/examples/utest/configs/kernel/device.conf b/examples/utest/configs/kernel/device.conf deleted file mode 100644 index 1b0bf5a59f..0000000000 --- a/examples/utest/configs/kernel/device.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_UTEST_DEVICE_TC=y -# dependencies -CONFIG_RT_USING_TIMER_SOFT=y -CONFIG_RT_USING_THREAD=y diff --git a/examples/utest/configs/kernel/ipc.conf b/examples/utest/configs/kernel/ipc.cfg index 5dd798c114..56e1396257 100644 --- a/examples/utest/configs/kernel/ipc.conf +++ b/examples/utest/configs/kernel/ipc.cfg @@ -1,14 +1,18 @@ +# dependencies +CONFIG_RT_CONSOLEBUF_SIZE=1024 +CONFIG_RT_USING_CI_ACTION=y + CONFIG_UTEST_SEMAPHORE_TC=y CONFIG_UTEST_EVENT_TC=y CONFIG_UTEST_MESSAGEQUEUE_TC=y CONFIG_UTEST_SIGNAL_TC=y CONFIG_UTEST_MUTEX_TC=y CONFIG_UTEST_MAILBOX_TC=y -CONFIG_UTEST_WORKQUEUE_TC=y -# dependencies + CONFIG_RT_USING_SEMAPHORE=y CONFIG_RT_USING_EVENT=y CONFIG_RT_USING_MESSAGEQUEUE=y CONFIG_RT_USING_SIGNALS=y CONFIG_RT_USING_MUTEX=y CONFIG_RT_USING_MAILBOX=y +CONFIG_UTEST_THR_STACK_SIZE=8192
\ No newline at end of file diff --git a/examples/utest/configs/kernel/irq.conf b/examples/utest/configs/kernel/irq.conf deleted file mode 100644 index c8f044fce4..0000000000 --- a/examples/utest/configs/kernel/irq.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_UTEST_IRQ_TC=y -CONFIG_RT_HOOK_USING_FUNC_PTR=y -# dependencies diff --git a/examples/utest/configs/kernel/kernel_basic.cfg b/examples/utest/configs/kernel/kernel_basic.cfg new file mode 100644 index 0000000000..571cebde44 --- /dev/null +++ b/examples/utest/configs/kernel/kernel_basic.cfg @@ -0,0 +1,14 @@ +# dependencies +CONFIG_RT_CONSOLEBUF_SIZE=1024 +CONFIG_RT_USING_CI_ACTION=y + +CONFIG_UTEST_OBJECT_TC=y +CONFIG_UTEST_IRQ_TC=y +CONFIG_UTEST_THREAD_TC=y +CONFIG_UTEST_DEVICE_TC=y +CONFIG_UTEST_ATOMIC_TC=y +CONFIG_UTEST_HOOKLIST_TC=y +CONFIG_UTEST_MTSAFE_KPRINT_TC=y +CONFIG_UTEST_SCHEDULER_TC=y + +CONFIG_UTEST_THR_STACK_SIZE=8192
\ No newline at end of file diff --git a/.github/utest/kernel/object.cfg b/examples/utest/configs/kernel/mem.cfg index 9e5d313b29..d05f9d272a 100644 --- a/.github/utest/kernel/object.cfg +++ b/examples/utest/configs/kernel/mem.cfg @@ -1,5 +1,9 @@ # dependencies CONFIG_RT_CONSOLEBUF_SIZE=1024 CONFIG_RT_USING_CI_ACTION=y -CONFIG_UTEST_OBJECT_TC=y + +CONFIG_UTEST_MEMHEAP_TC=y +CONFIG_UTEST_SMALL_MEM_TC=y +CONFIG_UTEST_MEMPOOL_TC=y + CONFIG_UTEST_THR_STACK_SIZE=8192
\ No newline at end of file diff --git a/examples/utest/configs/kernel/mem.conf b/examples/utest/configs/kernel/mem.conf deleted file mode 100644 index 1a311ab9dd..0000000000 --- a/examples/utest/configs/kernel/mem.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_UTEST_MEMHEAP_TC=y - -# dependencies -CONFIG_RT_USING_MEMHEAP=y diff --git a/examples/utest/configs/kernel/thread.conf b/examples/utest/configs/kernel/thread.conf deleted file mode 100644 index 9b3234f0d7..0000000000 --- a/examples/utest/configs/kernel/thread.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_UTEST_THREAD_TC=y -# dependencies -CONFIG_RT_USING_TIMER_SOFT=y -CONFIG_RT_USING_THREAD=y diff --git a/examples/utest/configs/kernel/timer.conf b/examples/utest/configs/kernel/timer.conf deleted file mode 100644 index 20696f065f..0000000000 --- a/examples/utest/configs/kernel/timer.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_UTEST_TIMER_TC=y - -# dependencies -CONFIG_RT_USING_TIMER_SOFT=y diff --git a/examples/utest/configs/rtsmart/base.conf b/examples/utest/configs/rtsmart/base.conf deleted file mode 100644 index 94830baaee..0000000000 --- a/examples/utest/configs/rtsmart/base.conf +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_UTEST_MEMHEAP_TC=y - -# dependencies -CONFIG_RT_USING_SMART=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_DFS_V2=y diff --git a/.github/utest/rtsmart/rtsmart.cfg b/examples/utest/configs/rtsmart/rtsmart.cfg index 94830baaee..94830baaee 100644 --- a/.github/utest/rtsmart/rtsmart.cfg +++ b/examples/utest/configs/rtsmart/rtsmart.cfg diff --git a/.github/utest/smp/smp.cfg b/examples/utest/configs/smp/smp.cfg index efe058587c..efe058587c 100644 --- a/.github/utest/smp/smp.cfg +++ b/examples/utest/configs/smp/smp.cfg diff --git a/examples/utest/configs/utest_self/self.conf b/examples/utest/configs/utest_self/self.conf deleted file mode 100644 index b155a551d2..0000000000 --- a/examples/utest/configs/utest_self/self.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_UTEST_SELF_PASS_TC=y diff --git a/src/utest/Kconfig b/src/utest/Kconfig index 85d6b853a9..58f275bc2a 100644 --- a/src/utest/Kconfig +++ b/src/utest/Kconfig @@ -2,12 +2,12 @@ menu "Kernel Testcase" config UTEST_MEMHEAP_TC bool "memheap stability test" - default y + default n depends on RT_USING_MEMHEAP config UTEST_SMALL_MEM_TC bool "mem test" - default y + default n depends on RT_USING_SMALL_MEM config UTEST_OBJECT_TC |