From 26178cbdf74ee68439d3af2261e47f7c979446fc Mon Sep 17 00:00:00 2001 From: kar-rahul-aws Date: Thu, 31 Aug 2023 20:16:30 +0530 Subject: [PATCH 1/7] Fix unit tests for latest Kernel V10.6.1 --- test/unit-test/FreeRTOS_ARP/ut.cmake | 2 +- test/unit-test/FreeRTOS_BitConfig/ut.cmake | 2 +- test/unit-test/FreeRTOS_DHCPv6/ut.cmake | 2 +- test/unit-test/FreeRTOS_ICMP/ut.cmake | 2 +- test/unit-test/FreeRTOS_ICMP_wo_assert/ut.cmake | 2 +- test/unit-test/FreeRTOS_IP/ut.cmake | 2 +- test/unit-test/FreeRTOS_IP_DiffConfig/ut.cmake | 2 +- test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake | 2 +- test/unit-test/FreeRTOS_IP_DiffConfig2/ut.cmake | 2 +- test/unit-test/FreeRTOS_IP_DiffConfig3/ut.cmake | 2 +- test/unit-test/FreeRTOS_IP_Timers/ut.cmake | 2 +- test/unit-test/FreeRTOS_IP_Utils/ut.cmake | 2 +- test/unit-test/FreeRTOS_IP_Utils_DiffConfig/ut.cmake | 2 +- test/unit-test/FreeRTOS_IPv4/ut.cmake | 2 +- test/unit-test/FreeRTOS_IPv4_DiffConfig/ut.cmake | 2 +- test/unit-test/FreeRTOS_IPv4_DiffConfig1/ut.cmake | 2 +- test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake | 2 +- test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake | 2 +- test/unit-test/FreeRTOS_IPv6/ut.cmake | 2 +- .../FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake | 2 +- test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake | 2 +- test/unit-test/FreeRTOS_ND/ut.cmake | 2 +- test/unit-test/FreeRTOS_RA/ut.cmake | 2 +- test/unit-test/FreeRTOS_Routing/ut.cmake | 2 +- .../FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake | 2 +- test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake | 2 +- test/unit-test/FreeRTOS_Sockets/ut.cmake | 5 ++--- test/unit-test/FreeRTOS_Sockets_DiffConfig/ut.cmake | 4 +--- test/unit-test/FreeRTOS_Sockets_DiffConfig1/ut.cmake | 4 +--- test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake | 5 ++--- test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake | 4 +--- test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_IP/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_Reception/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_Utils/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake | 2 +- .../FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake | 2 +- test/unit-test/FreeRTOS_UDP_IP/ut.cmake | 2 +- test/unit-test/FreeRTOS_UDP_IPv4/ut.cmake | 2 +- test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake | 2 +- 46 files changed, 48 insertions(+), 56 deletions(-) diff --git a/test/unit-test/FreeRTOS_ARP/ut.cmake b/test/unit-test/FreeRTOS_ARP/ut.cmake index 86e5569855..acdd47155b 100644 --- a/test/unit-test/FreeRTOS_ARP/ut.cmake +++ b/test/unit-test/FreeRTOS_ARP/ut.cmake @@ -27,8 +27,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) #list the definitions of your mocks to control what to be included diff --git a/test/unit-test/FreeRTOS_BitConfig/ut.cmake b/test/unit-test/FreeRTOS_BitConfig/ut.cmake index 01be0b3e73..ba51c74ae6 100644 --- a/test/unit-test/FreeRTOS_BitConfig/ut.cmake +++ b/test/unit-test/FreeRTOS_BitConfig/ut.cmake @@ -23,8 +23,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_DHCPv6/ut.cmake b/test/unit-test/FreeRTOS_DHCPv6/ut.cmake index f65c09d538..3fd0c74dbd 100644 --- a/test/unit-test/FreeRTOS_DHCPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_DHCPv6/ut.cmake @@ -32,8 +32,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_ICMP/ut.cmake b/test/unit-test/FreeRTOS_ICMP/ut.cmake index 63f0650333..fc7f04fba8 100644 --- a/test/unit-test/FreeRTOS_ICMP/ut.cmake +++ b/test/unit-test/FreeRTOS_ICMP/ut.cmake @@ -37,8 +37,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_ICMP_wo_assert/ut.cmake b/test/unit-test/FreeRTOS_ICMP_wo_assert/ut.cmake index 289299fe33..4ad6c60810 100644 --- a/test/unit-test/FreeRTOS_ICMP_wo_assert/ut.cmake +++ b/test/unit-test/FreeRTOS_ICMP_wo_assert/ut.cmake @@ -36,8 +36,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_IP/ut.cmake b/test/unit-test/FreeRTOS_IP/ut.cmake index 8e66699df8..4b37c1d686 100644 --- a/test/unit-test/FreeRTOS_IP/ut.cmake +++ b/test/unit-test/FreeRTOS_IP/ut.cmake @@ -44,8 +44,8 @@ list(APPEND mock_include_list ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_IP_DiffConfig/ut.cmake index 4227474c1f..1ed3959891 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_DiffConfig/ut.cmake @@ -40,8 +40,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake b/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake index 21c21ce1c2..bc050bae7b 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake @@ -42,8 +42,8 @@ list(APPEND mock_include_list ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig2/ut.cmake b/test/unit-test/FreeRTOS_IP_DiffConfig2/ut.cmake index 7d98901433..2ef4a847f8 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig2/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_DiffConfig2/ut.cmake @@ -41,8 +41,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig3/ut.cmake b/test/unit-test/FreeRTOS_IP_DiffConfig3/ut.cmake index 9b003e9d7b..2d832de4c8 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig3/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_DiffConfig3/ut.cmake @@ -41,8 +41,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_IP_Timers/ut.cmake b/test/unit-test/FreeRTOS_IP_Timers/ut.cmake index 4ae5678e8b..9a1620cedf 100644 --- a/test/unit-test/FreeRTOS_IP_Timers/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_Timers/ut.cmake @@ -30,8 +30,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_IP_Utils/ut.cmake b/test/unit-test/FreeRTOS_IP_Utils/ut.cmake index 04ed351957..8c5f73078b 100644 --- a/test/unit-test/FreeRTOS_IP_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_Utils/ut.cmake @@ -34,8 +34,8 @@ list(APPEND mock_include_list ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/ut.cmake index f065b2a580..790d608110 100644 --- a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/ut.cmake @@ -33,8 +33,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_IPv4/ut.cmake b/test/unit-test/FreeRTOS_IPv4/ut.cmake index c2ca691c58..e2f8912337 100644 --- a/test/unit-test/FreeRTOS_IPv4/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4/ut.cmake @@ -30,8 +30,8 @@ list(APPEND mock_include_list ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFilesv ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_IPv4_DiffConfig/ut.cmake index 826cd5984c..a0614a58f6 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig/ut.cmake @@ -41,8 +41,8 @@ list(APPEND mock_include_list ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/ut.cmake b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/ut.cmake index bb4fdb9d6a..a72d11f80f 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/ut.cmake @@ -41,8 +41,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake b/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake index 3e60caaf52..99bc67d23a 100644 --- a/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake @@ -19,9 +19,9 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake b/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake index b76df9b150..8faf257d4c 100644 --- a/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake @@ -22,8 +22,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_IPv6/ut.cmake b/test/unit-test/FreeRTOS_IPv6/ut.cmake index b2d9ed3b89..aba573fd0d 100644 --- a/test/unit-test/FreeRTOS_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv6/ut.cmake @@ -24,8 +24,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake index 87b970b017..7a2a4c558a 100644 --- a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake @@ -24,9 +24,9 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake b/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake index 48d05a6784..6e9f105f52 100644 --- a/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake @@ -27,8 +27,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_ND/ut.cmake b/test/unit-test/FreeRTOS_ND/ut.cmake index e0e7055fca..9e113d1580 100644 --- a/test/unit-test/FreeRTOS_ND/ut.cmake +++ b/test/unit-test/FreeRTOS_ND/ut.cmake @@ -33,8 +33,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_RA/ut.cmake b/test/unit-test/FreeRTOS_RA/ut.cmake index c36c51c017..f83cb0d643 100644 --- a/test/unit-test/FreeRTOS_RA/ut.cmake +++ b/test/unit-test/FreeRTOS_RA/ut.cmake @@ -28,8 +28,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Routing/ut.cmake b/test/unit-test/FreeRTOS_Routing/ut.cmake index 403cb6c115..2ceb2a26b5 100644 --- a/test/unit-test/FreeRTOS_Routing/ut.cmake +++ b/test/unit-test/FreeRTOS_Routing/ut.cmake @@ -31,8 +31,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake index 4cb74b6cf2..1c1c75ee56 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake +++ b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake @@ -33,8 +33,8 @@ list(APPEND mock_include_list ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake index 66a235237a..019923c678 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake +++ b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake @@ -32,8 +32,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Sockets/ut.cmake b/test/unit-test/FreeRTOS_Sockets/ut.cmake index f9b856adb0..e9617c0f34 100644 --- a/test/unit-test/FreeRTOS_Sockets/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets/ut.cmake @@ -16,6 +16,7 @@ list(APPEND mock_list "${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include/event_groups.h" "${CMAKE_BINARY_DIR}/Annexed_TCP/portable.h" "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP.h" + "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_Sockets.h" "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IPv4_Sockets.h" "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IPv6_Sockets.h" "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_Routing.h" @@ -32,8 +33,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) @@ -71,8 +72,6 @@ list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src ${TCP_INCLUDE_DIRS} - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_Sockets_DiffConfig/ut.cmake index 63fbe314d0..2635b02555 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig/ut.cmake @@ -32,8 +32,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) set(mock_define_list "") @@ -73,8 +73,6 @@ list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src ${TCP_INCLUDE_DIRS} - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) # ============================= (end edit) =================================== diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/ut.cmake b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/ut.cmake index a07ac85b5c..423b145b95 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/ut.cmake @@ -26,8 +26,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) set(mock_define_list "") @@ -66,8 +66,6 @@ list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src ${TCP_INCLUDE_DIRS} - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) # ============================= (end edit) =================================== diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake index 3889fb1059..7e100e31c8 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake @@ -24,9 +24,9 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ) set(mock_define_list "") @@ -53,6 +53,7 @@ list(APPEND real_include_directories ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix + ${MODULE_ROOT_DIR}/test/unit-test/FreeRTOS_Sockets ${CMOCK_DIR}/vendor/unity/src ) @@ -63,8 +64,6 @@ list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src ${TCP_INCLUDE_DIRS} - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake b/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake index e46ba2cd3c..ea0b3f6c1d 100644 --- a/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake @@ -34,8 +34,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) @@ -73,8 +73,6 @@ list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src ${TCP_INCLUDE_DIRS} - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake b/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake index ae9fc9ce56..33e0df5070 100644 --- a/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake +++ b/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake @@ -26,8 +26,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_TCP_IP/ut.cmake b/test/unit-test/FreeRTOS_TCP_IP/ut.cmake index f0509f4a5e..4a92e9b05a 100644 --- a/test/unit-test/FreeRTOS_TCP_IP/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_IP/ut.cmake @@ -34,8 +34,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake index 55de3dba00..2504cb5838 100644 --- a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake @@ -34,8 +34,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake b/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake index 1ada473b9e..d70f78bd0c 100644 --- a/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake @@ -28,8 +28,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake index ce6f672ce5..752c539572 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake @@ -29,8 +29,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake index 4bb8a8f911..e097100ffb 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake @@ -29,9 +29,9 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake index ac1d362a25..5ff07d501c 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake @@ -28,9 +28,9 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake index f8dd38385f..2c37dad750 100644 --- a/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake @@ -41,8 +41,8 @@ list(APPEND mock_include_list . ${MODULE_ROOT_DIR}/source/include ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake index 5b45fa3477..19c34ec5b9 100644 --- a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake @@ -28,8 +28,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake index 2c49375829..bab2f00b92 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake @@ -22,8 +22,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake index 21f73d4a1a..672fdc8b83 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake @@ -21,8 +21,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake index dcf2f17962..af0a2657dd 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake @@ -21,8 +21,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_UDP_IP/ut.cmake b/test/unit-test/FreeRTOS_UDP_IP/ut.cmake index 43b66385ce..ad8ecfb5b8 100644 --- a/test/unit-test/FreeRTOS_UDP_IP/ut.cmake +++ b/test/unit-test/FreeRTOS_UDP_IP/ut.cmake @@ -32,8 +32,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_UDP_IPv4/ut.cmake b/test/unit-test/FreeRTOS_UDP_IPv4/ut.cmake index 1db28b9fff..21a5b43f1b 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv4/ut.cmake +++ b/test/unit-test/FreeRTOS_UDP_IPv4/ut.cmake @@ -30,8 +30,8 @@ list(APPEND mock_include_list . ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) set(mock_define_list "") diff --git a/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake b/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake index eb4d95af09..0d1974b11f 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake @@ -34,8 +34,8 @@ list(APPEND mock_include_list ${CMAKE_BINARY_DIR}/Annexed_TCP/ ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) set(mock_define_list "") From 8dd8cbdb12884190dc27fb428f7b3c69170e34d6 Mon Sep 17 00:00:00 2001 From: kar-rahul-aws Date: Thu, 31 Aug 2023 21:10:08 +0530 Subject: [PATCH 2/7] Fix failing UT in FreeRTOS_Sockets --- test/unit-test/FreeRTOS_Sockets/ut.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/test/unit-test/FreeRTOS_Sockets/ut.cmake b/test/unit-test/FreeRTOS_Sockets/ut.cmake index e9617c0f34..8803623e47 100644 --- a/test/unit-test/FreeRTOS_Sockets/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets/ut.cmake @@ -16,7 +16,6 @@ list(APPEND mock_list "${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include/event_groups.h" "${CMAKE_BINARY_DIR}/Annexed_TCP/portable.h" "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP.h" - "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_Sockets.h" "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IPv4_Sockets.h" "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IPv6_Sockets.h" "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_Routing.h" From 75191f4b888f5889c54fb5ed205bc636f3254604 Mon Sep 17 00:00:00 2001 From: kar-rahul-aws Date: Fri, 1 Sep 2023 00:22:56 +0530 Subject: [PATCH 3/7] Update the FreeRTOS-Kernel submodule to V10.6.1 --- .github/workflows/ci.yml | 22 ++++++++++++++++++++++ lexicon.txt | 2 ++ manifest.yml | 15 ++++++++++++--- test/FreeRTOS-Kernel | 2 +- test/unit-test/ConfigFiles/portmacro.h | 10 ++++++++++ 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a78449b362..f3dc50ce6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,6 +86,27 @@ jobs: with: path: ./ + verify-manifest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + submodules: true + fetch-depth: 0 + + # At time of writing the gitmodules are set not to pull + # Even when using fetch submodules. Need to run this command + # To force it to grab them. + - name: Perform Recursive Clone + shell: bash + run: git submodule update --checkout --init --recursive + + - name: Run manifest verifier + uses: FreeRTOS/CI-CD-GitHub-Actions/manifest-verifier@v2 + with: + path: ./ + fail-on-incorrect-version: true + build-checks: runs-on: ubuntu-latest steps: @@ -192,6 +213,7 @@ jobs: run: | git-secrets --register-aws git-secrets --scan + proof_ci: runs-on: cbmc_ubuntu-latest_16-core steps: diff --git a/lexicon.txt b/lexicon.txt index 8b11100a2a..fc96db439e 100644 --- a/lexicon.txt +++ b/lexicon.txt @@ -134,6 +134,7 @@ chextochar cli clk cmd +cmock co col com @@ -2073,6 +2074,7 @@ xtaskcreate xtaskcreatestatic xtaskgenericnotify xtaskgetcurrenttaskhandle +xtaskgetmpusettings xtaskgettickcount xtaskhandle xtasknotifygive diff --git a/manifest.yml b/manifest.yml index 245184d1e9..a5dacbd304 100644 --- a/manifest.yml +++ b/manifest.yml @@ -1,13 +1,22 @@ -name : "FreeRTOS-Plus-TCP" +name: "FreeRTOS-Plus-TCP" version: "V4.0.0" -description: "Thread safe FreeRTOS TCP/IP stack working on top of the FreeRTOS-Kernel to implement the TCP/IP protocol. Suitable for microcontrollers." +description: + "Thread safe FreeRTOS TCP/IP stack working on top of the FreeRTOS-Kernel to + implement the TCP/IP protocol. Suitable for microcontrollers." license: "MIT" dependencies: - name: "FreeRTOS-Kernel" - version: "V10.6.0" + version: "V10.6.1" license: "MIT" repository: type: "git" url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git" path: "test/FreeRTOS-Kernel" branch: "main" + + - name: "CMock" + version: "afa2949" + repository: + type: "git" + url: " https://github.com/ThrowTheSwitch/CMock.git" + path: "tools/CMock" diff --git a/test/FreeRTOS-Kernel b/test/FreeRTOS-Kernel index 260a37c082..0264280230 160000 --- a/test/FreeRTOS-Kernel +++ b/test/FreeRTOS-Kernel @@ -1 +1 @@ -Subproject commit 260a37c082f4b70f9c6f361eadb0b29f1a448e3a +Subproject commit 0264280230aa6a828247b5f05bf57e33f1994581 diff --git a/test/unit-test/ConfigFiles/portmacro.h b/test/unit-test/ConfigFiles/portmacro.h index a766fe1525..25dae85e8f 100644 --- a/test/unit-test/ConfigFiles/portmacro.h +++ b/test/unit-test/ConfigFiles/portmacro.h @@ -113,6 +113,16 @@ #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters ) /*-----------------------------------------------------------*/ +/** We need to define it here because CMock does not recognize the + * #if ( portUSING_MPU_WRAPPERS == 1 ) guard around xTaskGetMPUSettings + * and then complains about the missing xMPU_SETTINGS type in the + * generated mocks. */ + typedef struct MPU_SETTINGS + { + uint32_t ulDummy; + } xMPU_SETTINGS; + + /* * Tasks run in their own pthreads and context switches between them * are always a full memory barrier. ISRs are emulated as signals From 14a1ebab7093b38b501ac14bdf8148a6ef641449 Mon Sep 17 00:00:00 2001 From: Soren Ptak Date: Thu, 31 Aug 2023 13:45:29 -0700 Subject: [PATCH 4/7] Update the tests to pass with V10.6.1 of the FreeRTOS-Kernel --- test/unit-test/FreeRTOS_ARP/ut.cmake | 1 + test/unit-test/FreeRTOS_BitConfig/ut.cmake | 1 + test/unit-test/FreeRTOS_DHCP/ut.cmake | 1 + test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c | 2 ++ test/unit-test/FreeRTOS_DHCPv6/ut.cmake | 1 + test/unit-test/FreeRTOS_DNS/ut.cmake | 1 + test/unit-test/FreeRTOS_DNS_Cache/ut.cmake | 1 + test/unit-test/FreeRTOS_DNS_Callback/ut.cmake | 1 + test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake | 1 + test/unit-test/FreeRTOS_DNS_Networking/ut.cmake | 1 + test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c | 2 ++ test/unit-test/FreeRTOS_ICMP/ut.cmake | 1 + .../FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c | 2 ++ test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c | 2 ++ test/unit-test/FreeRTOS_IP/ut.cmake | 1 + .../FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c | 2 ++ .../FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c | 2 ++ test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake | 1 + .../FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c | 2 ++ .../FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c | 2 ++ test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c | 2 ++ test/unit-test/FreeRTOS_IP_Timers/ut.cmake | 1 + test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c | 2 ++ test/unit-test/FreeRTOS_IP_Utils/ut.cmake | 1 + .../FreeRTOS_IP_Utils_DiffConfig_utest.c | 2 ++ test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c | 2 ++ test/unit-test/FreeRTOS_IPv4/ut.cmake | 5 +++-- .../FreeRTOS_IPv4_DiffConfig_utest.c | 2 ++ .../FreeRTOS_IPv4_DiffConfig1_utest.c | 2 ++ test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake | 1 + test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake | 1 + test/unit-test/FreeRTOS_IPv6/ut.cmake | 1 + .../FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake | 1 + .../FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c | 2 ++ test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake | 1 + test/unit-test/FreeRTOS_ND/ut.cmake | 1 + test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c | 2 ++ test/unit-test/FreeRTOS_RA/ut.cmake | 1 + test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c | 2 ++ test/unit-test/FreeRTOS_Routing/ut.cmake | 1 + .../FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c | 2 ++ .../FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake | 1 + .../FreeRTOS_Routing_ConfigV4Only_utest.c | 2 ++ test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake | 1 + .../FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c | 2 ++ .../FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c | 2 ++ .../FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c | 2 ++ .../FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c | 2 ++ test/unit-test/FreeRTOS_Sockets/ut.cmake | 1 + .../FreeRTOS_Sockets_DiffConfig_privates_utest.c | 2 ++ .../FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c | 2 ++ .../FreeRTOS_Sockets_DiffConfig1_privates_utest.c | 2 ++ .../FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c | 2 ++ .../FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c | 2 ++ test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake | 1 + .../FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c | 2 ++ test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake | 1 + .../FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c | 2 ++ test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake | 1 + test/unit-test/FreeRTOS_TCP_IP/ut.cmake | 1 + test/unit-test/FreeRTOS_TCP_Reception/ut.cmake | 1 + .../FreeRTOS_TCP_State_Handling_utest.c | 2 ++ test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake | 1 + test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake | 1 + test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake | 1 + test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake | 1 + test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake | 1 + test/unit-test/FreeRTOS_TCP_Utils/ut.cmake | 1 + test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake | 1 + .../FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake | 1 + test/unit-test/FreeRTOS_TCP_WIN/ut.cmake | 1 + test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c | 2 ++ test/unit-test/FreeRTOS_UDP_IP/ut.cmake | 1 + test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c | 2 ++ test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake | 1 + 75 files changed, 110 insertions(+), 2 deletions(-) diff --git a/test/unit-test/FreeRTOS_ARP/ut.cmake b/test/unit-test/FreeRTOS_ARP/ut.cmake index acdd47155b..27c492a05a 100644 --- a/test/unit-test/FreeRTOS_ARP/ut.cmake +++ b/test/unit-test/FreeRTOS_ARP/ut.cmake @@ -58,6 +58,7 @@ list(APPEND real_include_directories list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ) diff --git a/test/unit-test/FreeRTOS_BitConfig/ut.cmake b/test/unit-test/FreeRTOS_BitConfig/ut.cmake index ba51c74ae6..7d3084ff69 100644 --- a/test/unit-test/FreeRTOS_BitConfig/ut.cmake +++ b/test/unit-test/FreeRTOS_BitConfig/ut.cmake @@ -61,6 +61,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_DHCP/ut.cmake b/test/unit-test/FreeRTOS_DHCP/ut.cmake index 1d08984f0a..8639e4a60a 100644 --- a/test/unit-test/FreeRTOS_DHCP/ut.cmake +++ b/test/unit-test/FreeRTOS_DHCP/ut.cmake @@ -55,6 +55,7 @@ list(APPEND real_include_directories list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c index 89238129ff..c7c31a4fb8 100644 --- a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c +++ b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c @@ -33,6 +33,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" #include "mock_FreeRTOS_Sockets.h" diff --git a/test/unit-test/FreeRTOS_DHCPv6/ut.cmake b/test/unit-test/FreeRTOS_DHCPv6/ut.cmake index 3fd0c74dbd..1c9998d35e 100644 --- a/test/unit-test/FreeRTOS_DHCPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_DHCPv6/ut.cmake @@ -71,6 +71,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_DNS/ut.cmake b/test/unit-test/FreeRTOS_DNS/ut.cmake index f9d25a146d..632acffd9d 100644 --- a/test/unit-test/FreeRTOS_DNS/ut.cmake +++ b/test/unit-test/FreeRTOS_DNS/ut.cmake @@ -66,6 +66,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/source/include diff --git a/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake b/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake index ba26da63c6..09522e1ab3 100755 --- a/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake +++ b/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake @@ -64,6 +64,7 @@ set (test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/source/include diff --git a/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake b/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake index f1f1483dce..8973b535bb 100644 --- a/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake +++ b/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake @@ -65,6 +65,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/source/include/ diff --git a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake index 9e63fd66e7..ef479c081b 100644 --- a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake +++ b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake @@ -65,6 +65,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/source/include diff --git a/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake b/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake index 780f6301a6..98c37b9931 100644 --- a/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake +++ b/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake @@ -59,6 +59,7 @@ list(APPEND real_include_directories list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/include diff --git a/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c b/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c index c1b8131250..1ef67d245b 100644 --- a/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c +++ b/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_ICMP/ut.cmake b/test/unit-test/FreeRTOS_ICMP/ut.cmake index fc7f04fba8..fcab0de705 100644 --- a/test/unit-test/FreeRTOS_ICMP/ut.cmake +++ b/test/unit-test/FreeRTOS_ICMP/ut.cmake @@ -75,6 +75,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c index abe55e10c7..bfc6f54deb 100644 --- a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c +++ b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" #include "mock_queue.h" diff --git a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c index 374c69f63b..eb3a817c32 100644 --- a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c +++ b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP/ut.cmake b/test/unit-test/FreeRTOS_IP/ut.cmake index 4b37c1d686..ec55f1058d 100644 --- a/test/unit-test/FreeRTOS_IP/ut.cmake +++ b/test/unit-test/FreeRTOS_IP/ut.cmake @@ -81,6 +81,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c index 60b42ee010..b59df58d54 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c index 14fe4f35bc..1ad5ba21cb 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake b/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake index bc050bae7b..8d3eccb596 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake @@ -79,6 +79,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${CMAKE_BINARY_DIR}/../../../source/portable/Buffermanagement ${CMAKE_BINARY_DIR}/../../../source/portable/Compiler/MSVC ${MODULE_ROOT_DIR}/test/unit-test/${project_name} diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c index 991d4d8846..1c6b9f7368 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c index 8fac597cf6..52e45c0d80 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c index 08d46e4c8d..976ea9cc05 100644 --- a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c +++ b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_Timers/ut.cmake b/test/unit-test/FreeRTOS_IP_Timers/ut.cmake index 9a1620cedf..a572129af8 100644 --- a/test/unit-test/FreeRTOS_IP_Timers/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_Timers/ut.cmake @@ -68,6 +68,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c index af09192c64..be5269b617 100644 --- a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c +++ b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_Utils/ut.cmake b/test/unit-test/FreeRTOS_IP_Utils/ut.cmake index 8c5f73078b..7dbb128e38 100644 --- a/test/unit-test/FreeRTOS_IP_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_Utils/ut.cmake @@ -71,6 +71,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${TCP_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c index bf39c69aeb..b51a9e08d8 100644 --- a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c +++ b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c b/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c index 0665b3dc4c..2ea74d2cd5 100644 --- a/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c +++ b/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IPv4/ut.cmake b/test/unit-test/FreeRTOS_IPv4/ut.cmake index e2f8912337..e2f9e78d1f 100644 --- a/test/unit-test/FreeRTOS_IPv4/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4/ut.cmake @@ -30,7 +30,7 @@ list(APPEND mock_include_list ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFilesv + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) @@ -66,8 +66,9 @@ set(test_include_directories "") # list the directories your test needs to include list(APPEND test_include_directories . - ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${TCP_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources ) diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c index 4712491b44..e01e06504f 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c index 0ba0b019a7..9817f7cc7b 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake b/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake index 99bc67d23a..fad506c429 100644 --- a/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake @@ -57,6 +57,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix diff --git a/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake b/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake index 8faf257d4c..9fda556518 100644 --- a/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake @@ -60,6 +60,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${TCP_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IPv6/ut.cmake b/test/unit-test/FreeRTOS_IPv6/ut.cmake index aba573fd0d..f695563625 100644 --- a/test/unit-test/FreeRTOS_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv6/ut.cmake @@ -62,6 +62,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake index 7a2a4c558a..d8c0f34fc2 100644 --- a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake @@ -62,6 +62,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c index 0e2762536f..aad8b62182 100644 --- a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c +++ b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake b/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake index 6e9f105f52..1a2df0fe7d 100644 --- a/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake @@ -65,6 +65,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_ND/ut.cmake b/test/unit-test/FreeRTOS_ND/ut.cmake index 9e113d1580..bc002c9aca 100644 --- a/test/unit-test/FreeRTOS_ND/ut.cmake +++ b/test/unit-test/FreeRTOS_ND/ut.cmake @@ -71,6 +71,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c b/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c index 0d77637d70..ae525e8092 100644 --- a/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c +++ b/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_RA/ut.cmake b/test/unit-test/FreeRTOS_RA/ut.cmake index f83cb0d643..b06b9c84a3 100644 --- a/test/unit-test/FreeRTOS_RA/ut.cmake +++ b/test/unit-test/FreeRTOS_RA/ut.cmake @@ -66,6 +66,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c b/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c index 64f06e7541..05f4a6297f 100644 --- a/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c +++ b/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Routing/ut.cmake b/test/unit-test/FreeRTOS_Routing/ut.cmake index 2ceb2a26b5..42ceaa88de 100644 --- a/test/unit-test/FreeRTOS_Routing/ut.cmake +++ b/test/unit-test/FreeRTOS_Routing/ut.cmake @@ -69,6 +69,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c index 45383af9e7..75ad1093c8 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c +++ b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake index 1c1c75ee56..1b29684b30 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake +++ b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake @@ -70,6 +70,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${TCP_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c index ef5c802bbb..1fe4798fc4 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c +++ b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake index 019923c678..30a6cb85ea 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake +++ b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake @@ -70,6 +70,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c index fa56b1d59e..4cfa0becdc 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c index f10c454972..9db98c345a 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c index 6f6ac2779a..32d5109364 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c index 3b73fb5f3d..3b73aa1c5b 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets/ut.cmake b/test/unit-test/FreeRTOS_Sockets/ut.cmake index 8803623e47..4308738602 100644 --- a/test/unit-test/FreeRTOS_Sockets/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets/ut.cmake @@ -70,6 +70,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c index 3b612ec210..954730b984 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c index e4f60cc2ae..3bc010b10f 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c index b53ff0e857..2861fdf50a 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c index 15d359a558..930dd60d03 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c index 95a3688a24..eed601b355 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake index 7e100e31c8..279648b4b8 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake @@ -63,6 +63,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c b/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c index 77c6de2f6d..a9dfef83b5 100644 --- a/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake b/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake index ea0b3f6c1d..7cb90263db 100644 --- a/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake @@ -72,6 +72,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c b/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c index 52e2761c3f..709a329b77 100644 --- a/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c +++ b/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_semphr.h" diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake b/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake index 33e0df5070..ea01aeeebc 100644 --- a/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake +++ b/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake @@ -65,6 +65,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_TCP_IP/ut.cmake b/test/unit-test/FreeRTOS_TCP_IP/ut.cmake index 4a92e9b05a..0af8437e73 100644 --- a/test/unit-test/FreeRTOS_TCP_IP/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_IP/ut.cmake @@ -73,6 +73,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake b/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake index d70f78bd0c..28499cef85 100644 --- a/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake @@ -66,6 +66,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c b/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c index ea726378f1..69871eb0c0 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c +++ b/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_FreeRTOS_IP_Private.h" diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake index 752c539572..3cf1e00a8b 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake @@ -67,6 +67,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake index e097100ffb..1b0277a672 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake @@ -67,6 +67,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake index 5ff07d501c..1e97a3416f 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake @@ -66,6 +66,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake index 2c37dad750..fa455dc815 100644 --- a/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake @@ -80,6 +80,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${CMAKE_BINARY_DIR}/Annexed_TCP/ ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake index 19c34ec5b9..835aedaba8 100644 --- a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake @@ -66,6 +66,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake index bab2f00b92..d0bbe9014d 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake @@ -61,6 +61,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake index 672fdc8b83..7de12cd003 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake @@ -59,6 +59,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake index af0a2657dd..6d3761b278 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake @@ -59,6 +59,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake b/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake index b36711c84f..11bb688942 100644 --- a/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake @@ -56,6 +56,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c index 1a03e51db2..4949360be0 100644 --- a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c +++ b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_UDP_IP/ut.cmake b/test/unit-test/FreeRTOS_UDP_IP/ut.cmake index ad8ecfb5b8..dee8308f7f 100644 --- a/test/unit-test/FreeRTOS_UDP_IP/ut.cmake +++ b/test/unit-test/FreeRTOS_UDP_IP/ut.cmake @@ -71,6 +71,7 @@ list(APPEND real_include_directories list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c index 9ab2ab48bf..866cf9264e 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c +++ b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c @@ -34,6 +34,8 @@ #include #include +#include "portmacro.h" + #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake b/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake index 0d1974b11f..0ed93663d6 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake @@ -74,6 +74,7 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${TCP_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/Annexed_TCP/ From 353ff932a091b546e29a40f0c0b734f04e10e33a Mon Sep 17 00:00:00 2001 From: Monika Singh Date: Fri, 1 Sep 2023 07:14:09 +0000 Subject: [PATCH 5/7] Revert "Update the tests to pass with V10.6.1 of the FreeRTOS-Kernel" This reverts commit 14a1ebab7093b38b501ac14bdf8148a6ef641449. --- test/unit-test/FreeRTOS_ARP/ut.cmake | 1 - test/unit-test/FreeRTOS_BitConfig/ut.cmake | 1 - test/unit-test/FreeRTOS_DHCP/ut.cmake | 1 - test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c | 2 -- test/unit-test/FreeRTOS_DHCPv6/ut.cmake | 1 - test/unit-test/FreeRTOS_DNS/ut.cmake | 1 - test/unit-test/FreeRTOS_DNS_Cache/ut.cmake | 1 - test/unit-test/FreeRTOS_DNS_Callback/ut.cmake | 1 - test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake | 1 - test/unit-test/FreeRTOS_DNS_Networking/ut.cmake | 1 - test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c | 2 -- test/unit-test/FreeRTOS_ICMP/ut.cmake | 1 - .../FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c | 2 -- test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c | 2 -- test/unit-test/FreeRTOS_IP/ut.cmake | 1 - .../FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c | 2 -- .../FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c | 2 -- test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake | 1 - .../FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c | 2 -- .../FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c | 2 -- test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c | 2 -- test/unit-test/FreeRTOS_IP_Timers/ut.cmake | 1 - test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c | 2 -- test/unit-test/FreeRTOS_IP_Utils/ut.cmake | 1 - .../FreeRTOS_IP_Utils_DiffConfig_utest.c | 2 -- test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c | 2 -- test/unit-test/FreeRTOS_IPv4/ut.cmake | 5 ++--- .../FreeRTOS_IPv4_DiffConfig_utest.c | 2 -- .../FreeRTOS_IPv4_DiffConfig1_utest.c | 2 -- test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake | 1 - test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake | 1 - test/unit-test/FreeRTOS_IPv6/ut.cmake | 1 - .../FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake | 1 - .../FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c | 2 -- test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake | 1 - test/unit-test/FreeRTOS_ND/ut.cmake | 1 - test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c | 2 -- test/unit-test/FreeRTOS_RA/ut.cmake | 1 - test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c | 2 -- test/unit-test/FreeRTOS_Routing/ut.cmake | 1 - .../FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c | 2 -- .../FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake | 1 - .../FreeRTOS_Routing_ConfigV4Only_utest.c | 2 -- test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake | 1 - .../FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c | 2 -- .../FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c | 2 -- .../FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c | 2 -- .../FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c | 2 -- test/unit-test/FreeRTOS_Sockets/ut.cmake | 1 - .../FreeRTOS_Sockets_DiffConfig_privates_utest.c | 2 -- .../FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c | 2 -- .../FreeRTOS_Sockets_DiffConfig1_privates_utest.c | 2 -- .../FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c | 2 -- .../FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c | 2 -- test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake | 1 - .../FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c | 2 -- test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake | 1 - .../FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c | 2 -- test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake | 1 - test/unit-test/FreeRTOS_TCP_IP/ut.cmake | 1 - test/unit-test/FreeRTOS_TCP_Reception/ut.cmake | 1 - .../FreeRTOS_TCP_State_Handling_utest.c | 2 -- test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake | 1 - test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake | 1 - test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake | 1 - test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake | 1 - test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake | 1 - test/unit-test/FreeRTOS_TCP_Utils/ut.cmake | 1 - test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake | 1 - .../FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake | 1 - test/unit-test/FreeRTOS_TCP_WIN/ut.cmake | 1 - test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c | 2 -- test/unit-test/FreeRTOS_UDP_IP/ut.cmake | 1 - test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c | 2 -- test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake | 1 - 75 files changed, 2 insertions(+), 110 deletions(-) diff --git a/test/unit-test/FreeRTOS_ARP/ut.cmake b/test/unit-test/FreeRTOS_ARP/ut.cmake index 27c492a05a..acdd47155b 100644 --- a/test/unit-test/FreeRTOS_ARP/ut.cmake +++ b/test/unit-test/FreeRTOS_ARP/ut.cmake @@ -58,7 +58,6 @@ list(APPEND real_include_directories list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ) diff --git a/test/unit-test/FreeRTOS_BitConfig/ut.cmake b/test/unit-test/FreeRTOS_BitConfig/ut.cmake index 7d3084ff69..ba51c74ae6 100644 --- a/test/unit-test/FreeRTOS_BitConfig/ut.cmake +++ b/test/unit-test/FreeRTOS_BitConfig/ut.cmake @@ -61,7 +61,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_DHCP/ut.cmake b/test/unit-test/FreeRTOS_DHCP/ut.cmake index 8639e4a60a..1d08984f0a 100644 --- a/test/unit-test/FreeRTOS_DHCP/ut.cmake +++ b/test/unit-test/FreeRTOS_DHCP/ut.cmake @@ -55,7 +55,6 @@ list(APPEND real_include_directories list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c index c7c31a4fb8..89238129ff 100644 --- a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c +++ b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c @@ -33,8 +33,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" #include "mock_FreeRTOS_Sockets.h" diff --git a/test/unit-test/FreeRTOS_DHCPv6/ut.cmake b/test/unit-test/FreeRTOS_DHCPv6/ut.cmake index 1c9998d35e..3fd0c74dbd 100644 --- a/test/unit-test/FreeRTOS_DHCPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_DHCPv6/ut.cmake @@ -71,7 +71,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_DNS/ut.cmake b/test/unit-test/FreeRTOS_DNS/ut.cmake index 632acffd9d..f9d25a146d 100644 --- a/test/unit-test/FreeRTOS_DNS/ut.cmake +++ b/test/unit-test/FreeRTOS_DNS/ut.cmake @@ -66,7 +66,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/source/include diff --git a/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake b/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake index 09522e1ab3..ba26da63c6 100755 --- a/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake +++ b/test/unit-test/FreeRTOS_DNS_Cache/ut.cmake @@ -64,7 +64,6 @@ set (test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/source/include diff --git a/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake b/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake index 8973b535bb..f1f1483dce 100644 --- a/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake +++ b/test/unit-test/FreeRTOS_DNS_Callback/ut.cmake @@ -65,7 +65,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/source/include/ diff --git a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake index ef479c081b..9e63fd66e7 100644 --- a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake +++ b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/ut.cmake @@ -65,7 +65,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/source/include diff --git a/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake b/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake index 98c37b9931..780f6301a6 100644 --- a/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake +++ b/test/unit-test/FreeRTOS_DNS_Networking/ut.cmake @@ -59,7 +59,6 @@ list(APPEND real_include_directories list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/include diff --git a/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c b/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c index 1ef67d245b..c1b8131250 100644 --- a/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c +++ b/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_ICMP/ut.cmake b/test/unit-test/FreeRTOS_ICMP/ut.cmake index fcab0de705..fc7f04fba8 100644 --- a/test/unit-test/FreeRTOS_ICMP/ut.cmake +++ b/test/unit-test/FreeRTOS_ICMP/ut.cmake @@ -75,7 +75,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c index bfc6f54deb..abe55e10c7 100644 --- a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c +++ b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" #include "mock_queue.h" diff --git a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c index eb3a817c32..374c69f63b 100644 --- a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c +++ b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP/ut.cmake b/test/unit-test/FreeRTOS_IP/ut.cmake index ec55f1058d..4b37c1d686 100644 --- a/test/unit-test/FreeRTOS_IP/ut.cmake +++ b/test/unit-test/FreeRTOS_IP/ut.cmake @@ -81,7 +81,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c index b59df58d54..60b42ee010 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c index 1ad5ba21cb..14fe4f35bc 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake b/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake index 8d3eccb596..bc050bae7b 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_DiffConfig1/ut.cmake @@ -79,7 +79,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${CMAKE_BINARY_DIR}/../../../source/portable/Buffermanagement ${CMAKE_BINARY_DIR}/../../../source/portable/Compiler/MSVC ${MODULE_ROOT_DIR}/test/unit-test/${project_name} diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c index 1c6b9f7368..991d4d8846 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c index 52e45c0d80..8fac597cf6 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c index 976ea9cc05..08d46e4c8d 100644 --- a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c +++ b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_Timers/ut.cmake b/test/unit-test/FreeRTOS_IP_Timers/ut.cmake index a572129af8..9a1620cedf 100644 --- a/test/unit-test/FreeRTOS_IP_Timers/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_Timers/ut.cmake @@ -68,7 +68,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c index be5269b617..af09192c64 100644 --- a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c +++ b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IP_Utils/ut.cmake b/test/unit-test/FreeRTOS_IP_Utils/ut.cmake index 7dbb128e38..8c5f73078b 100644 --- a/test/unit-test/FreeRTOS_IP_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_IP_Utils/ut.cmake @@ -71,7 +71,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${TCP_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c index b51a9e08d8..bf39c69aeb 100644 --- a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c +++ b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c b/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c index 2ea74d2cd5..0665b3dc4c 100644 --- a/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c +++ b/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IPv4/ut.cmake b/test/unit-test/FreeRTOS_IPv4/ut.cmake index e2f9e78d1f..e2f8912337 100644 --- a/test/unit-test/FreeRTOS_IPv4/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4/ut.cmake @@ -30,7 +30,7 @@ list(APPEND mock_include_list ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFilesv ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) @@ -66,9 +66,8 @@ set(test_include_directories "") # list the directories your test needs to include list(APPEND test_include_directories . - ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/unit-test/${project_name} + ${CMOCK_DIR}/vendor/unity/src ${TCP_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources ) diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c index e01e06504f..4712491b44 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c index 9817f7cc7b..0ba0b019a7 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake b/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake index fad506c429..99bc67d23a 100644 --- a/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4_Sockets/ut.cmake @@ -57,7 +57,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix diff --git a/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake b/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake index 9fda556518..8faf257d4c 100644 --- a/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4_Utils/ut.cmake @@ -60,7 +60,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${TCP_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IPv6/ut.cmake b/test/unit-test/FreeRTOS_IPv6/ut.cmake index f695563625..aba573fd0d 100644 --- a/test/unit-test/FreeRTOS_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv6/ut.cmake @@ -62,7 +62,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake index d8c0f34fc2..7a2a4c558a 100644 --- a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake @@ -62,7 +62,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c index aad8b62182..0e2762536f 100644 --- a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c +++ b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake b/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake index 1a2df0fe7d..6e9f105f52 100644 --- a/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv6_Utils/ut.cmake @@ -65,7 +65,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_ND/ut.cmake b/test/unit-test/FreeRTOS_ND/ut.cmake index bc002c9aca..9e113d1580 100644 --- a/test/unit-test/FreeRTOS_ND/ut.cmake +++ b/test/unit-test/FreeRTOS_ND/ut.cmake @@ -71,7 +71,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c b/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c index ae525e8092..0d77637d70 100644 --- a/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c +++ b/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_RA/ut.cmake b/test/unit-test/FreeRTOS_RA/ut.cmake index b06b9c84a3..f83cb0d643 100644 --- a/test/unit-test/FreeRTOS_RA/ut.cmake +++ b/test/unit-test/FreeRTOS_RA/ut.cmake @@ -66,7 +66,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c b/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c index 05f4a6297f..64f06e7541 100644 --- a/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c +++ b/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Routing/ut.cmake b/test/unit-test/FreeRTOS_Routing/ut.cmake index 42ceaa88de..2ceb2a26b5 100644 --- a/test/unit-test/FreeRTOS_Routing/ut.cmake +++ b/test/unit-test/FreeRTOS_Routing/ut.cmake @@ -69,7 +69,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c index 75ad1093c8..45383af9e7 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c +++ b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake index 1b29684b30..1c1c75ee56 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake +++ b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake @@ -70,7 +70,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${TCP_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c index 1fe4798fc4..ef5c802bbb 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c +++ b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake index 30a6cb85ea..019923c678 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake +++ b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/ut.cmake @@ -70,7 +70,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c index 4cfa0becdc..fa56b1d59e 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c index 9db98c345a..f10c454972 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c index 32d5109364..6f6ac2779a 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c index 3b73aa1c5b..3b73fb5f3d 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets/ut.cmake b/test/unit-test/FreeRTOS_Sockets/ut.cmake index 4308738602..8803623e47 100644 --- a/test/unit-test/FreeRTOS_Sockets/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets/ut.cmake @@ -70,7 +70,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c index 954730b984..3b612ec210 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c index 3bc010b10f..e4f60cc2ae 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c index 2861fdf50a..b53ff0e857 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c index 930dd60d03..15d359a558 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_GenericAPI_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c index eed601b355..95a3688a24 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/FreeRTOS_Sockets_DiffConfig2_TCP_API_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake index 279648b4b8..7e100e31c8 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig2/ut.cmake @@ -63,7 +63,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c b/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c index a9dfef83b5..77c6de2f6d 100644 --- a/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake b/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake index 7cb90263db..ea0b3f6c1d 100644 --- a/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake @@ -72,7 +72,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c b/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c index 709a329b77..52e2761c3f 100644 --- a/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c +++ b/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_semphr.h" diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake b/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake index ea01aeeebc..33e0df5070 100644 --- a/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake +++ b/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake @@ -65,7 +65,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_TCP_IP/ut.cmake b/test/unit-test/FreeRTOS_TCP_IP/ut.cmake index 0af8437e73..4a92e9b05a 100644 --- a/test/unit-test/FreeRTOS_TCP_IP/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_IP/ut.cmake @@ -73,7 +73,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake b/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake index 28499cef85..d70f78bd0c 100644 --- a/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake @@ -66,7 +66,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c b/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c index 69871eb0c0..ea726378f1 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c +++ b/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_FreeRTOS_IP_Private.h" diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake index 3cf1e00a8b..752c539572 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake @@ -67,7 +67,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake index 1b0277a672..e097100ffb 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake @@ -67,7 +67,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake index 1e97a3416f..5ff07d501c 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake @@ -66,7 +66,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake index fa455dc815..2c37dad750 100644 --- a/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake @@ -80,7 +80,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${CMAKE_BINARY_DIR}/Annexed_TCP/ ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake index 835aedaba8..19c34ec5b9 100644 --- a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake @@ -66,7 +66,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake index d0bbe9014d..bab2f00b92 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake @@ -61,7 +61,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake index 7de12cd003..672fdc8b83 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake @@ -59,7 +59,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake index 6d3761b278..af0a2657dd 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake @@ -59,7 +59,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources diff --git a/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake b/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake index 11bb688942..b36711c84f 100644 --- a/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake +++ b/test/unit-test/FreeRTOS_TCP_WIN/ut.cmake @@ -56,7 +56,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c index 4949360be0..1a03e51db2 100644 --- a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c +++ b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_UDP_IP/ut.cmake b/test/unit-test/FreeRTOS_UDP_IP/ut.cmake index dee8308f7f..ad8ecfb5b8 100644 --- a/test/unit-test/FreeRTOS_UDP_IP/ut.cmake +++ b/test/unit-test/FreeRTOS_UDP_IP/ut.cmake @@ -71,7 +71,6 @@ list(APPEND real_include_directories list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ) diff --git a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c index 866cf9264e..9ab2ab48bf 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c +++ b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c @@ -34,8 +34,6 @@ #include #include -#include "portmacro.h" - #include "mock_task.h" #include "mock_list.h" diff --git a/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake b/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake index 0ed93663d6..0d1974b11f 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake +++ b/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake @@ -74,7 +74,6 @@ set(test_include_directories "") list(APPEND test_include_directories . ${CMOCK_DIR}/vendor/unity/src - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${TCP_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/Annexed_TCP/ From c74907642757d7f7efd5a9c7255533bc83c7598e Mon Sep 17 00:00:00 2001 From: Monika Singh Date: Fri, 1 Sep 2023 07:41:04 +0000 Subject: [PATCH 6/7] Fix UT --- test/unit-test/FreeRTOS_IPv4/ut.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit-test/FreeRTOS_IPv4/ut.cmake b/test/unit-test/FreeRTOS_IPv4/ut.cmake index e2f8912337..5d49d53b9c 100644 --- a/test/unit-test/FreeRTOS_IPv4/ut.cmake +++ b/test/unit-test/FreeRTOS_IPv4/ut.cmake @@ -30,7 +30,7 @@ list(APPEND mock_include_list ${TCP_INCLUDE_DIRS} ${MODULE_ROOT_DIR}/test/unit-test/${project_name} ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include - ${MODULE_ROOT_DIR}/test/unit-test/ConfigFilesv + ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix ) From a1db5b23991562824477ccb0f966bac69df678d5 Mon Sep 17 00:00:00 2001 From: Soren Ptak Date: Fri, 1 Sep 2023 09:41:34 -0700 Subject: [PATCH 7/7] Update the coverage cop action to use new parameter name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3dc50ce6a..cdef98a5ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: Check Coverage uses: FreeRTOS/CI-CD-Github-Actions/coverage-cop@main with: - path: ./test/unit-test/build/coverage.info + coverage-file: ./test/unit-test/build/coverage.info spell-check: runs-on: ubuntu-latest