This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit c2d7781f6fb3b5a7d57d9dcf109cdbf4847312da Author: Marco Casaroli <[email protected]> AuthorDate: Tue Nov 17 18:27:37 2026 +0100 boards/mps2-an500: Add the citest and citest_protected configurations. CI runs both in QEMU with NTFC: mps2-an500:citest is a flat build and mps2-an500:citest_protected is a protected build (CONFIG_BUILD_PROTECTED=y), both for the Cortex-M7. CI builds the protected configurations, but it runs none of them. citest is mps2-an500:nsh and citest_protected is mps2-an500:knsh, with the programs that the NTFC cases use: ostest, hello, helloxx, pipe, getprime, heap and setlogmask, and the pipe driver. Both have full optimization and no scheduler info messages. citest has no profiling (PROFILE_ALL, PROFILE_MINI, SYSTEM_GPROF). For citest_protected, QEMU loads the kernel (nuttx) with -kernel and the user image (nuttx_user.elf) with the generic loader. NTFC finds the commands in the ELF file of elf_path. The NSH commands and the test programs are in the user image, thus elf_path is nuttx_user.elf. run.sh is the one of sabre-6quad:citest, with one change: it moves each NTFC result directory into the artifact directory, not the result directory itself. When testbuild.sh retries a configuration, the result directory of the first attempt is already there: "mv result" then fails, result/ stays in the tree, and the tree check fails the retry. session.json excludes Nuttx_System_Arch_Os_Stability, which runs the heap test 10 times (about 170 s). Nuttx_System_Mm_Integration runs the heap test one time. Assisted-by: Claude Code:claude-opus-5-5 Signed-off-by: Marco Casaroli <[email protected]> --- .../arm/mps/mps2-an500/configs/citest/config.yaml | 14 ++++ boards/arm/mps/mps2-an500/configs/citest/defconfig | 84 ++++++++++++++++++++++ boards/arm/mps/mps2-an500/configs/citest/run.sh | 50 +++++++++++++ .../arm/mps/mps2-an500/configs/citest/session.json | 13 ++++ .../configs/citest_protected/config.yaml | 15 ++++ .../mps2-an500/configs/citest_protected/defconfig | 81 +++++++++++++++++++++ .../mps/mps2-an500/configs/citest_protected/run.sh | 50 +++++++++++++ .../configs/citest_protected/session.json | 13 ++++ 8 files changed, 320 insertions(+) diff --git a/boards/arm/mps/mps2-an500/configs/citest/config.yaml b/boards/arm/mps/mps2-an500/configs/citest/config.yaml new file mode 100644 index 00000000000..3656ba68b04 --- /dev/null +++ b/boards/arm/mps/mps2-an500/configs/citest/config.yaml @@ -0,0 +1,14 @@ +config: + cwd: './' + +product: + name: "mps2-an500" + cores: + core0: + name: 'main' + device: 'qemu' + line_buffered: true + exec_path: 'qemu-system-arm' + exec_args: '-M mps2-an500 -nographic -kernel ./nuttx' + conf_path: './.config' + elf_path: './nuttx' diff --git a/boards/arm/mps/mps2-an500/configs/citest/defconfig b/boards/arm/mps/mps2-an500/configs/citest/defconfig new file mode 100644 index 00000000000..3b375cfb786 --- /dev/null +++ b/boards/arm/mps/mps2-an500/configs/citest/defconfig @@ -0,0 +1,84 @@ +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# +CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD="mps2-an500" +CONFIG_ARCH_BOARD_MPS2_AN500=y +CONFIG_ARCH_CHIP="mps" +CONFIG_ARCH_CHIP_MPS2_AN500=y +CONFIG_ARCH_CHIP_MPS=y +CONFIG_ARCH_INTERRUPTSTACK=2048 +CONFIG_ARCH_STACKDUMP=y +CONFIG_ARMV7M_SYSTICK=y +CONFIG_ARM_MPU=y +CONFIG_ARM_MPU_NREGIONS=1 +CONFIG_ARM_MPU_RESET=y +CONFIG_BUILTIN=y +CONFIG_CMSDK_UART0=y +CONFIG_CMSDK_UART0_BASE=0x40004000 +CONFIG_CMSDK_UART0_CLOCK=25000000 +CONFIG_CMSDK_UART0_OV_IRQ=28 +CONFIG_CMSDK_UART0_RX_IRQ=16 +CONFIG_CMSDK_UART0_SERIAL_CONSOLE=y +CONFIG_CMSDK_UART0_TX_IRQ=17 +CONFIG_CMSDK_UART=y +CONFIG_CXX_STANDARD="c++17" +CONFIG_DEBUG_ASSERTIONS=y +CONFIG_DEBUG_BUSFAULT=y +CONFIG_DEBUG_FEATURES=y +CONFIG_DEBUG_FULLOPT=y +CONFIG_DEBUG_HARDFAULT_ALERT=y +CONFIG_DEBUG_SCHED=y +CONFIG_DEBUG_SCHED_ERROR=y +CONFIG_DEBUG_SCHED_WARN=y +CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEBUG_USAGEFAULT=y +CONFIG_DEFAULT_TASK_STACKSIZE=4096 +CONFIG_EXAMPLES_HELLO=y +CONFIG_EXAMPLES_HELLOXX=y +CONFIG_EXAMPLES_PIPE=y +CONFIG_EXPERIMENTAL=y +CONFIG_FRAME_POINTER=y +CONFIG_FS_PROCFS=y +CONFIG_FS_ROMFS=y +CONFIG_FS_TMPFS=y +CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INTELHEX_BINARY=y +CONFIG_LIBC_MEMFD_ERROR=y +CONFIG_NSH_BUILTIN_APPS=y +CONFIG_NSH_FILEIOSIZE=512 +CONFIG_NSH_READLINE=y +CONFIG_PIPES=y +CONFIG_PREALLOC_TIMERS=4 +CONFIG_RAMLOG=y +CONFIG_RAM_SIZE=2097152 +CONFIG_RAM_START=0x60000000 +CONFIG_RAW_BINARY=y +CONFIG_READLINE_CMD_HISTORY=y +CONFIG_RR_INTERVAL=200 +CONFIG_SCHED_HPWORK=y +CONFIG_SCHED_HPWORKPRIORITY=192 +CONFIG_SCHED_IRQMONITOR=y +CONFIG_SPINLOCK=y +CONFIG_STACK_COLORATION=y +CONFIG_STANDARD_SERIAL=y +CONFIG_START_DAY=25 +CONFIG_START_MONTH=4 +CONFIG_START_YEAR=2023 +CONFIG_SYMTAB_ORDEREDBYNAME=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_SETLOGMASK=y +CONFIG_SYSTEM_SYSTEM=y +CONFIG_TESTING_GETPRIME=y +CONFIG_TESTING_HEAP=y +CONFIG_TESTING_OSTEST=y +CONFIG_TIMER=y +CONFIG_TIMER_ARCH=y +CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm/mps/mps2-an500/configs/citest/run.sh b/boards/arm/mps/mps2-an500/configs/citest/run.sh new file mode 100755 index 00000000000..a4014e2c1c8 --- /dev/null +++ b/boards/arm/mps/mps2-an500/configs/citest/run.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +############################################################################ +# boards/arm/mps/mps2-an500/configs/citest/run.sh +# +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +set -o xtrace + +# start from nuttx dir +olddir=$(pwd) +nuttdir=${CURRENTCONFDIR}/../../../../../../ +cd ${nuttdir} + +# run NTFC +confpath=${CURRENTCONFDIR}/config.yaml +jsonconf=${CURRENTCONFDIR}/session.json +testpath=${NTFCDIR}/external/nuttx-testing +ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf} + +ret="$?" +echo $ret + +# export test results; keep the results of an earlier attempt +artifacts=${ARTIFACTCONFDIR}/ntfc/result +mkdir -p ${artifacts} +rm -f pytest.debug.log +mv result/* ${artifacts} +rm -rf result + +# restore old dir +cd ${olddir} + +exit $ret diff --git a/boards/arm/mps/mps2-an500/configs/citest/session.json b/boards/arm/mps/mps2-an500/configs/citest/session.json new file mode 100644 index 00000000000..b88ef1c1926 --- /dev/null +++ b/boards/arm/mps/mps2-an500/configs/citest/session.json @@ -0,0 +1,13 @@ +{ + "module": { + "include_module": [], + "exclude_module": + [ + "Nuttx_System_Arch_Os_Stability" + ], + "order": [] + }, + "args": { + "kv": [] + } +} diff --git a/boards/arm/mps/mps2-an500/configs/citest_protected/config.yaml b/boards/arm/mps/mps2-an500/configs/citest_protected/config.yaml new file mode 100644 index 00000000000..a90c98fe550 --- /dev/null +++ b/boards/arm/mps/mps2-an500/configs/citest_protected/config.yaml @@ -0,0 +1,15 @@ +config: + cwd: './' + +product: + name: "mps2-an500" + cores: + core0: + name: 'main' + device: 'qemu' + line_buffered: true + exec_path: 'qemu-system-arm' + exec_args: '-M mps2-an500 -nographic -kernel ./nuttx + -device loader,file=./nuttx_user.elf' + conf_path: './.config' + elf_path: './nuttx_user.elf' diff --git a/boards/arm/mps/mps2-an500/configs/citest_protected/defconfig b/boards/arm/mps/mps2-an500/configs/citest_protected/defconfig new file mode 100644 index 00000000000..92485e8026c --- /dev/null +++ b/boards/arm/mps/mps2-an500/configs/citest_protected/defconfig @@ -0,0 +1,81 @@ +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# +CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD="mps2-an500" +CONFIG_ARCH_BOARD_MPS2_AN500=y +CONFIG_ARCH_CHIP="mps" +CONFIG_ARCH_CHIP_MPS2_AN500=y +CONFIG_ARCH_CHIP_MPS=y +CONFIG_ARCH_INTERRUPTSTACK=2048 +CONFIG_ARCH_STACKDUMP=y +CONFIG_ARMV7M_SYSTICK=y +CONFIG_ARM_MPU=y +CONFIG_ARM_MPU_EARLY_RESET=y +CONFIG_BUILD_PROTECTED=y +CONFIG_BUILTIN=y +CONFIG_CMSDK_UART0=y +CONFIG_CMSDK_UART0_BASE=0x40004000 +CONFIG_CMSDK_UART0_CLOCK=25000000 +CONFIG_CMSDK_UART0_OV_IRQ=28 +CONFIG_CMSDK_UART0_RX_IRQ=16 +CONFIG_CMSDK_UART0_SERIAL_CONSOLE=y +CONFIG_CMSDK_UART0_TX_IRQ=17 +CONFIG_CMSDK_UART=y +CONFIG_DEBUG_ASSERTIONS=y +CONFIG_DEBUG_FEATURES=y +CONFIG_DEBUG_FULLOPT=y +CONFIG_DEBUG_SCHED=y +CONFIG_DEBUG_SCHED_ERROR=y +CONFIG_DEBUG_SCHED_WARN=y +CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEFAULT_TASK_STACKSIZE=4096 +CONFIG_EXAMPLES_HELLO=y +CONFIG_EXAMPLES_HELLOXX=y +CONFIG_EXAMPLES_PIPE=y +CONFIG_EXPERIMENTAL=y +CONFIG_FS_PROCFS=y +CONFIG_FS_ROMFS=y +CONFIG_FS_TMPFS=y +CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INTELHEX_BINARY=y +CONFIG_LIBC_MEMFD_ERROR=y +CONFIG_MM_REGIONS=2 +CONFIG_NSH_BUILTIN_APPS=y +CONFIG_NSH_FILEIOSIZE=512 +CONFIG_NSH_READLINE=y +CONFIG_NUTTX_USERSPACE=0x20000000 +CONFIG_PASS1_BUILDIR="boards/arm/mps/mps2-an500/kernel" +CONFIG_PIPES=y +CONFIG_PREALLOC_TIMERS=4 +CONFIG_RAMLOG=y +CONFIG_RAM_SIZE=2097152 +CONFIG_RAM_START=0x60000000 +CONFIG_RAW_BINARY=y +CONFIG_READLINE_CMD_HISTORY=y +CONFIG_RR_INTERVAL=200 +CONFIG_SCHED_HPWORK=y +CONFIG_SCHED_HPWORKPRIORITY=192 +CONFIG_STACK_COLORATION=y +CONFIG_STANDARD_SERIAL=y +CONFIG_START_DAY=25 +CONFIG_START_MONTH=4 +CONFIG_START_YEAR=2023 +CONFIG_SYMTAB_ORDEREDBYNAME=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_SETLOGMASK=y +CONFIG_SYSTEM_SYSTEM=y +CONFIG_TESTING_GETPRIME=y +CONFIG_TESTING_HEAP=y +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y +CONFIG_TIMER=y +CONFIG_TIMER_ARCH=y +CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm/mps/mps2-an500/configs/citest_protected/run.sh b/boards/arm/mps/mps2-an500/configs/citest_protected/run.sh new file mode 100755 index 00000000000..4caf1dd9593 --- /dev/null +++ b/boards/arm/mps/mps2-an500/configs/citest_protected/run.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +############################################################################ +# boards/arm/mps/mps2-an500/configs/citest_protected/run.sh +# +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +set -o xtrace + +# start from nuttx dir +olddir=$(pwd) +nuttdir=${CURRENTCONFDIR}/../../../../../../ +cd ${nuttdir} + +# run NTFC +confpath=${CURRENTCONFDIR}/config.yaml +jsonconf=${CURRENTCONFDIR}/session.json +testpath=${NTFCDIR}/external/nuttx-testing +ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf} + +ret="$?" +echo $ret + +# export test results; keep the results of an earlier attempt +artifacts=${ARTIFACTCONFDIR}/ntfc/result +mkdir -p ${artifacts} +rm -f pytest.debug.log +mv result/* ${artifacts} +rm -rf result + +# restore old dir +cd ${olddir} + +exit $ret diff --git a/boards/arm/mps/mps2-an500/configs/citest_protected/session.json b/boards/arm/mps/mps2-an500/configs/citest_protected/session.json new file mode 100644 index 00000000000..b88ef1c1926 --- /dev/null +++ b/boards/arm/mps/mps2-an500/configs/citest_protected/session.json @@ -0,0 +1,13 @@ +{ + "module": { + "include_module": [], + "exclude_module": + [ + "Nuttx_System_Arch_Os_Stability" + ], + "order": [] + }, + "args": { + "kv": [] + } +}
