From a3413d25895c7ea406fb031e37bf0f3abb8b073b Mon Sep 17 00:00:00 2001 From: kar-rahul-aws <118818625+kar-rahul-aws@users.noreply.github.com> Date: Sat, 2 Sep 2023 02:57:20 +0530 Subject: [PATCH] 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 Co-authored-by: Soren Ptak --- .github/workflows/ci.yml | 24 ++++++++++++++++++- lexicon.txt | 2 ++ manifest.yml | 15 +++++++++--- test/FreeRTOS-Kernel | 2 +- test/unit-test/ConfigFiles/portmacro.h | 10 ++++++++ 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 +- .../FreeRTOS_ICMP_wo_assert/ut.cmake | 2 +- test/unit-test/FreeRTOS_IP/ut.cmake | 2 +- .../unit-test/FreeRTOS_IP_DiffConfig/ut.cmake | 2 +- .../FreeRTOS_IP_DiffConfig1/ut.cmake | 2 +- .../FreeRTOS_IP_DiffConfig2/ut.cmake | 2 +- .../FreeRTOS_IP_DiffConfig3/ut.cmake | 2 +- test/unit-test/FreeRTOS_IP_Timers/ut.cmake | 2 +- test/unit-test/FreeRTOS_IP_Utils/ut.cmake | 2 +- .../FreeRTOS_IP_Utils_DiffConfig/ut.cmake | 2 +- test/unit-test/FreeRTOS_IPv4/ut.cmake | 2 +- .../FreeRTOS_IPv4_DiffConfig/ut.cmake | 2 +- .../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 +- .../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 +- .../ut.cmake | 2 +- .../FreeRTOS_Routing_ConfigV4Only/ut.cmake | 2 +- test/unit-test/FreeRTOS_Sockets/ut.cmake | 4 +--- .../FreeRTOS_Sockets_DiffConfig/ut.cmake | 4 +--- .../FreeRTOS_Sockets_DiffConfig1/ut.cmake | 4 +--- .../FreeRTOS_Sockets_DiffConfig2/ut.cmake | 5 ++-- test/unit-test/FreeRTOS_Sockets_IPv6/ut.cmake | 4 +--- .../unit-test/FreeRTOS_Stream_Buffer/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_IP/ut.cmake | 2 +- .../FreeRTOS_TCP_IP_DiffConfig/ut.cmake | 2 +- .../unit-test/FreeRTOS_TCP_Reception/ut.cmake | 2 +- .../FreeRTOS_TCP_State_Handling/ut.cmake | 2 +- .../FreeRTOS_TCP_State_Handling_IPv4/ut.cmake | 2 +- .../FreeRTOS_TCP_State_Handling_IPv6/ut.cmake | 2 +- .../FreeRTOS_TCP_Transmission/ut.cmake | 2 +- .../FreeRTOS_TCP_Transmission_IPv6/ut.cmake | 2 +- test/unit-test/FreeRTOS_TCP_Utils/ut.cmake | 2 +- .../FreeRTOS_TCP_Utils_IPv6/ut.cmake | 2 +- .../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 +- 51 files changed, 95 insertions(+), 61 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a78449b36..cdef98a5e 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 @@ -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 8b11100a2..fc96db439 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 245184d1e..a5dacbd30 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 260a37c08..026428023 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 a766fe152..25dae85e8 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 diff --git a/test/unit-test/FreeRTOS_ARP/ut.cmake b/test/unit-test/FreeRTOS_ARP/ut.cmake index 86e556985..acdd47155 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 01be0b3e7..ba51c74ae 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 f65c09d53..3fd0c74db 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 63f065033..fc7f04fba 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 289299fe3..4ad6c6081 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 8e66699df..4b37c1d68 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 4227474c1..1ed395989 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 21c21ce1c..bc050bae7 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 7d9890143..2ef4a847f 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 9b003e9d7..2d832de4c 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 4ae5678e8..9a1620ced 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 04ed35195..8c5f73078 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 f065b2a58..790d60811 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 c2ca691c5..5d49d53b9 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/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 index 826cd5984..a0614a58f 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 bb4fdb9d6..a72d11f80 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 3e60caaf5..99bc67d23 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 b76df9b15..8faf257d4 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 b2d9ed3b8..aba573fd0 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 87b970b01..7a2a4c558 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 48d05a678..6e9f105f5 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 e0e7055fc..9e113d158 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 c36c51c01..f83cb0d64 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 403cb6c11..2ceb2a26b 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 4cb74b6cf..1c1c75ee5 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 66a235237..019923c67 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 f9b856adb..8803623e4 100644 --- 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 index 63fbe314d..2635b0255 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 a07ac85b5..423b145b9 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 3889fb105..7e100e31c 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 e46ba2cd3..ea0b3f6c1 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 ae9fc9ce5..33e0df507 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 f0509f4a5..4a92e9b05 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 55de3dba0..2504cb583 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 1ada473b9..d70f78bd0 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 ce6f672ce..752c53957 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 4bb8a8f91..e097100ff 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 ac1d362a2..5ff07d501 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 f8dd38385..2c37dad75 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 5b45fa347..19c34ec5b 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 2c4937582..bab2f00b9 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 21f73d4a1..672fdc8b8 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 dcf2f1796..af0a2657d 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 43b66385c..ad8ecfb5b 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 1db28b9ff..21a5b43f1 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 eb4d95af0..0d1974b11 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 "")