From 1004eb2ad433f127eda184f55a3bfe1db28b1fbb Mon Sep 17 00:00:00 2001 From: Andreas Nordal <4992374+anordal@users.noreply.github.com> Date: Tue, 4 Jun 2024 11:12:06 +0200 Subject: [PATCH] unit-test: Fix missing symbol in a few tests (linker error) I don't know why I get to resolve these, but in all cases, it is FreeRTOS_Sockets.c that is dragging in a dependency on xTCPWindowLoggingLevel, causing a few tests to fail to link: FreeRTOS_Sockets.c:5118:(.text+0x18fa2): undefined reference to `xTCPWindowLoggingLevel' Since it's one external variable, let's add it to the necessary unittests. Also under the headline of extern variables: The IPv6 address, which was not there for linkage, could be made const. --- test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c | 2 ++ .../FreeRTOS_Sockets_DiffConfig_privates_utest.c | 6 +++++- .../FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c | 8 +++++--- .../FreeRTOS_Sockets_DiffConfig1_TCP_API_utest.c | 4 +++- .../FreeRTOS_Sockets_DiffConfig1_UDP_API_utest.c | 2 ++ .../FreeRTOS_Sockets_DiffConfig1_privates_utest.c | 2 ++ 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c index 34fe7a2c2..2ac484752 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c @@ -54,6 +54,8 @@ BaseType_t xRNGStatus; BaseType_t xLocalReceiveCallback_Return; uint8_t xLocalReceiveCallback_Called = 0; +BaseType_t xTCPWindowLoggingLevel = 0; + /* ======================== Stub Callback Functions ========================= */ EventBits_t xStubForEventGroupWaitBits( EventGroupHandle_t xEventGroup, 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 3b612ec21..0c61574b0 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 @@ -56,7 +56,11 @@ #include "catch_assert.h" -/* ============================== Test Cases ============================== */ +/* ============================ EXTERN VARIABLES ============================ */ + +BaseType_t xTCPWindowLoggingLevel = 0; + +/* =============================== Test Cases =============================== */ /** * @brief Binding successful. 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 c20dba919..9b43c4c6e 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 @@ -53,7 +53,9 @@ /* ============================ EXTERN VARIABLES ============================ */ /* 2001::1 */ -static IPv6_Address_t xIPv6Address = { { 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } }; +static const IPv6_Address_t xIPv6Address = { { 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } }; + +BaseType_t xTCPWindowLoggingLevel = 0; /* ============================== Test Cases ============================== */ @@ -231,7 +233,7 @@ void test_FreeRTOS_connect_SocketValuesNULL_NullDestinationAddress( void ) void test_prvSocketProps_UDPv6() { FreeRTOS_Socket_t xSocket; - IPv6_Address_t * pxIPv6SrcAddress = &xIPv6Address; /* 2001::1 */ + const IPv6_Address_t * pxIPv6SrcAddress = &xIPv6Address; /* 2001::1 */ uint16_t usSrcPort = 1024U; const char * pcReturn; @@ -251,7 +253,7 @@ void test_prvSocketProps_UDPv6() void test_prvSocketProps_TCPv6() { FreeRTOS_Socket_t xSocket; - IPv6_Address_t * pxIPv6SrcAddress = &xIPv6Address; /* 2001::1 */ + const IPv6_Address_t * pxIPv6SrcAddress = &xIPv6Address; /* 2001::1 */ IPv6_Address_t xIPv6RemoteAddress = { { 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 } }; /* 2001::2 */ uint16_t usSrcPort = 1024U; uint16_t usRemotePort = 2048U; diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_TCP_API_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_TCP_API_utest.c index 361b05fa1..03b368752 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_TCP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_TCP_API_utest.c @@ -50,7 +50,9 @@ /* ============================ EXTERN VARIABLES ============================ */ /* 2001::1 */ -static IPv6_Address_t xIPv6Address = { { 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } }; +static const IPv6_Address_t xIPv6Address = { { 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } }; + +BaseType_t xTCPWindowLoggingLevel = 0; /* =============================== Test Cases =============================== */ diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_UDP_API_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_UDP_API_utest.c index 7fe936377..af3ee7d8f 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_UDP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_UDP_API_utest.c @@ -46,6 +46,8 @@ #define TEST_MAX_UDPV4_PAYLOAD_LENGTH ipconfigNETWORK_MTU - ( ipSIZE_OF_IPv4_HEADER + ipSIZE_OF_UDP_HEADER ) +BaseType_t xTCPWindowLoggingLevel = 0; + /* =============================== Test Cases =============================== */ /** 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 45e196889..752aef9c0 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 @@ -54,6 +54,8 @@ BaseType_t prvDetermineSocketSize( BaseType_t xDomain, BaseType_t xProtocol, size_t * pxSocketSize ); +BaseType_t xTCPWindowLoggingLevel = 0; + /* ============================== Test Cases ============================== */ /**