Skip to content

Commit eeafd12

Browse files
Merge branch 'feat/add_freertos_port_layer_mocks' into 'master'
feat(freertos): Add FreeRTOS port layer mocks for CMock tests See merge request espressif/esp-idf!34021
2 parents 6a29351 + 0e5adc1 commit eeafd12

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/portmacro.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ extern void vPortEnableInterrupts( void );
9494
extern BaseType_t xPortSetInterruptMask( void );
9595
extern void vPortClearInterruptMask( BaseType_t xMask );
9696

97-
extern void vPortEnterCritical( void );
98-
extern void vPortExitCritical( void );
97+
void vPortEnterCritical( void );
98+
void vPortExitCritical( void );
9999
#define portSET_INTERRUPT_MASK_FROM_ISR() xPortSetInterruptMask()
100100
#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x) vPortClearInterruptMask(x)
101101
#define portDISABLE_INTERRUPTS() portSET_INTERRUPT_MASK()

tools/mocks/freertos/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ idf_component_mock(INCLUDE_DIRS ${include_dirs}
2525
${original_freertos_dir}/esp_additions/include/freertos/idf_additions.h
2626
${original_freertos_dir}/FreeRTOS-Kernel/include/freertos/task.h
2727
${original_freertos_dir}/FreeRTOS-Kernel/include/freertos/event_groups.h
28-
${original_freertos_dir}/FreeRTOS-Kernel/include/freertos/queue.h)
28+
${original_freertos_dir}/FreeRTOS-Kernel/include/freertos/queue.h
29+
${original_freertos_dir}/FreeRTOS-Kernel/portable/linux/include/freertos/portmacro.h)
2930

3031
idf_component_get_property(freertos_lib freertos COMPONENT_LIB)
3132
target_compile_definitions(${freertos_lib} PUBLIC "projCOVERAGE_TEST=0")

0 commit comments

Comments
 (0)