Skip to content

Commit

Permalink
Enable Android testing on device (eProsima#2978)
Browse files Browse the repository at this point in the history
* Refs #15493: Several CMake fixes. Enable test installation on device

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #15493: Added emulator commands. Fixed datasharing paths

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #15493: Linter pass

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #15493: Removed explicit paths from tests. Minor other fixes

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Update versions.md

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
  • Loading branch information
jsan-rt and MiguelCompany authored Sep 29, 2022
1 parent 8e1bd4a commit 0d91e6c
Show file tree
Hide file tree
Showing 36 changed files with 389 additions and 3 deletions.
21 changes: 21 additions & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,24 @@ if(SYSTEM_TESTS)
add_subdirectory(system/tools/fastdds)
add_subdirectory(system/tools/fds)
endif()

if (ANDROID)
option(INSTALL_ANDROID_TESTS "Install Built Tests to Device" OFF)
if (INSTALL_ANDROID_TESTS)
install(CODE "set(ANDROID \"${ANDROID}\")
set(ANDROID_TESTING_ROOT \"${ANDROID_TESTING_ROOT}\")
set(CMAKE_BINARY_DIR \"${CMAKE_BINARY_DIR}\")
message(STATUS \"Android testing ROOT is '${ANDROID_TESTING_ROOT}'\")
if(ANDROID_TESTING_ROOT)
file(GLOB_RECURSE CTEST_GENERATED_FILES RELATIVE \"${CMAKE_BINARY_DIR}\" \"CTestTestfile.cmake\")
foreach(CTEST_FILE \${CTEST_GENERATED_FILES})
file(READ \${CTEST_FILE} contents)
message(STATUS \"Processing file \${CTEST_FILE}\")
string(REGEX REPLACE \"${CMAKE_BINARY_DIR}\" \"${ANDROID_TESTING_ROOT}\" contents \${contents})
file(REMOVE \${CTEST_FILE})
file(WRITE \${CTEST_FILE} \${contents})
endforeach()
endif()
execute_process(COMMAND adb push \"${CMAKE_BINARY_DIR}/test\" \"${ANDROID_TESTING_ROOT}\") ")
endif()
endif()
5 changes: 5 additions & 0 deletions test/blackbox/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -444,3 +444,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/environment_file.json

unset(dns_filter)
unset(pkcs_filter)
if(ANDROID)
set_property(TARGET BlackboxTests_RTPS PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET BlackboxTests_FastRTPS PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET BlackboxTests_DDS_PIM PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
5 changes: 4 additions & 1 deletion test/blackbox/common/DDSBlackboxTestsDataSharing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ bool check_shared_file (
bool result;
std::stringstream file_name;
std::fstream file_stream;

#if ANDROID
file_name << "/data/local/tmp/" << shared_dir << "/fast_datasharing_" << guid.guidPrefix << "_" << guid.entityId;
#else
file_name << shared_dir << "/fast_datasharing_" << guid.guidPrefix << "_" << guid.entityId;
#endif // if ANDROID
file_stream.open(file_name.str(), std::ios::in);
result = file_stream.is_open();
file_stream.close();
Expand Down
4 changes: 4 additions & 0 deletions test/unittest/dds/collections/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,7 @@ target_include_directories(LoanableSequenceTests PRIVATE
${PROJECT_SOURCE_DIR}/src/cpp)
target_link_libraries(LoanableSequenceTests GTest::gtest)
add_gtest(LoanableSequenceTests SOURCES ${LOANABLE_SEQUENCE_TESTS_SOURCE})

if(ANDROID)
set_property(TARGET LoanableSequenceTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
7 changes: 7 additions & 0 deletions test/unittest/dds/core/condition/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,10 @@ target_include_directories(WaitSetImplTests PRIVATE
)
target_link_libraries(WaitSetImplTests GTest::gtest GTest::gmock)
add_gtest(WaitSetImplTests SOURCES ${WAITSET_IMPL_TESTS_SOURCE})

if(ANDROID)
set_property(TARGET ConditionTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET ConditionNotifierTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET StatusConditionImplTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET WaitSetImplTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
12 changes: 12 additions & 0 deletions test/unittest/dds/core/entity/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ set(ENTITY_TESTS_SOURCE
${PROJECT_SOURCE_DIR}/src/cpp/utils/SystemInfo.cpp
EntityTests.cpp)

if(ANDROID)
if (ANDROID_NATIVE_API_LEVEL LESS 24)
list(APPEND ENTITY_TESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
endif()
endif()

add_executable(EntityTests ${ENTITY_TESTS_SOURCE})
target_compile_definitions(EntityTests PRIVATE FASTRTPS_NO_LIB
$<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
Expand All @@ -44,3 +52,7 @@ target_include_directories(EntityTests PRIVATE
)
target_link_libraries(EntityTests GTest::gtest fastcdr)
add_gtest(EntityTests SOURCES ${ENTITY_TESTS_SOURCE})

if(ANDROID)
set_property(TARGET EntityTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
13 changes: 13 additions & 0 deletions test/unittest/dds/participant/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ if(WIN32)
add_definitions(-D_WIN32_WINNT=0x0601)
endif()

if(ANDROID)
if (ANDROID_NATIVE_API_LEVEL LESS 24)
list(APPEND PARTICIPANTTESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
endif()
endif()


add_executable(ParticipantTests ${PARTICIPANTTESTS_SOURCE})
target_compile_definitions(ParticipantTests PRIVATE FASTRTPS_NO_LIB
$<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
Expand All @@ -45,3 +54,7 @@ endif()
add_gtest(ParticipantTests SOURCES ${PARTICIPANTTESTS_SOURCE} IGNORE ${dns_filter})

unset(dns_filter)

if(ANDROID)
set_property(TARGET ParticipantTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
16 changes: 16 additions & 0 deletions test/unittest/dds/publisher/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,17 @@ if(WIN32)
)
endif()

if(ANDROID)
if (ANDROID_NATIVE_API_LEVEL LESS 24)
list(APPEND PUBLISHERTESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
list(APPEND DATAWRITERTESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
endif()
endif()

add_executable(PublisherTests ${PUBLISHERTESTS_SOURCE})
target_compile_definitions(PublisherTests PRIVATE FASTRTPS_NO_LIB
$<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
Expand Down Expand Up @@ -356,3 +367,8 @@ endif()
add_gtest(DataWriterTests
SOURCES ${DATAWRITERTESTS_SOURCE}
ENVIRONMENTS "CERTS_PATH=${PROJECT_SOURCE_DIR}/test/certs")

if(ANDROID)
set_property(TARGET PublisherTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET DataWriterTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
12 changes: 12 additions & 0 deletions test/unittest/dds/status/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,14 @@ if(WIN32)
add_definitions(-D_WIN32_WINNT=0x0601)
endif()

if(ANDROID)
if (ANDROID_NATIVE_API_LEVEL LESS 24)
list(APPEND LISTENERTESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
endif()
endif()

add_executable(ListenerTests ${LISTENERTESTS_SOURCE})
target_compile_definitions(ListenerTests PRIVATE FASTRTPS_NO_LIB
BOOST_ASIO_STANDALONE
Expand Down Expand Up @@ -192,3 +200,7 @@ if(MSVC OR MSVC_IDE)
endif()

add_gtest(ListenerTests SOURCES ${LISTENERTESTS_SOURCE})

if(ANDROID)
set_property(TARGET ListenerTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
23 changes: 23 additions & 0 deletions test/unittest/dds/subscriber/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,23 @@ if(WIN32)
add_definitions(-D_WIN32_WINNT=0x0601)
endif()

if(ANDROID)
if (ANDROID_NATIVE_API_LEVEL LESS 24)
list(APPEND SUBSCRIBERTESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
list(APPEND DATAREADERTESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
list(APPEND DATAREADERINSTANCETESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
list(APPEND DATAREADERHISTORYTESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
endif()
endif()

add_executable(SubscriberTests ${SUBSCRIBERTESTS_SOURCE})
target_compile_definitions(SubscriberTests PRIVATE FASTRTPS_NO_LIB
$<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
Expand Down Expand Up @@ -99,3 +116,9 @@ target_link_libraries(DataReaderHistoryTests fastcdr foonathan_memory
GTest::gmock
${CMAKE_DL_LIBS})
add_gtest(DataReaderHistoryTests SOURCES ${DATAREADERHISTORYTESTS_SOURCE})
if(ANDROID)
set_property(TARGET SubscriberTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET DataReaderTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET DataReaderHistoryTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET DataReaderInstanceTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
4 changes: 4 additions & 0 deletions test/unittest/dds/topic/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ target_link_libraries(TopicTests fastrtps fastcdr foonathan_memory
GTest::gmock
${CMAKE_DL_LIBS})
add_gtest(TopicTests SOURCES ${TOPICTESTS_SOURCE})

if(ANDROID)
set_property(TARGET TopicTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
4 changes: 4 additions & 0 deletions test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,7 @@ target_link_libraries(DDSSQLFilterTests fastcdr foonathan_memory
GTest::gmock
${CMAKE_DL_LIBS})
add_gtest(DDSSQLFilterTests SOURCES ${DDSSQLFILTERTEST_SOURCES})

if(ANDROID)
set_property(TARGET DDSSQLFilterTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
19 changes: 18 additions & 1 deletion test/unittest/dynamic_types/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ if(TINYXML2_SOURCE_DIR)
)
endif()

if(ANDROID)
if (ANDROID_NATIVE_API_LEVEL LESS 24)
list(APPEND DYNAMIC_TYPES_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
endif()
endif()

set(DYNAMIC_TYPES_TEST_SOURCE
DynamicTypesTests.cpp
idl/Basic.cxx
Expand Down Expand Up @@ -117,6 +125,7 @@ target_include_directories(DynamicTypesTests PRIVATE
$<$<BOOL:${TINYXML2_INCLUDE_DIR}>:${TINYXML2_INCLUDE_DIR}>
${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
${PROJECT_SOURCE_DIR}/src/cpp
$<$<BOOL:${ANDROID}>:${ANDROID_IFADDRS_INCLUDE_DIR}>
)
target_link_libraries(DynamicTypesTests GTest::gtest
$<$<BOOL:${WIN32}>:iphlpapi$<SEMICOLON>Shlwapi>
Expand All @@ -137,7 +146,8 @@ target_compile_definitions(DynamicComplexTypesTests PRIVATE FASTRTPS_NO_LIB
target_include_directories(DynamicComplexTypesTests PRIVATE
${Asio_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
${PROJECT_SOURCE_DIR}/src/cpp)
${PROJECT_SOURCE_DIR}/src/cpp
$<$<BOOL:${ANDROID}>:${ANDROID_IFADDRS_INCLUDE_DIR}>)
target_link_libraries(DynamicComplexTypesTests GTest::gtest
$<$<BOOL:${WIN32}>:iphlpapi$<SEMICOLON>Shlwapi>
$<$<BOOL:${WIN32}>:ws2_32>
Expand All @@ -163,7 +173,14 @@ target_include_directories(DynamicTypes_4_2_Tests PRIVATE
$<$<BOOL:${WIN32}>:ws2_32>
${TINYXML2_LIBRARY}
fastcdr
$<$<BOOL:${ANDROID}>:${ANDROID_IFADDRS_INCLUDE_DIR}>
)
add_gtest(DynamicTypes_4_2_Tests SOURCES ${DYNAMIC_TYPES_4_2_TEST_SOURCE})

configure_file("types.xml" "types.xml" COPYONLY)

if(ANDROID)
set_property(TARGET DynamicComplexTypesTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET DynamicTypes_4_2_Tests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET DynamicTypesTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
5 changes: 5 additions & 0 deletions test/unittest/logging/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,8 @@ target_link_libraries(LogFileTests GTest::gtest ${MOCKS}
fastcdr
)
add_gtest(LogFileTests SOURCES ${LOGFILETESTS_TEST_SOURCE})

if(ANDROID)
set_property(TARGET LogTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET LogFileTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
9 changes: 9 additions & 0 deletions test/unittest/logging/log_macros/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,12 @@ target_link_libraries(LogMacrosInternalDebugOffTests GTest::gtest ${MOCKS}
$<$<BOOL:${WIN32}>:iphlpapi$<SEMICOLON>Shlwapi>
)
add_gtest(LogMacrosInternalDebugOffTests SOURCES ${LOGMACROS_INTERNALDEBUG_TEST_SOURCE})

if(ANDROID)
set_property(TARGET LogMacrosAllActiveTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET LogMacrosDefaultTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET LogMacrosInternalDebugOffTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET LogMacrosNoErrorTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET LogMacrosNoInfoTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET LogMacrosNoWarningTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
14 changes: 14 additions & 0 deletions test/unittest/rtps/builtin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ if(WIN32)
add_definitions(-D_WIN32_WINNT=0x0601)
endif()

if(ANDROID)
if (ANDROID_NATIVE_API_LEVEL LESS 24)
list(APPEND BUILTIN_DATA_SERIALIZATION_TESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
endif()
endif()


add_executable(BuiltinDataSerializationTests ${BUILTIN_DATA_SERIALIZATION_TESTS_SOURCE})
target_compile_definitions(BuiltinDataSerializationTests PRIVATE FASTRTPS_NO_LIB
BOOST_ASIO_STANDALONE
Expand All @@ -77,6 +86,7 @@ target_include_directories(BuiltinDataSerializationTests PRIVATE
${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
${PROJECT_SOURCE_DIR}/src/cpp
${Asio_INCLUDE_DIR}
$<$<BOOL:${ANDROID}>:${ANDROID_IFADDRS_INCLUDE_DIR}>
)
target_link_libraries(BuiltinDataSerializationTests foonathan_memory
GTest::gmock
Expand All @@ -88,3 +98,7 @@ else()
endif()

add_gtest(BuiltinDataSerializationTests SOURCES ${BUILTIN_DATA_SERIALIZATION_TESTS_SOURCE})

if(ANDROID)
set_property(TARGET BuiltinDataSerializationTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
27 changes: 26 additions & 1 deletion test/unittest/rtps/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,20 @@ set(GUID_UTILS_TESTS_SOURCE GuidUtilsTests.cpp
${PROJECT_SOURCE_DIR}/src/cpp/utils/IPLocator.cpp
${PROJECT_SOURCE_DIR}/src/cpp/utils/md5.cpp
${PROJECT_SOURCE_DIR}/src/cpp/utils/SystemInfo.cpp)

if(ANDROID)
if (ANDROID_NATIVE_API_LEVEL LESS 24)
list(APPEND GUID_UTILS_TESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)
list(APPEND CACHECHANGETESTS_SOURCE
${ANDROID_IFADDRS_SOURCE_DIR}/ifaddrs.c
)

endif()
endif()


set(SEQUENCENUMBERTESTS_SOURCE SequenceNumberTests.cpp)
set(PORTPARAMETERSTESTS_SOURCE PortParametersTests.cpp
${PROJECT_SOURCE_DIR}/src/cpp/fastdds/log/Log.cpp
Expand Down Expand Up @@ -51,7 +65,8 @@ target_compile_definitions(GuidUtilsTests PRIVATE FASTRTPS_NO_LIB
target_include_directories(GuidUtilsTests PRIVATE
${PROJECT_SOURCE_DIR}/src/cpp
${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
${Asio_INCLUDE_DIR})
${Asio_INCLUDE_DIR}
$<$<BOOL:${ANDROID}>:${ANDROID_IFADDRS_INCLUDE_DIR}>)
target_link_libraries(GuidUtilsTests GTest::gtest)
if(MSVC OR MSVC_IDE)
target_link_libraries(GuidUtilsTests ws2_32)
Expand Down Expand Up @@ -129,3 +144,13 @@ target_include_directories(GuidTests PRIVATE
${PROJECT_SOURCE_DIR}/src/cpp)
target_link_libraries(GuidTests GTest::gtest)
add_gtest(GuidTests SOURCES ${GUIDTESTS_SOURCE} LABELS "NoMemoryCheck")

if(ANDROID)
set_property(TARGET CacheChangeTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET EntityIdTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET GuidTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET GuidPrefixTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET GuidUtilsTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET PortParametersTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET SequenceNumberTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
4 changes: 4 additions & 0 deletions test/unittest/rtps/discovery/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,7 @@ else()
endif()

add_gtest(EdpTests SOURCES ${EDPTESTS_SOURCE})

if(ANDROID)
set_property(TARGET EdpTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
6 changes: 6 additions & 0 deletions test/unittest/rtps/flowcontrol/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,9 @@ if(MSVC OR MSVC_IDE)
)
endif()
add_gtest(FlowControllerSchedulersTests SOURCES ${FLOWCONTROLLERSCHEDULERSTESTS_SOURCE})

if(ANDROID)
set_property(TARGET FlowControllerFactoryTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET FlowControllerPublishModesTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
set_property(TARGET FlowControllerSchedulersTests PROPERTY CROSSCOMPILING_EMULATOR "adb;shell;cd;${CMAKE_CURRENT_BINARY_DIR};&&")
endif()
Loading

0 comments on commit 0d91e6c

Please sign in to comment.