Fix broken tests, bump kernel to V10.6.1

Soren Ptak · Soren Ptak · commit e41f3232cbfe · 2023-08-31T22:16:38.000-07:00
diff --git a/manifest.yml b/manifest.yml
@@ -6,7 +6,7 @@ description:
 license: "MIT"
 dependencies:
   - name: "FreeRTOS-Kernel"
-    version: "V10.6.0"
+    version: "V10.6.1"
     license: "MIT"
     repository:
       type: "git"
diff --git a/test/FreeRTOS-Kernel b/test/FreeRTOS-Kernel
@@ -1 +1 @@
-Subproject commit fe005419f0d31264059c61a2f043a0b4e0f24076
+Subproject commit 0264280230aa6a828247b5f05bf57e33f1994581
diff --git 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 <string.h>
 #include <stdint.h>
 
-#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
@@ -32,8 +32,8 @@ 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/ConfigFiles
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -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
@@ -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_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c
@@ -34,8 +34,6 @@
 #include <string.h>
 #include <stdint.h>
 
-#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
@@ -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/unit-test/ConfigFiles
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
         )
 
 set(mock_define_list "")
@@ -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_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c
@@ -34,8 +34,6 @@
 #include <string.h>
 #include <stdint.h>
 
-#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
@@ -32,8 +32,8 @@ 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/ConfigFiles
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}
         )
 
@@ -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_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c
@@ -34,8 +34,6 @@
 #include <string.h>
 #include <stdint.h>
 
-#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
@@ -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/unit-test/ConfigFiles
             ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
+            ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles
         )
 
 set(mock_define_list "")
@@ -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/

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ list(APPEND mock_include_list`
`32`	`32`	`.`
`33`	`33`	`${TCP_INCLUDE_DIRS}`
`34`	`34`	`${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include`
`35`		`- ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles`
`36`	`35`	`${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
	`36`	`+ ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles`
`37`	`37`	`${MODULE_ROOT_DIR}/test/unit-test/${project_name}`
`38`	`38`	`)`
`39`	`39`
`@@ -71,7 +71,6 @@ set(test_include_directories "")`
`71`	`71`	`list(APPEND test_include_directories`
`72`	`72`	`.`
`73`	`73`	`${CMOCK_DIR}/vendor/unity/src`
`74`		`- ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles`
`75`	`74`	`${TCP_INCLUDE_DIRS}`
`76`	`75`	`${MODULE_ROOT_DIR}/test/unit-test/${project_name}`
`77`	`76`	`${CMAKE_BINARY_DIR}/Annexed_TCP_Sources`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ set(test_include_directories "")`
`66`	`66`	`list(APPEND test_include_directories`
`67`	`67`	`.`
`68`	`68`	`${CMOCK_DIR}/vendor/unity/src`
`69`		`- ${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles`
`70`	`69`	`${TCP_INCLUDE_DIRS}`
`71`	`70`	`${MODULE_ROOT_DIR}/test/unit-test/${project_name}`
`72`	`71`	`${MODULE_ROOT_DIR}/source/include`