Merge pull request #8086 from SeppoTakalo/fix_socketaddr_unittests

Cruz Monrreal · web-flow · commit 48d212fe5113 · 2018-09-14T10:34:37.000-05:00
Fix SocketAddress unittests
diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
@@ -100,6 +100,7 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../rtos/TARGET_CORTEX"
   "${PROJECT_SOURCE_DIR}/../rtos/TARGET_CORTEX/rtx5/Include"
   "${PROJECT_SOURCE_DIR}/../cmsis"
+  "${PROJECT_SOURCE_DIR}/../features/frameworks/nanostack-libservice/mbed-client-libservice/"
 )
 
 # Create a list for test suites.
diff --git a/UNITTESTS/features/netsocket/InternetSocket/unittest.cmake b/UNITTESTS/features/netsocket/InternetSocket/unittest.cmake
@@ -10,6 +10,8 @@ set(unittest-sources
   ../features/netsocket/SocketAddress.cpp
   ../features/netsocket/NetworkStack.cpp
   ../features/netsocket/InternetSocket.cpp
+  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/features/netsocket/TCPSocket/unittest.cmake b/UNITTESTS/features/netsocket/TCPSocket/unittest.cmake
@@ -10,6 +10,8 @@ set(unittest-sources
   ../features/netsocket/SocketAddress.cpp
   ../features/netsocket/InternetSocket.cpp
   ../features/netsocket/TCPSocket.cpp
+  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/features/netsocket/UDPSocket/unittest.cmake b/UNITTESTS/features/netsocket/UDPSocket/unittest.cmake
@@ -11,6 +11,8 @@ set(unittest-sources
   ../features/netsocket/NetworkStack.cpp
   ../features/netsocket/InternetSocket.cpp
   ../features/netsocket/UDPSocket.cpp
+  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
 )
 
 set(unittest-test-sources

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ set(unittest-includes-base`
`100`	`100`	`"${PROJECT_SOURCE_DIR}/../rtos/TARGET_CORTEX"`
`101`	`101`	`"${PROJECT_SOURCE_DIR}/../rtos/TARGET_CORTEX/rtx5/Include"`
`102`	`102`	`"${PROJECT_SOURCE_DIR}/../cmsis"`
	`103`	`+ "${PROJECT_SOURCE_DIR}/../features/frameworks/nanostack-libservice/mbed-client-libservice/"`
`103`	`104`	`)`
`104`	`105`
`105`	`106`	`# Create a list for test suites.`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ set(unittest-sources`
`10`	`10`	`../features/netsocket/SocketAddress.cpp`
`11`	`11`	`../features/netsocket/NetworkStack.cpp`
`12`	`12`	`../features/netsocket/InternetSocket.cpp`
	`13`	`+ ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c`
	`14`	`+ ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c`
`13`	`15`	`)`
`14`	`16`
`15`	`17`	`set(unittest-test-sources`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ set(unittest-sources`
`11`	`11`	`../features/netsocket/NetworkStack.cpp`
`12`	`12`	`../features/netsocket/InternetSocket.cpp`
`13`	`13`	`../features/netsocket/UDPSocket.cpp`
	`14`	`+ ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c`
	`15`	`+ ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c`
`14`	`16`	`)`
`15`	`17`
`16`	`18`	`set(unittest-test-sources`