Fix FreeRTOS+TCP unit tests for latest Kernel V10.6.1 (#1015)

* Fix unit tests for latest FreeRTOS-Kernel V10.6.1 * Update the FreeRTOS-Kernel submodule to V10.6.1 * Update the Coverage-Cop action to use new parameter name --------- Co-authored-by: Monika Singh <moninom@amazon.com> Co-authored-by: Soren Ptak <ptaksoren@gmail.com>
FreeRTOS · Sep 1, 2023 · a3413d2 · a3413d2
1 parent 34148c3
commit a3413d2
Show file tree

Hide file tree

Showing 51 changed files with 95 additions and 61 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
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}
  )