ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtos: Remove UNITTEST macro from rtos 

Production code should not contain any test-specific checks. Rather
than checking `UNITTEST`, unit tests can directly set
`MBED_CONF_RTOS_PRESENT=1` to make RTOS available for testing.

Note: The cellular ATHandler test also has `MBED_CONF_RTOS_PRESENT=1`
added because `ATHandler.cpp` contains a check of this variable.
pull/14884/head
Lingkai Dong 2021-07-06 16:50:49 +01:00
parent 8d3fc33965
commit 3a24305916
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
View File

@ -13,6 +13,7 @@ target_compile_definitions(${TEST_NAME}
DEVICE_INTERRUPTIN=1 DEVICE_INTERRUPTIN=1
MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200 MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32 MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32
MBED_CONF_RTOS_PRESENT=1
) )
target_sources(${TEST_NAME} target_sources(${TEST_NAME}

2
rtos/include/rtos/Thread.h
View File

@ -33,7 +33,7 @@
#include "rtos/Semaphore.h" #include "rtos/Semaphore.h"
#include "rtos/Mutex.h" #include "rtos/Mutex.h"
#if MBED_CONF_RTOS_PRESENT || defined(DOXYGEN_ONLY) || defined(UNITTEST) #if MBED_CONF_RTOS_PRESENT || defined(DOXYGEN_ONLY)
namespace rtos { namespace rtos {
/** \addtogroup rtos-public-api */ /** \addtogroup rtos-public-api */

2
rtos/include/rtos/internal/mbed_rtos1_types.h
View File

@ -17,7 +17,7 @@
#ifndef MBED_RTOS_RTX1_TYPES_H #ifndef MBED_RTOS_RTX1_TYPES_H
#define MBED_RTOS_RTX1_TYPES_H #define MBED_RTOS_RTX1_TYPES_H
#if MBED_CONF_RTOS_PRESENT || defined(UNITTEST) #if MBED_CONF_RTOS_PRESENT
#include "cmsis_os.h" #include "cmsis_os.h"

2
rtos/include/rtos/internal/mbed_rtos_storage.h
View File

@ -17,7 +17,7 @@
#ifndef MBED_RTOS_STORAGE_H #ifndef MBED_RTOS_STORAGE_H
#define MBED_RTOS_STORAGE_H #define MBED_RTOS_STORAGE_H
#if MBED_CONF_RTOS_PRESENT || defined(UNITTEST) #if MBED_CONF_RTOS_PRESENT
#include "mbed_rtx_storage.h" #include "mbed_rtx_storage.h"

2
rtos/include/rtos/mbed_rtos_types.h
View File

@ -17,7 +17,7 @@
#ifndef RTOS_TYPES_H_ #ifndef RTOS_TYPES_H_
#define RTOS_TYPES_H_ #define RTOS_TYPES_H_
#if MBED_CONF_RTOS_PRESENT || defined(DOXYGEN_ONLY) || defined(UNITTEST) #if MBED_CONF_RTOS_PRESENT || defined(DOXYGEN_ONLY)
#include "cmsis_os2.h" #include "cmsis_os2.h"
#else #else

5
rtos/tests/UNITTESTS/doubles/CMakeLists.txt
View File

@ -18,7 +18,10 @@ target_include_directories(mbed-stubs-rtos-headers
add_library(mbed-stubs-rtos) add_library(mbed-stubs-rtos)
add_definitions(-DUNITTEST) target_compile_definitions(mbed-stubs-rtos
PRIVATE
MBED_CONF_RTOS_PRESENT=1
)
target_sources(mbed-stubs-rtos target_sources(mbed-stubs-rtos
PRIVATE PRIVATE