From 20103eeeec7a85fc935ff8e1eadc9caae4b36410 Mon Sep 17 00:00:00 2001 From: Tony Josi Date: Wed, 12 Apr 2023 10:11:47 +0000 Subject: [PATCH] Remove coroutine warnings from the unit test build logs (#829) * fixing error message printed during test build and disabling coroutines flags used in the config files used for test build * removing trailing whitespace * removing configUSE_CO_ROUTINES and configMAX_CO_ROUTINE_PRIORITIES macros from the config files * Uncrustify: triggered by comment --------- Co-authored-by: GitHub Action --- test/Coverity/ConfigFiles/FreeRTOSConfig.h | 4 ---- .../build-combination/Common/FreeRTOSConfig.h | 5 ---- test/cbmc/patches/FreeRTOSConfig.h | 23 ++++++++----------- test/unit-test/ConfigFiles/FreeRTOSConfig.h | 4 ---- .../FreeRTOS_ICMP_wo_assert/FreeRTOSConfig.h | 4 ---- .../FreeRTOS_IP_DiffConfig/FreeRTOSConfig.h | 4 ---- .../FreeRTOSConfig.h | 4 ---- .../FreeRTOSConfig.h | 4 ---- .../FreeRTOSConfig.h | 4 ---- .../FreeRTOSConfig.h | 4 ---- 10 files changed, 9 insertions(+), 51 deletions(-) diff --git a/test/Coverity/ConfigFiles/FreeRTOSConfig.h b/test/Coverity/ConfigFiles/FreeRTOSConfig.h index f69ac5e9c..f98d4c779 100644 --- a/test/Coverity/ConfigFiles/FreeRTOSConfig.h +++ b/test/Coverity/ConfigFiles/FreeRTOSConfig.h @@ -80,10 +80,6 @@ void vConfigureTimerForRunTimeStats( void ); /* Prototype of function that initi #define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vConfigureTimerForRunTimeStats() #define portGET_RUN_TIME_COUNTER_VALUE() ulGetRunTimeCounterValue() -/* Co-routine related configuration options. */ -#define configUSE_CO_ROUTINES 1 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) - /* This demo makes use of one or more example stats formatting functions. These * format the raw data provided by the uxTaskGetSystemState() function in to human * readable ASCII form. See the notes in the implementation of vTaskList() within diff --git a/test/build-combination/Common/FreeRTOSConfig.h b/test/build-combination/Common/FreeRTOSConfig.h index a7f7d86ba..432b82b9d 100644 --- a/test/build-combination/Common/FreeRTOSConfig.h +++ b/test/build-combination/Common/FreeRTOSConfig.h @@ -51,7 +51,6 @@ #define configUSE_TRACE_FACILITY 1 #define configUSE_16_BIT_TICKS 0 #define configIDLE_SHOULD_YIELD 1 -#define configUSE_CO_ROUTINES 0 #define configUSE_MUTEXES 1 #define configUSE_RECURSIVE_MUTEXES 1 #define configQUEUE_REGISTRY_SIZE 0 @@ -76,10 +75,6 @@ /* Event group related definitions. */ #define configUSE_EVENT_GROUPS 1 -/* Co-routine definitions. */ -#define configUSE_CO_ROUTINES 0 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) - /* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is * using static allocation. */ #define configSUPPORT_DYNAMIC_ALLOCATION 1 diff --git a/test/cbmc/patches/FreeRTOSConfig.h b/test/cbmc/patches/FreeRTOSConfig.h index 7e61af32f..784babdfe 100644 --- a/test/cbmc/patches/FreeRTOSConfig.h +++ b/test/cbmc/patches/FreeRTOSConfig.h @@ -52,7 +52,6 @@ #define configUSE_16_BIT_TICKS 0 #endif #define configIDLE_SHOULD_YIELD 1 -#define configUSE_CO_ROUTINES 0 #ifndef configUSE_MUTEXES #define configUSE_MUTEXES 1 #endif @@ -68,24 +67,20 @@ /* Hook function related definitions. */ #ifndef configUSE_TICK_HOOK - #define configUSE_TICK_HOOK 0 + #define configUSE_TICK_HOOK 0 #endif -#define configUSE_IDLE_HOOK 1 -#define configUSE_MALLOC_FAILED_HOOK 1 -#define configCHECK_FOR_STACK_OVERFLOW 0 /* Not applicable to the Win32 port. */ +#define configUSE_IDLE_HOOK 1 +#define configUSE_MALLOC_FAILED_HOOK 1 +#define configCHECK_FOR_STACK_OVERFLOW 0 /* Not applicable to the Win32 port. */ /* Software timer related definitions. */ -#define configUSE_TIMERS 1 -#define configTIMER_TASK_PRIORITY ( configMAX_PRIORITIES - 1 ) -#define configTIMER_QUEUE_LENGTH 5 -#define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 2 ) +#define configUSE_TIMERS 1 +#define configTIMER_TASK_PRIORITY ( configMAX_PRIORITIES - 1 ) +#define configTIMER_QUEUE_LENGTH 5 +#define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 2 ) /* Event group related definitions. */ -#define configUSE_EVENT_GROUPS 1 - -/* Co-routine definitions. */ -#define configUSE_CO_ROUTINES 0 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) +#define configUSE_EVENT_GROUPS 1 /* Memory allocation strategy. */ #ifndef configSUPPORT_DYNAMIC_ALLOCATION diff --git a/test/unit-test/ConfigFiles/FreeRTOSConfig.h b/test/unit-test/ConfigFiles/FreeRTOSConfig.h index a9e4320e7..b0ba377db 100644 --- a/test/unit-test/ConfigFiles/FreeRTOSConfig.h +++ b/test/unit-test/ConfigFiles/FreeRTOSConfig.h @@ -80,10 +80,6 @@ #define configGENERATE_RUN_TIME_STATS 1 -/* Co-routine related configuration options. */ -#define configUSE_CO_ROUTINES 1 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) - /* This demo makes use of one or more example stats formatting functions. These * format the raw data provided by the uxTaskGetSystemState() function in to human * readable ASCII form. See the notes in the implementation of vTaskList() within diff --git a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOSConfig.h index cb1176d91..acbe4822d 100644 --- a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOSConfig.h @@ -80,10 +80,6 @@ #define configGENERATE_RUN_TIME_STATS 1 -/* Co-routine related configuration options. */ -#define configUSE_CO_ROUTINES 1 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) - /* This demo makes use of one or more example stats formatting functions. These * format the raw data provided by the uxTaskGetSystemState() function in to human * readable ASCII form. See the notes in the implementation of vTaskList() within diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSConfig.h index f28d75ade..cb963647e 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSConfig.h @@ -80,10 +80,6 @@ #define configGENERATE_RUN_TIME_STATS 1 -/* Co-routine related configuration options. */ -#define configUSE_CO_ROUTINES 1 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) - /* This demo makes use of one or more example stats formatting functions. These * format the raw data provided by the uxTaskGetSystemState() function in to human * readable ASCII form. See the notes in the implementation of vTaskList() within diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSConfig.h index cb1176d91..acbe4822d 100644 --- a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSConfig.h @@ -80,10 +80,6 @@ #define configGENERATE_RUN_TIME_STATS 1 -/* Co-routine related configuration options. */ -#define configUSE_CO_ROUTINES 1 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) - /* This demo makes use of one or more example stats formatting functions. These * format the raw data provided by the uxTaskGetSystemState() function in to human * readable ASCII form. See the notes in the implementation of vTaskList() within diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSConfig.h index cb1176d91..acbe4822d 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSConfig.h @@ -80,10 +80,6 @@ #define configGENERATE_RUN_TIME_STATS 1 -/* Co-routine related configuration options. */ -#define configUSE_CO_ROUTINES 1 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) - /* This demo makes use of one or more example stats formatting functions. These * format the raw data provided by the uxTaskGetSystemState() function in to human * readable ASCII form. See the notes in the implementation of vTaskList() within diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSConfig.h index a9e4320e7..b0ba377db 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSConfig.h @@ -80,10 +80,6 @@ #define configGENERATE_RUN_TIME_STATS 1 -/* Co-routine related configuration options. */ -#define configUSE_CO_ROUTINES 1 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) - /* This demo makes use of one or more example stats formatting functions. These * format the raw data provided by the uxTaskGetSystemState() function in to human * readable ASCII form. See the notes in the implementation of vTaskList() within diff --git a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSConfig.h index cb1176d91..acbe4822d 100644 --- a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSConfig.h @@ -80,10 +80,6 @@ #define configGENERATE_RUN_TIME_STATS 1 -/* Co-routine related configuration options. */ -#define configUSE_CO_ROUTINES 1 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) - /* This demo makes use of one or more example stats formatting functions. These * format the raw data provided by the uxTaskGetSystemState() function in to human * readable ASCII form. See the notes in the implementation of vTaskList() within