Take in the upstream test changes

Skptak · Skptak · commit f4a11d3bb003 · 2023-09-01T18:18:34.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -87,7 +87,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Check formatting
-        uses: FreeRTOS/CI-CD-Github-Actions/formatting@v2
+        uses: FreeRTOS/CI-CD-Github-Actions/formatting@main
         with:
           path: ./
 
diff --git a/manifest.yml b/manifest.yml
@@ -6,7 +6,7 @@ description:
 license: "MIT"
 dependencies:
   - name: "FreeRTOS-Kernel"
-    version: "V10.4.5"
+    version: "V10.6.1"
     license: "MIT"
     repository:
       type: "git"
diff --git a/test/FreeRTOS-Kernel b/test/FreeRTOS-Kernel
@@ -1 +1 @@
-Subproject commit cb0757ee0b8894090b82e75e83942e3c61a32245
+Subproject commit 0264280230aa6a828247b5f05bf57e33f1994581
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}
         )
 
@@ -71,8 +71,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
@@ -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
@@ -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
@@ -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
diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake b/test/unit-test/FreeRTOS_Stream_Buffer/ut.cmake
diff --git a/test/unit-test/FreeRTOS_TCP_IP/ut.cmake b/test/unit-test/FreeRTOS_TCP_IP/ut.cmake
diff --git a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake
diff --git a/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake b/test/unit-test/FreeRTOS_TCP_Reception/ut.cmake
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling/ut.cmake
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake
diff --git a/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake
diff --git a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake
diff --git a/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake
diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake
diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake
diff --git a/test/unit-test/FreeRTOS_UDP_IP/ut.cmake b/test/unit-test/FreeRTOS_UDP_IP/ut.cmake
diff --git a/test/unit-test/FreeRTOS_UDP_IPv4/ut.cmake b/test/unit-test/FreeRTOS_UDP_IPv4/ut.cmake
diff --git a/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake b/test/unit-test/FreeRTOS_UDP_IPv6/ut.cmake

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ list(APPEND mock_include_list`
`27`	`27`	`.`
`28`	`28`	`${TCP_INCLUDE_DIRS}`
`29`	`29`	`${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include`
`30`		`- ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`31`	`30`	`${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles`
	`31`	`+ ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`#list the definitions of your mocks to control what to be included`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ list(APPEND mock_include_list`
`23`	`23`	`.`
`24`	`24`	`${TCP_INCLUDE_DIRS}`
`25`	`25`	`${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include`
`26`		`- ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`27`	`26`	`${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles`
	`27`	`+ ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`28`	`28`	`${MODULE_ROOT_DIR}/test/unit-test/${project_name}`
`29`	`29`	`)`
`30`	`30`
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/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`36`	`35`	`${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles`
	`36`	`+ ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`37`	`37`	`${MODULE_ROOT_DIR}/test/unit-test/${project_name}`
`38`	`38`	`)`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ list(APPEND mock_include_list`
`37`	`37`	`.`
`38`	`38`	`${TCP_INCLUDE_DIRS}`
`39`	`39`	`${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include`
`40`		`- ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`41`	`40`	`${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles`
	`41`	`+ ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`42`	`42`	`${MODULE_ROOT_DIR}/test/unit-test/${project_name}`
`43`	`43`	`)`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ list(APPEND mock_include_list`
`36`	`36`	`.`
`37`	`37`	`${TCP_INCLUDE_DIRS}`
`38`	`38`	`${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include`
`39`		`- ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`40`	`39`	`${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles`
	`40`	`+ ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`41`	`41`	`${MODULE_ROOT_DIR}/test/unit-test/${project_name}`
`42`	`42`	`)`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ list(APPEND mock_include_list`
`44`	`44`	`${TCP_INCLUDE_DIRS}`
`45`	`45`	`${MODULE_ROOT_DIR}/test/unit-test/${project_name}`
`46`	`46`	`${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include`
`47`		`- ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`48`	`47`	`${MODULE_ROOT_DIR}/test/unit-test/ConfigFiles`
	`48`	`+ ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix`
`49`	`49`	`)`
`50`	`50`
`51`	`51`	`set(mock_define_list "")`