From ca747ee289326be3012d59edd1c84fc72193d5bf Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 12 Dec 2018 17:56:02 -0600 Subject: [PATCH] Rename CONFIG_EXAMPLES_OSTEST -> CONFIG_TESTING_OSTEST --- configs/avr32dev1/ostest/defconfig | 6 ++--- configs/bambino-200e/src/lpc43_ostest.c | 10 +++---- configs/demo9s12ne64/ostest/defconfig | 12 ++++----- configs/ea3152/ostest/defconfig | 6 ++--- configs/esp32-core/ostest/defconfig | 6 ++--- configs/ez80f910200kitg/ostest/defconfig | 12 ++++----- configs/kwikstik-k40/ostest/defconfig | 6 ++--- configs/lc823450-xgevk/audio/defconfig | 2 +- configs/lc823450-xgevk/bt/defconfig | 2 +- configs/lc823450-xgevk/kostest/defconfig | 6 ++--- configs/lc823450-xgevk/krndis/defconfig | 2 +- configs/lc823450-xgevk/nsh/defconfig | 2 +- configs/lc823450-xgevk/rndis/defconfig | 2 +- configs/lc823450-xgevk/usb/defconfig | 2 +- configs/lpc4330-xplorer/src/lpc43_ostest.c | 10 +++---- configs/lpc4357-evb/src/lpc43_ostest.c | 10 +++---- configs/lpc4370-link2/src/lpc43_ostest.c | 10 +++---- configs/mikroe-stm32f4/kostest/defconfig | 2 +- configs/misoc/hello/defconfig | 4 +-- configs/misoc/nsh/defconfig | 4 +-- configs/ne64badge/ostest/defconfig | 12 ++++----- configs/nucleo-l432kc/nsh/defconfig | 2 +- configs/nucleo-l452re/nsh/defconfig | 6 ++--- configs/nucleo-l476rg/nsh/defconfig | 2 +- configs/nucleo-l496zg/nsh/defconfig | 2 +- configs/or1k/nsh/defconfig | 30 ++++++++++----------- configs/p112/ostest/defconfig | 6 ++--- configs/qemu-i486/ostest/defconfig | 10 +++---- configs/sam4cmp-db/nsh/defconfig | 2 +- configs/sama5d3-xplained/src/sam_ostest.c | 12 ++++----- configs/sama5d3x-ek/src/sam_ostest.c | 12 ++++----- configs/sama5d4-ek/src/sam_ostest.c | 12 ++++----- configs/sim/ostest/defconfig | 4 +-- configs/skp16c26/ostest/defconfig | 8 +++--- configs/stm3240g-eval/src/stm32_ostest.c | 10 +++---- configs/stm32f429i-disco/src/stm32_ostest.c | 12 ++++----- configs/stm32f4discovery/kostest/defconfig | 6 ++--- configs/stm32f4discovery/src/Makefile | 2 +- configs/stm32f4discovery/src/stm32_ostest.c | 12 ++++----- configs/stm32f4discovery/winbuild/defconfig | 6 ++--- configs/stm32f746g-disco/src/stm32_ostest.c | 12 ++++----- configs/stm32f769i-disco/src/stm32_ostest.c | 12 ++++----- configs/us7032evb1/ostest/defconfig | 12 ++++----- configs/xmc4500-relax/src/Makefile | 2 +- configs/xmc4500-relax/src/xmc4_ostest.c | 12 ++++----- configs/z16f2800100zcog/ostest/defconfig | 2 +- configs/z80sim/ostest/defconfig | 12 ++++----- configs/z8encore000zco/ostest/defconfig | 4 +-- configs/z8f64200100kit/ostest/defconfig | 4 +-- 49 files changed, 178 insertions(+), 178 deletions(-) diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig index 89f0a82292..ea899ac376 100644 --- a/configs/avr32dev1/ostest/defconfig +++ b/configs/avr32dev1/ostest/defconfig @@ -17,9 +17,6 @@ CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_POLL=y CONFIG_ENDIAN_BIG=y -CONFIG_EXAMPLES_OSTEST=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024 CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 @@ -36,6 +33,9 @@ CONFIG_START_DAY=2 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2010 CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 +CONFIG_TESTING_OSTEST_STACKSIZE=1024 CONFIG_USART1_BAUD=57600 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/configs/bambino-200e/src/lpc43_ostest.c b/configs/bambino-200e/src/lpc43_ostest.c index a7aad06bd9..4fb9e1fffa 100644 --- a/configs/bambino-200e/src/lpc43_ostest.c +++ b/configs/bambino-200e/src/lpc43_ostest.c @@ -59,15 +59,15 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && \ +#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_TESTING_OSTEST_FPUSIZE) && \ defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*SW_FPU_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -80,7 +80,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -99,7 +99,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig index 961bda6708..06f5cad1b7 100644 --- a/configs/demo9s12ne64/ostest/defconfig +++ b/configs/demo9s12ne64/ostest/defconfig @@ -1,11 +1,11 @@ # CONFIG_DEV_CONSOLE is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ARCH_BOARD_DEMOS92S12NEC64=y +CONFIG_ARCH="hc" CONFIG_ARCH_BOARD="demo9s12ne64" +CONFIG_ARCH_BOARD_DEMOS92S12NEC64=y CONFIG_ARCH_CHIP_MCS92S12NEC64=y CONFIG_ARCH_HC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="hc" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y @@ -13,9 +13,6 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=512 -CONFIG_EXAMPLES_OSTEST=y CONFIG_HCS12_NONBANKED=y CONFIG_HCS12_SCI0=y CONFIG_HCS12_SERIALMON=y @@ -41,6 +38,9 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2009 CONFIG_STDIO_BUFFER_SIZE=0 CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="ostest_main" +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 +CONFIG_TESTING_OSTEST_STACKSIZE=512 CONFIG_USERMAIN_STACKSIZE=512 +CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig index 683af2686f..ed03c8cdc0 100644 --- a/configs/ea3152/ostest/defconfig +++ b/configs/ea3152/ostest/defconfig @@ -13,9 +13,6 @@ CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_OSTEST=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_HOST_WINDOWS=y CONFIG_LPC31_UART=y CONFIG_MAX_TASKS=16 @@ -35,6 +32,9 @@ CONFIG_START_DAY=26 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2009 CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 +CONFIG_TESTING_OSTEST_STACKSIZE=2048 CONFIG_UART_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/esp32-core/ostest/defconfig b/configs/esp32-core/ostest/defconfig index 869a818777..9fda87cb26 100644 --- a/configs/esp32-core/ostest/defconfig +++ b/configs/esp32-core/ostest/defconfig @@ -9,9 +9,6 @@ CONFIG_BUILTIN=y CONFIG_DEBUG_FEATURES=y CONFIG_DISABLE_POLL=y CONFIG_ESP32_UART0=y -CONFIG_EXAMPLES_OSTEST=y -CONFIG_EXAMPLES_OSTEST_LOOPS=10 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=6114 CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y @@ -39,5 +36,8 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SUPPRESS_CLOCK_CONFIG=y CONFIG_SYSTEM_READLINE=y +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_LOOPS=10 +CONFIG_TESTING_OSTEST_STACKSIZE=6114 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig index 4097626044..9ea178e10a 100644 --- a/configs/ez80f910200kitg/ostest/defconfig +++ b/configs/ez80f910200kitg/ostest/defconfig @@ -1,10 +1,10 @@ # CONFIG_ARCH_LEDS is not set -CONFIG_ARCH_BOARD_EZ80F910200KITG=y +CONFIG_ARCH="z80" CONFIG_ARCH_BOARD="ez80f910200kitg" +CONFIG_ARCH_BOARD_EZ80F910200KITG=y CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_Z80=y -CONFIG_ARCH="z80" CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y @@ -13,9 +13,6 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 -CONFIG_EXAMPLES_OSTEST=y CONFIG_EZ80_UART0=y CONFIG_HOST_WINDOWS=y CONFIG_MAX_TASKS=8 @@ -35,10 +32,13 @@ CONFIG_START_MONTH=2 CONFIG_START_YEAR=2009 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 +CONFIG_TESTING_OSTEST_STACKSIZE=2048 CONFIG_UART0_BAUD=57600 CONFIG_UART0_RXBUFSIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=0 -CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig index d155410978..640156ef30 100644 --- a/configs/kwikstik-k40/ostest/defconfig +++ b/configs/kwikstik-k40/ostest/defconfig @@ -12,9 +12,6 @@ CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_OSTEST=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y CONFIG_KINETIS_UART5=y CONFIG_MAX_TASKS=16 @@ -32,6 +29,9 @@ CONFIG_START_DAY=25 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2013 CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 +CONFIG_TESTING_OSTEST_STACKSIZE=2048 CONFIG_UART5_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/lc823450-xgevk/audio/defconfig b/configs/lc823450-xgevk/audio/defconfig index 70d2f89262..87807784a5 100644 --- a/configs/lc823450-xgevk/audio/defconfig +++ b/configs/lc823450-xgevk/audio/defconfig @@ -32,7 +32,6 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_I2SLOOP=y CONFIG_EXAMPLES_NXHELLO=y CONFIG_EXAMPLES_NXHELLO_BPP=1 -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_PIPE=y CONFIG_EXAMPLES_SMP=y CONFIG_FAT_LCNAMES=y @@ -132,6 +131,7 @@ CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mtdblock0p10" CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mtdblock1" CONFIG_SYSTEM_USBMSC_NLUNS=2 CONFIG_TASK_NAME_SIZE=24 +CONFIG_TESTING_OSTEST=y CONFIG_UART0_RXBUFSIZE=512 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=2048 diff --git a/configs/lc823450-xgevk/bt/defconfig b/configs/lc823450-xgevk/bt/defconfig index 4757c02034..50607d6fa0 100644 --- a/configs/lc823450-xgevk/bt/defconfig +++ b/configs/lc823450-xgevk/bt/defconfig @@ -34,7 +34,6 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_I2SLOOP=y CONFIG_EXAMPLES_NXHELLO=y CONFIG_EXAMPLES_NXHELLO_BPP=1 -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_PIPE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y @@ -169,6 +168,7 @@ CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TELNET_CHARACTER_MODE=y +CONFIG_TESTING_OSTEST=y CONFIG_UART0_RXBUFSIZE=512 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=2048 diff --git a/configs/lc823450-xgevk/kostest/defconfig b/configs/lc823450-xgevk/kostest/defconfig index b4a88cbdd1..4a36ed8db9 100644 --- a/configs/lc823450-xgevk/kostest/defconfig +++ b/configs/lc823450-xgevk/kostest/defconfig @@ -12,9 +12,6 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_OSTEST=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y CONFIG_LC823450_MTM0_TICK=y CONFIG_LC823450_SPIFI=y @@ -42,6 +39,9 @@ CONFIG_START_YEAR=2013 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_TIME64=y CONFIG_SYS_RESERVED=8 +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 +CONFIG_TESTING_OSTEST_STACKSIZE=2048 CONFIG_UART0_RXBUFSIZE=512 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=2048 diff --git a/configs/lc823450-xgevk/krndis/defconfig b/configs/lc823450-xgevk/krndis/defconfig index 2f0ea98c2f..ec86d96429 100644 --- a/configs/lc823450-xgevk/krndis/defconfig +++ b/configs/lc823450-xgevk/krndis/defconfig @@ -38,7 +38,6 @@ CONFIG_EXAMPLES_HELLOXX=m CONFIG_EXAMPLES_I2SLOOP=y CONFIG_EXAMPLES_NXHELLO=y CONFIG_EXAMPLES_NXHELLO_BPP=1 -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_PIPE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y @@ -181,6 +180,7 @@ CONFIG_SYSTEM_TIME64=y CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=24 CONFIG_TELNET_CHARACTER_MODE=y +CONFIG_TESTING_OSTEST=y CONFIG_UART0_RXBUFSIZE=512 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=2048 diff --git a/configs/lc823450-xgevk/nsh/defconfig b/configs/lc823450-xgevk/nsh/defconfig index e1815f1454..1ebd1d45eb 100644 --- a/configs/lc823450-xgevk/nsh/defconfig +++ b/configs/lc823450-xgevk/nsh/defconfig @@ -27,7 +27,6 @@ CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_NXHELLO=y CONFIG_EXAMPLES_NXHELLO_BPP=1 -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_PIPE=y CONFIG_EXAMPLES_SMP=y CONFIG_EXAMPLES_WATCHDOG=y @@ -121,6 +120,7 @@ CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 +CONFIG_TESTING_OSTEST=y CONFIG_UART0_RXBUFSIZE=512 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=2048 diff --git a/configs/lc823450-xgevk/rndis/defconfig b/configs/lc823450-xgevk/rndis/defconfig index 50b9847750..23a27696aa 100644 --- a/configs/lc823450-xgevk/rndis/defconfig +++ b/configs/lc823450-xgevk/rndis/defconfig @@ -36,7 +36,6 @@ CONFIG_EXAMPLES_HELLOXX=m CONFIG_EXAMPLES_I2SLOOP=y CONFIG_EXAMPLES_NXHELLO=y CONFIG_EXAMPLES_NXHELLO_BPP=1 -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_PIPE=y CONFIG_EXAMPLES_SMP=y CONFIG_FAT_LCNAMES=y @@ -181,6 +180,7 @@ CONFIG_SYSTEM_TASKSET=y CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TELNET_CHARACTER_MODE=y +CONFIG_TESTING_OSTEST=y CONFIG_UART0_RXBUFSIZE=512 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=2048 diff --git a/configs/lc823450-xgevk/usb/defconfig b/configs/lc823450-xgevk/usb/defconfig index 93e29f55c6..16efc8cd5d 100644 --- a/configs/lc823450-xgevk/usb/defconfig +++ b/configs/lc823450-xgevk/usb/defconfig @@ -28,7 +28,6 @@ CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_NXHELLO=y CONFIG_EXAMPLES_NXHELLO_BPP=1 -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_PIPE=y CONFIG_EXAMPLES_SMP=y CONFIG_EXAMPLES_WATCHDOG=y @@ -130,6 +129,7 @@ CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mtdblock0p10" CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mtdblock1" CONFIG_SYSTEM_USBMSC_NLUNS=2 CONFIG_TASK_NAME_SIZE=24 +CONFIG_TESTING_OSTEST=y CONFIG_UART0_RXBUFSIZE=512 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=2048 diff --git a/configs/lpc4330-xplorer/src/lpc43_ostest.c b/configs/lpc4330-xplorer/src/lpc43_ostest.c index 8b99cf7114..b0656ab48b 100644 --- a/configs/lpc4330-xplorer/src/lpc43_ostest.c +++ b/configs/lpc4330-xplorer/src/lpc43_ostest.c @@ -57,15 +57,15 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && \ +#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_TESTING_OSTEST_FPUSIZE) && \ defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*SW_FPU_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -81,7 +81,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; /************************************************************************************ * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -100,7 +100,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/lpc4357-evb/src/lpc43_ostest.c b/configs/lpc4357-evb/src/lpc43_ostest.c index cc3b9f8428..8ac41b2aaf 100644 --- a/configs/lpc4357-evb/src/lpc43_ostest.c +++ b/configs/lpc4357-evb/src/lpc43_ostest.c @@ -57,15 +57,15 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && \ +#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_TESTING_OSTEST_FPUSIZE) && \ defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*SW_FPU_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -81,7 +81,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; /************************************************************************************ * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -100,7 +100,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/lpc4370-link2/src/lpc43_ostest.c b/configs/lpc4370-link2/src/lpc43_ostest.c index 755cdb6161..cd058b9918 100644 --- a/configs/lpc4370-link2/src/lpc43_ostest.c +++ b/configs/lpc4370-link2/src/lpc43_ostest.c @@ -57,15 +57,15 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && \ +#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_TESTING_OSTEST_FPUSIZE) && \ defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*SW_FPU_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -81,7 +81,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; /************************************************************************************ * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -100,7 +100,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig index 65a942d3db..d894a83c9a 100644 --- a/configs/mikroe-stm32f4/kostest/defconfig +++ b/configs/mikroe-stm32f4/kostest/defconfig @@ -21,7 +21,6 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_LOOP=y CONFIG_DEV_ZERO=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_OSTEST=y CONFIG_FS_FAT=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y @@ -84,6 +83,7 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" CONFIG_SYSTEM_NSH=y CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=11 +CONFIG_TESTING_OSTEST=y CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/misoc/hello/defconfig b/configs/misoc/hello/defconfig index 11d4efbb82..8737cfb2f5 100644 --- a/configs/misoc/hello/defconfig +++ b/configs/misoc/hello/defconfig @@ -19,8 +19,6 @@ CONFIG_EXAMPLES_NETTEST_INIT=y CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80132 CONFIG_EXAMPLES_NETTEST_NOMAC=y CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y -CONFIG_SYSTEM_NSH=y -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_TCPECHO=y CONFIG_EXAMPLES_TELNETD=y CONFIG_EXAMPLES_TELNETD_DRIPADDR=0xc0a80101 @@ -74,8 +72,10 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=16 CONFIG_START_MONTH=6 CONFIG_START_YEAR=2011 +CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/misoc/nsh/defconfig b/configs/misoc/nsh/defconfig index e771934da6..597d38cec9 100644 --- a/configs/misoc/nsh/defconfig +++ b/configs/misoc/nsh/defconfig @@ -16,8 +16,6 @@ CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y -CONFIG_SYSTEM_NSH=y -CONFIG_EXAMPLES_OSTEST=y CONFIG_MAX_TASKS=4 CONFIG_MAX_WDOGPARMS=2 CONFIG_MISOC_UART1=y @@ -36,7 +34,9 @@ CONFIG_START_DAY=16 CONFIG_START_MONTH=6 CONFIG_START_YEAR=2011 CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig index 37d770eb44..a3cf6b06d7 100644 --- a/configs/ne64badge/ostest/defconfig +++ b/configs/ne64badge/ostest/defconfig @@ -1,11 +1,11 @@ # CONFIG_DEV_CONSOLE is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ARCH_BOARD_NE64BADGE=y +CONFIG_ARCH="hc" CONFIG_ARCH_BOARD="ne64badge" +CONFIG_ARCH_BOARD_NE64BADGE=y CONFIG_ARCH_CHIP_MCS92S12NEC64=y CONFIG_ARCH_HC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="hc" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y @@ -13,9 +13,6 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=512 -CONFIG_EXAMPLES_OSTEST=y CONFIG_HCS12_NONBANKED=y CONFIG_HCS12_SCI0=y CONFIG_IDLETHREAD_STACKSIZE=256 @@ -41,6 +38,9 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2009 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="ostest_main" +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 +CONFIG_TESTING_OSTEST_STACKSIZE=512 CONFIG_USERMAIN_STACKSIZE=512 +CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/nucleo-l432kc/nsh/defconfig b/configs/nucleo-l432kc/nsh/defconfig index fd97a42a42..1338ac8df5 100644 --- a/configs/nucleo-l432kc/nsh/defconfig +++ b/configs/nucleo-l432kc/nsh/defconfig @@ -17,7 +17,6 @@ CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_ALARM=y -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_RANDOM=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -59,6 +58,7 @@ CONFIG_STM32L4_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/nucleo-l452re/nsh/defconfig b/configs/nucleo-l452re/nsh/defconfig index f7d71c1c7a..74c3a89f03 100644 --- a/configs/nucleo-l452re/nsh/defconfig +++ b/configs/nucleo-l452re/nsh/defconfig @@ -20,9 +20,6 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_EXAMPLES_ADC=y CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_ALARM=y -CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_CXXINITIALIZE=y -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_RANDOM=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y @@ -74,9 +71,12 @@ CONFIG_STM32L4_SPI1=y CONFIG_STM32L4_SRAM2_HEAP=y CONFIG_STM32L4_USART2=y CONFIG_SYSTEM_I2CTOOL=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_SYSTEM_STACKMONITOR=y CONFIG_SYSTEM_TEE=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 diff --git a/configs/nucleo-l476rg/nsh/defconfig b/configs/nucleo-l476rg/nsh/defconfig index b131b3b7e4..0abf106880 100644 --- a/configs/nucleo-l476rg/nsh/defconfig +++ b/configs/nucleo-l476rg/nsh/defconfig @@ -17,7 +17,6 @@ CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_ALARM=y -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_RANDOM=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -59,6 +58,7 @@ CONFIG_STM32L4_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/nucleo-l496zg/nsh/defconfig b/configs/nucleo-l496zg/nsh/defconfig index eba8d89770..645e87171d 100644 --- a/configs/nucleo-l496zg/nsh/defconfig +++ b/configs/nucleo-l496zg/nsh/defconfig @@ -20,7 +20,6 @@ CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_ADC=y CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_ALARM=y -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_RANDOM=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y @@ -93,6 +92,7 @@ CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_SYSTEM_STACKMONITOR=y CONFIG_SYSTEM_TEE=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/or1k/nsh/defconfig b/configs/or1k/nsh/defconfig index 87e94aaa08..b56245b6ba 100644 --- a/configs/or1k/nsh/defconfig +++ b/configs/or1k/nsh/defconfig @@ -1,4 +1,6 @@ # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -9,21 +11,19 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set CONFIG_16550_ADDRWIDTH=32 CONFIG_16550_REGWIDTH=32 -CONFIG_16550_UART=y +CONFIG_16550_UART0=y CONFIG_16550_UART0_BASE=0x90000000 CONFIG_16550_UART0_CLOCK=50000000 CONFIG_16550_UART0_IRQ=2 CONFIG_16550_UART0_SERIAL_CONSOLE=y -CONFIG_16550_UART0=y -CONFIG_ARCH_BOARD_OR1K=y +CONFIG_16550_UART=y +CONFIG_ARCH="or1k" CONFIG_ARCH_BOARD="or1k" +CONFIG_ARCH_BOARD_OR1K=y CONFIG_ARCH_CHIP_MOR1KX=y CONFIG_ARCH_OR1K=y -CONFIG_ARCH="or1k" CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=512 CONFIG_BOOT_RUNFROMSDRAM=y @@ -31,38 +31,36 @@ CONFIG_BUILTIN=y CONFIG_DEBUG_ASSERTIONS=y CONFIG_DEBUG_ERROR=y CONFIG_DEBUG_FEATURES=y +CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS_ERROR=y CONFIG_DEBUG_FS_INFO=y CONFIG_DEBUG_FS_WARN=y -CONFIG_DEBUG_FS=y CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_IRQ=y CONFIG_DEBUG_IRQ_ERROR=y CONFIG_DEBUG_IRQ_INFO=y CONFIG_DEBUG_IRQ_WARN=y -CONFIG_DEBUG_IRQ=y +CONFIG_DEBUG_MM=y CONFIG_DEBUG_MM_ERROR=y CONFIG_DEBUG_MM_INFO=y CONFIG_DEBUG_MM_WARN=y -CONFIG_DEBUG_MM=y +CONFIG_DEBUG_SCHED=y CONFIG_DEBUG_SCHED_ERROR=y CONFIG_DEBUG_SCHED_INFO=y CONFIG_DEBUG_SCHED_WARN=y -CONFIG_DEBUG_SCHED=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEBUG_TIMER=y CONFIG_DEBUG_TIMER_ERROR=y CONFIG_DEBUG_TIMER_INFO=y CONFIG_DEBUG_TIMER_WARN=y -CONFIG_DEBUG_TIMER=y CONFIG_DEBUG_WARN=y CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y -CONFIG_SYSTEM_NSH=y -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXPERIMENTAL=y -CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_PROCFS=y +CONFIG_FS_PROCFS_REGISTER=y CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=32 @@ -84,8 +82,10 @@ CONFIG_START_DAY=7 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2012 CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_TESTING_OSTEST=y CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/p112/ostest/defconfig b/configs/p112/ostest/defconfig index 28cf8497f3..603947db94 100644 --- a/configs/p112/ostest/defconfig +++ b/configs/p112/ostest/defconfig @@ -12,9 +12,6 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=4 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024 -CONFIG_EXAMPLES_OSTEST=y CONFIG_GRAN=y CONFIG_HOST_WINDOWS=y CONFIG_MAX_TASKS=8 @@ -33,6 +30,9 @@ CONFIG_START_MONTH=2 CONFIG_START_YEAR=2007 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=4 +CONFIG_TESTING_OSTEST_STACKSIZE=1024 +CONFIG_TESTING_OSTEST=y CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig index 694502226a..bb59786161 100644 --- a/configs/qemu-i486/ostest/defconfig +++ b/configs/qemu-i486/ostest/defconfig @@ -1,16 +1,13 @@ -CONFIG_ARCH_BOARD_QEMU_I486=y +CONFIG_ARCH="x86" CONFIG_ARCH_BOARD="qemu-i486" +CONFIG_ARCH_BOARD_QEMU_I486=y CONFIG_ARCH_CHIP_QEMU=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_X86=y -CONFIG_ARCH="x86" CONFIG_BOARD_LOOPSPERMSEC=999 CONFIG_BOOT_RUNFROMEXTSRAM=y CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_OSTEST_LOOPS=100 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096 -CONFIG_EXAMPLES_OSTEST=y CONFIG_FS_FAT=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_MAX_TASKS=64 @@ -22,4 +19,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_LOOPS=100 +CONFIG_TESTING_OSTEST_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/configs/sam4cmp-db/nsh/defconfig b/configs/sam4cmp-db/nsh/defconfig index 63a1c97f9c..95c88f73a5 100644 --- a/configs/sam4cmp-db/nsh/defconfig +++ b/configs/sam4cmp-db/nsh/defconfig @@ -10,7 +10,6 @@ CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_SMP=y CONFIG_FS_PROCFS=y CONFIG_MAX_WDOGPARMS=2 @@ -36,6 +35,7 @@ CONFIG_START_MONTH=6 CONFIG_START_YEAR=2013 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=24 +CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/sama5d3-xplained/src/sam_ostest.c b/configs/sama5d3-xplained/src/sam_ostest.c index bce5794831..fcd3fcd720 100644 --- a/configs/sama5d3-xplained/src/sam_ostest.c +++ b/configs/sama5d3-xplained/src/sam_ostest.c @@ -57,16 +57,16 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE) && \ - defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ +#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_TESTING_OSTEST_FPUTESTDISABLE) && \ + defined(CONFIG_TESTING_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*FPU_CONTEXT_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*FPU_CONTEXT_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -82,7 +82,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; /************************************************************************************ * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -101,7 +101,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/sama5d3x-ek/src/sam_ostest.c b/configs/sama5d3x-ek/src/sam_ostest.c index 4e521e61ae..79ad5e1f8c 100644 --- a/configs/sama5d3x-ek/src/sam_ostest.c +++ b/configs/sama5d3x-ek/src/sam_ostest.c @@ -57,16 +57,16 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE) && \ - defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ +#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_TESTING_OSTEST_FPUTESTDISABLE) && \ + defined(CONFIG_TESTING_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*FPU_CONTEXT_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*FPU_CONTEXT_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -82,7 +82,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; /************************************************************************************ * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -101,7 +101,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/sama5d4-ek/src/sam_ostest.c b/configs/sama5d4-ek/src/sam_ostest.c index 712b10ae50..1cb9443ad5 100644 --- a/configs/sama5d4-ek/src/sam_ostest.c +++ b/configs/sama5d4-ek/src/sam_ostest.c @@ -57,16 +57,16 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE) && \ - defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ +#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_TESTING_OSTEST_FPUTESTDISABLE) && \ + defined(CONFIG_TESTING_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*FPU_CONTEXT_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*FPU_CONTEXT_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -82,7 +82,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; /************************************************************************************ * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -101,7 +101,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig index 54e76eba95..68798fa231 100644 --- a/configs/sim/ostest/defconfig +++ b/configs/sim/ostest/defconfig @@ -5,8 +5,6 @@ CONFIG_ARCH_SIM=y CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_OSTEST=y -CONFIG_EXAMPLES_OSTEST_LOOPS=100 CONFIG_FS_NAMED_SEMAPHORES=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_MAX_TASKS=64 @@ -20,5 +18,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=27 CONFIG_START_MONTH=2 CONFIG_START_YEAR=2007 +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_LOOPS=100 CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig index e018a0558f..d35ae0793f 100644 --- a/configs/skp16c26/ostest/defconfig +++ b/configs/skp16c26/ostest/defconfig @@ -1,11 +1,11 @@ # CONFIG_DISABLE_POSIX_TIMERS is not set -CONFIG_ARCH_BOARD_SKP16C26=y +CONFIG_ARCH="renesas" CONFIG_ARCH_BOARD="skp16c26" +CONFIG_ARCH_BOARD_SKP16C26=y CONFIG_ARCH_CHIP_M30262F8=y CONFIG_ARCH_INTERRUPTSTACK=128 CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="renesas" CONFIG_BOARD_LOOPSPERMSEC=16945 CONFIG_DEFAULT_SMALL=y CONFIG_DEV_LOWCONSOLE=y @@ -13,7 +13,6 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_ENDIAN_BIG=y -CONFIG_EXAMPLES_OSTEST=y CONFIG_IDLETHREAD_STACKSIZE=256 CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 @@ -36,6 +35,7 @@ CONFIG_START_DAY=20 CONFIG_START_MONTH=2 CONFIG_START_YEAR=2009 CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="ostest_main" +CONFIG_TESTING_OSTEST=y CONFIG_USERMAIN_STACKSIZE=256 +CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/stm3240g-eval/src/stm32_ostest.c b/configs/stm3240g-eval/src/stm32_ostest.c index 57952ef65e..267e1ab8bc 100644 --- a/configs/stm3240g-eval/src/stm32_ostest.c +++ b/configs/stm3240g-eval/src/stm32_ostest.c @@ -57,15 +57,15 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && \ +#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_TESTING_OSTEST_FPUSIZE) && \ defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*SW_FPU_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -81,7 +81,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; /************************************************************************************ * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -100,7 +100,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/stm32f429i-disco/src/stm32_ostest.c b/configs/stm32f429i-disco/src/stm32_ostest.c index 3237cb9393..65c0fa0e5e 100644 --- a/configs/stm32f429i-disco/src/stm32_ostest.c +++ b/configs/stm32f429i-disco/src/stm32_ostest.c @@ -57,16 +57,16 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE) && \ - defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ +#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_TESTING_OSTEST_FPUTESTDISABLE) && \ + defined(CONFIG_TESTING_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*SW_FPU_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -82,7 +82,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; /************************************************************************************ * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -101,7 +101,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig index 47861e2a29..26b3593a97 100644 --- a/configs/stm32f4discovery/kostest/defconfig +++ b/configs/stm32f4discovery/kostest/defconfig @@ -13,9 +13,6 @@ CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_OSTEST=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 @@ -41,6 +38,9 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYS_RESERVED=8 +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 +CONFIG_TESTING_OSTEST_STACKSIZE=2048 CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 diff --git a/configs/stm32f4discovery/src/Makefile b/configs/stm32f4discovery/src/Makefile index c73582ae95..34d59a0c7f 100644 --- a/configs/stm32f4discovery/src/Makefile +++ b/configs/stm32f4discovery/src/Makefile @@ -177,7 +177,7 @@ ifeq ($(CONFIG_LCD_UG2864HSWEG01),y) CSRCS += stm32_ug2864hsweg01.c endif -ifeq ($(CONFIG_EXAMPLES_OSTEST),y) +ifeq ($(CONFIG_TESTING_OSTEST),y) CSRCS += stm32_ostest.c endif diff --git a/configs/stm32f4discovery/src/stm32_ostest.c b/configs/stm32f4discovery/src/stm32_ostest.c index 289db1b3ed..742caf9aed 100644 --- a/configs/stm32f4discovery/src/stm32_ostest.c +++ b/configs/stm32f4discovery/src/stm32_ostest.c @@ -58,16 +58,16 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE) && \ - defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ +#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_TESTING_OSTEST_FPUTESTDISABLE) && \ + defined(CONFIG_TESTING_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*SW_FPU_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -80,7 +80,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -99,7 +99,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig index 3e003317ab..54cb8532bd 100644 --- a/configs/stm32f4discovery/winbuild/defconfig +++ b/configs/stm32f4discovery/winbuild/defconfig @@ -11,9 +11,6 @@ CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 -CONFIG_EXAMPLES_OSTEST=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 @@ -35,6 +32,9 @@ CONFIG_START_YEAR=2009 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 +CONFIG_TESTING_OSTEST_STACKSIZE=2048 +CONFIG_TESTING_OSTEST=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 diff --git a/configs/stm32f746g-disco/src/stm32_ostest.c b/configs/stm32f746g-disco/src/stm32_ostest.c index 793e48f4dd..f6c91b22f6 100644 --- a/configs/stm32f746g-disco/src/stm32_ostest.c +++ b/configs/stm32f746g-disco/src/stm32_ostest.c @@ -57,16 +57,16 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE) && \ - defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ +#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_TESTING_OSTEST_FPUTESTDISABLE) && \ + defined(CONFIG_TESTING_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*SW_FPU_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -82,7 +82,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; /************************************************************************************ * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -101,7 +101,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/stm32f769i-disco/src/stm32_ostest.c b/configs/stm32f769i-disco/src/stm32_ostest.c index 1ca75cdfbf..b7829a814f 100644 --- a/configs/stm32f769i-disco/src/stm32_ostest.c +++ b/configs/stm32f769i-disco/src/stm32_ostest.c @@ -57,16 +57,16 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE) && \ - defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ +#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_TESTING_OSTEST_FPUTESTDISABLE) && \ + defined(CONFIG_TESTING_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*SW_FPU_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -83,7 +83,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -102,7 +102,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig index 08a82e3166..731c1bdb7b 100644 --- a/configs/us7032evb1/ostest/defconfig +++ b/configs/us7032evb1/ostest/defconfig @@ -1,10 +1,10 @@ -CONFIG_ARCH_BOARD_US7032EVB1=y +CONFIG_ARCH="renesas" CONFIG_ARCH_BOARD="us7032evb1" +CONFIG_ARCH_BOARD_US7032EVB1=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_SH7032=y CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="renesas" CONFIG_BOARD_LOOPSPERMSEC=572 CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y @@ -14,9 +14,6 @@ CONFIG_DISABLE_POLL=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_ENDIAN_BIG=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096 -CONFIG_EXAMPLES_OSTEST=y CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_MOTOROLA_SREC=y @@ -38,6 +35,9 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2008 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="ostest_main" +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 +CONFIG_TESTING_OSTEST_STACKSIZE=4096 CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/xmc4500-relax/src/Makefile b/configs/xmc4500-relax/src/Makefile index fe3fcaead3..11d34e10c8 100644 --- a/configs/xmc4500-relax/src/Makefile +++ b/configs/xmc4500-relax/src/Makefile @@ -60,7 +60,7 @@ ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += xmc4_appinit.c endif -ifeq ($(CONFIG_EXAMPLES_OSTEST),y) +ifeq ($(CONFIG_TESTING_OSTEST),y) CSRCS += xmc4_ostest.c endif diff --git a/configs/xmc4500-relax/src/xmc4_ostest.c b/configs/xmc4500-relax/src/xmc4_ostest.c index 02d41ca603..a3575d2555 100644 --- a/configs/xmc4500-relax/src/xmc4_ostest.c +++ b/configs/xmc4500-relax/src/xmc4_ostest.c @@ -58,16 +58,16 @@ /* Configuration ********************************************************************/ #undef HAVE_FPU -#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE) && \ - defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ +#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_TESTING_OSTEST_FPUTESTDISABLE) && \ + defined(CONFIG_TESTING_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \ !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif #ifdef HAVE_FPU -#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS) -# error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size" +#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*SW_FPU_REGS) +# error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size" #endif /************************************************************************************ @@ -80,7 +80,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; * Public Functions ************************************************************************************/ -/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return +/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ @@ -99,7 +99,7 @@ void arch_getfpu(FAR uint32_t *fpusave) leave_critical_section(flags); } -/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function +/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function * will compare them and return true if they are identical. */ diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig index 9aa7704b22..2d6682d347 100644 --- a/configs/z16f2800100zcog/ostest/defconfig +++ b/configs/z16f2800100zcog/ostest/defconfig @@ -8,7 +8,6 @@ CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_POLL=y CONFIG_ENDIAN_BIG=y -CONFIG_EXAMPLES_OSTEST=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_MAX_TASKS=16 @@ -26,6 +25,7 @@ CONFIG_START_DAY=29 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2012 CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y CONFIG_UART0_BAUD=57600 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=57600 diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig index 91bdef1e27..c53ff10529 100644 --- a/configs/z80sim/ostest/defconfig +++ b/configs/z80sim/ostest/defconfig @@ -1,18 +1,15 @@ # CONFIG_DEV_CONSOLE is not set -CONFIG_ARCH_BOARD_Z80SIM=y +CONFIG_ARCH="z80" CONFIG_ARCH_BOARD="z80sim" +CONFIG_ARCH_BOARD_Z80SIM=y CONFIG_ARCH_CHIP_Z80=y CONFIG_ARCH_Z80=y -CONFIG_ARCH="z80" CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y -CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=4 -CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024 -CONFIG_EXAMPLES_OSTEST=y CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=0 @@ -29,9 +26,12 @@ CONFIG_START_MONTH=2 CONFIG_START_YEAR=2007 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_NBARRIER_THREADS=4 +CONFIG_TESTING_OSTEST_STACKSIZE=1024 CONFIG_UART_RXBUFSIZE=64 CONFIG_UART_SERIAL_CONSOLE=y CONFIG_UART_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig index 32d09f3cf2..e7967a1ce7 100644 --- a/configs/z8encore000zco/ostest/defconfig +++ b/configs/z8encore000zco/ostest/defconfig @@ -13,8 +13,6 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y -CONFIG_EXAMPLES_OSTEST_STACKSIZE=256 -CONFIG_EXAMPLES_OSTEST=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=256 CONFIG_MAX_TASKS=8 @@ -33,6 +31,8 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2012 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST_STACKSIZE=256 +CONFIG_TESTING_OSTEST=y CONFIG_UART0_BAUD=57600 CONFIG_UART0_RXBUFSIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig index a23f4b1f31..0ecc690469 100644 --- a/configs/z8f64200100kit/ostest/defconfig +++ b/configs/z8f64200100kit/ostest/defconfig @@ -12,8 +12,6 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y -CONFIG_EXAMPLES_OSTEST_STACKSIZE=256 -CONFIG_EXAMPLES_OSTEST=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=256 CONFIG_MAX_TASKS=8 @@ -32,6 +30,8 @@ CONFIG_START_MONTH=2 CONFIG_START_YEAR=2008 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST_STACKSIZE=256 +CONFIG_TESTING_OSTEST=y CONFIG_UART0_BAUD=57600 CONFIG_UART0_RXBUFSIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y