Skip to content

Commit d0e2ee4

Browse files
CarlosespicurCarlosespicur
authored
Fix blackbox test paths when compiling against Fast DDS Pro (#6035)
* Refs #23638: Fix blackbox test paths when compiling against Fast DDS Pro Signed-off-by: Carlosespicur <[email protected]> * Refs #23638: Review - Apply suggestions Signed-off-by: Carlosespicur <[email protected]> * Refs #23638: Fix CERTS_PATH Signed-off-by: Carlosespicur <[email protected]> --------- Signed-off-by: Carlosespicur <[email protected]>
1 parent 3af813b commit d0e2ee4

File tree

2 files changed

+86
-81
lines changed

2 files changed

+86
-81
lines changed

‎test/CMakeLists.txt‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,24 @@ if(EPROSIMA_BUILD_TESTS)
5656
include(${PROJECT_SOURCE_DIR}/cmake/testing/GoogleTest.cmake)
5757

5858
if(APPLE)
59-
link_libraries("-framework CoreFoundation" "-framework IOKit")
60-
endif()
59+
link_libraries("-framework CoreFoundation" "-framework IOKit")
60+
endif()
6161

62+
# TODO: Support other test suites in Fast DDS Pro builds
6263
add_subdirectory(blackbox)
63-
add_subdirectory(feature)
64-
add_subdirectory(unittest)
65-
add_subdirectory(dds/communication)
66-
add_subdirectory(dds/communication/security)
67-
add_subdirectory(dds/discovery)
68-
add_subdirectory(dds/xtypes)
69-
70-
if(UNIX AND NOT APPLE AND STRICT_REALTIME)
71-
add_subdirectory(realtime)
64+
65+
# Fast DDS basic is identified with a tweak version of 0
66+
if (PROJECT_VERSION_TWEAK EQUAL 0)
67+
add_subdirectory(feature)
68+
add_subdirectory(unittest)
69+
add_subdirectory(dds/communication)
70+
add_subdirectory(dds/communication/security)
71+
add_subdirectory(dds/discovery)
72+
add_subdirectory(dds/xtypes)
73+
74+
if(UNIX AND NOT APPLE AND STRICT_REALTIME)
75+
add_subdirectory(realtime)
76+
endif()
7277
endif()
7378
endif()
7479

‎test/blackbox/CMakeLists.txt‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -56,32 +56,32 @@ if(NOT BLACKBOX_HIGH_LEVEL_IGNORED_TESTS STREQUAL "")
5656
endif()
5757
message(STATUS "BLACKBOX_HIGH_LEVEL_IGNORED_TESTS set to '${BLACKBOX_HIGH_LEVEL_IGNORED_TESTS}'")
5858

59-
file(GLOB RTPS_BLACKBOXTESTS_TEST_SOURCE "common/RTPSBlackboxTests*.cpp")
59+
file(GLOB RTPS_BLACKBOXTESTS_TEST_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/common/RTPSBlackboxTests*.cpp")
6060
set(RTPS_BLACKBOXTESTS_SOURCE ${RTPS_BLACKBOXTESTS_TEST_SOURCE}
61-
types/Data1mbPubSubTypes.cxx
62-
types/Data1mbTypeObjectSupport.cxx
63-
types/Data100kbPubSubTypes.cxx
64-
types/Data100kbTypeObjectSupport.cxx
65-
types/Data64kbPubSubTypes.cxx
66-
types/Data64kbTypeObjectSupport.cxx
67-
types/FixedSizedPubSubTypes.cxx
68-
types/FixedSizedTypeObjectSupport.cxx
69-
types/HelloWorldPubSubTypes.cxx
70-
types/HelloWorldTypeObjectSupport.cxx
71-
types/KeyedData1mbPubSubTypes.cxx
72-
types/KeyedData1mbTypeObjectSupport.cxx
73-
types/KeyedHelloWorldPubSubTypes.cxx
74-
types/KeyedHelloWorldTypeObjectSupport.cxx
75-
types/core/core_typesPubSubTypes.cxx
76-
types/core/core_typesTypeObjectSupport.cxx
77-
types/StringTestPubSubTypes.cxx
78-
types/StringTestTypeObjectSupport.cxx
79-
types/UnboundedHelloWorldPubSubTypes.cxx
80-
types/UnboundedHelloWorldTypeObjectSupport.cxx
81-
82-
utils/data_generators.cpp
83-
utils/lambda_functions.cpp
84-
utils/print_functions.cpp
61+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data1mbPubSubTypes.cxx
62+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data1mbTypeObjectSupport.cxx
63+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data100kbPubSubTypes.cxx
64+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data100kbTypeObjectSupport.cxx
65+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data64kbPubSubTypes.cxx
66+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data64kbTypeObjectSupport.cxx
67+
${CMAKE_CURRENT_SOURCE_DIR}/types/FixedSizedPubSubTypes.cxx
68+
${CMAKE_CURRENT_SOURCE_DIR}/types/FixedSizedTypeObjectSupport.cxx
69+
${CMAKE_CURRENT_SOURCE_DIR}/types/HelloWorldPubSubTypes.cxx
70+
${CMAKE_CURRENT_SOURCE_DIR}/types/HelloWorldTypeObjectSupport.cxx
71+
${CMAKE_CURRENT_SOURCE_DIR}/types/KeyedData1mbPubSubTypes.cxx
72+
${CMAKE_CURRENT_SOURCE_DIR}/types/KeyedData1mbTypeObjectSupport.cxx
73+
${CMAKE_CURRENT_SOURCE_DIR}/types/KeyedHelloWorldPubSubTypes.cxx
74+
${CMAKE_CURRENT_SOURCE_DIR}/types/KeyedHelloWorldTypeObjectSupport.cxx
75+
${CMAKE_CURRENT_SOURCE_DIR}/types/core/core_typesPubSubTypes.cxx
76+
${CMAKE_CURRENT_SOURCE_DIR}/types/core/core_typesTypeObjectSupport.cxx
77+
${CMAKE_CURRENT_SOURCE_DIR}/types/StringTestPubSubTypes.cxx
78+
${CMAKE_CURRENT_SOURCE_DIR}/types/StringTestTypeObjectSupport.cxx
79+
${CMAKE_CURRENT_SOURCE_DIR}/types/UnboundedHelloWorldPubSubTypes.cxx
80+
${CMAKE_CURRENT_SOURCE_DIR}/types/UnboundedHelloWorldTypeObjectSupport.cxx
81+
82+
${CMAKE_CURRENT_SOURCE_DIR}/utils/data_generators.cpp
83+
${CMAKE_CURRENT_SOURCE_DIR}/utils/lambda_functions.cpp
84+
${CMAKE_CURRENT_SOURCE_DIR}/utils/print_functions.cpp
8585
)
8686
add_executable(BlackboxTests_RTPS ${RTPS_BLACKBOXTESTS_SOURCE})
8787
target_compile_definitions(BlackboxTests_RTPS PRIVATE
@@ -97,53 +97,53 @@ target_include_directories(BlackboxTests_RTPS PRIVATE
9797
target_link_libraries(BlackboxTests_RTPS fastdds fastcdr foonathan_memory GTest::gtest)
9898
gtest_discover_tests(BlackboxTests_RTPS
9999
PROPERTIES
100-
ENVIRONMENT "CERTS_PATH=${PROJECT_SOURCE_DIR}/test/certs"
100+
ENVIRONMENT "CERTS_PATH=${CMAKE_CURRENT_SOURCE_DIR}/../certs"
101101
TEST_PREFIX "BlackboxTests_RTPS."
102102
TEST_FILTER ${BLACKBOX_HIGH_LEVEL_IGNORED_TESTS}
103103
NO_PRETTY_VALUES
104104
)
105105

106-
file(GLOB BLACKBOXTESTS_TEST_SOURCE "common/BlackboxTests*.cpp")
106+
file(GLOB BLACKBOXTESTS_TEST_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/common/BlackboxTests*.cpp")
107107
set(BLACKBOXTESTS_SOURCE ${BLACKBOXTESTS_TEST_SOURCE}
108-
types/Data1mbPubSubTypes.cxx
109-
types/Data1mbTypeObjectSupport.cxx
110-
types/Data100kbPubSubTypes.cxx
111-
types/Data100kbTypeObjectSupport.cxx
112-
types/Data64kbPubSubTypes.cxx
113-
types/Data64kbTypeObjectSupport.cxx
114-
types/FixedSizedPubSubTypes.cxx
115-
types/FixedSizedTypeObjectSupport.cxx
116-
types/HelloWorldPubSubTypes.cxx
117-
types/HelloWorldTypeObjectSupport.cxx
118-
types/KeyedData1mbPubSubTypes.cxx
119-
types/KeyedData1mbTypeObjectSupport.cxx
120-
types/KeyedHelloWorldPubSubTypes.cxx
121-
types/KeyedHelloWorldTypeObjectSupport.cxx
122-
types/core/core_typesPubSubTypes.cxx
123-
types/core/core_typesTypeObjectSupport.cxx
124-
types/StringTestPubSubTypes.cxx
125-
types/StringTestTypeObjectSupport.cxx
126-
types/TestIncludeRegression3361TypeObjectSupport.cxx
127-
types/TestRegression3361PubSubTypes.cxx
128-
types/TestRegression3361TypeObjectSupport.cxx
129-
types/UnboundedHelloWorldPubSubTypes.cxx
130-
types/UnboundedHelloWorldTypeObjectSupport.cxx
131-
132-
utils/data_generators.cpp
133-
utils/lambda_functions.cpp
134-
utils/print_functions.cpp
135-
136-
common/DatagramInjectionTransport.cpp
137-
api/dds-pim/TCPReqRepHelloWorldRequester.cpp
138-
api/dds-pim/TCPReqRepHelloWorldReplier.cpp
139-
api/dds-pim/TCPReqRepHelloWorldService.cpp
108+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data1mbPubSubTypes.cxx
109+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data1mbTypeObjectSupport.cxx
110+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data100kbPubSubTypes.cxx
111+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data100kbTypeObjectSupport.cxx
112+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data64kbPubSubTypes.cxx
113+
${CMAKE_CURRENT_SOURCE_DIR}/types/Data64kbTypeObjectSupport.cxx
114+
${CMAKE_CURRENT_SOURCE_DIR}/types/FixedSizedPubSubTypes.cxx
115+
${CMAKE_CURRENT_SOURCE_DIR}/types/FixedSizedTypeObjectSupport.cxx
116+
${CMAKE_CURRENT_SOURCE_DIR}/types/HelloWorldPubSubTypes.cxx
117+
${CMAKE_CURRENT_SOURCE_DIR}/types/HelloWorldTypeObjectSupport.cxx
118+
${CMAKE_CURRENT_SOURCE_DIR}/types/KeyedData1mbPubSubTypes.cxx
119+
${CMAKE_CURRENT_SOURCE_DIR}/types/KeyedData1mbTypeObjectSupport.cxx
120+
${CMAKE_CURRENT_SOURCE_DIR}/types/KeyedHelloWorldPubSubTypes.cxx
121+
${CMAKE_CURRENT_SOURCE_DIR}/types/KeyedHelloWorldTypeObjectSupport.cxx
122+
${CMAKE_CURRENT_SOURCE_DIR}/types/core/core_typesPubSubTypes.cxx
123+
${CMAKE_CURRENT_SOURCE_DIR}/types/core/core_typesTypeObjectSupport.cxx
124+
${CMAKE_CURRENT_SOURCE_DIR}/types/StringTestPubSubTypes.cxx
125+
${CMAKE_CURRENT_SOURCE_DIR}/types/StringTestTypeObjectSupport.cxx
126+
${CMAKE_CURRENT_SOURCE_DIR}/types/TestIncludeRegression3361TypeObjectSupport.cxx
127+
${CMAKE_CURRENT_SOURCE_DIR}/types/TestRegression3361PubSubTypes.cxx
128+
${CMAKE_CURRENT_SOURCE_DIR}/types/TestRegression3361TypeObjectSupport.cxx
129+
${CMAKE_CURRENT_SOURCE_DIR}/types/UnboundedHelloWorldPubSubTypes.cxx
130+
${CMAKE_CURRENT_SOURCE_DIR}/types/UnboundedHelloWorldTypeObjectSupport.cxx
131+
132+
${CMAKE_CURRENT_SOURCE_DIR}/utils/data_generators.cpp
133+
${CMAKE_CURRENT_SOURCE_DIR}/utils/lambda_functions.cpp
134+
${CMAKE_CURRENT_SOURCE_DIR}/utils/print_functions.cpp
135+
136+
${CMAKE_CURRENT_SOURCE_DIR}/common/DatagramInjectionTransport.cpp
137+
${CMAKE_CURRENT_SOURCE_DIR}/api/dds-pim/TCPReqRepHelloWorldRequester.cpp
138+
${CMAKE_CURRENT_SOURCE_DIR}/api/dds-pim/TCPReqRepHelloWorldReplier.cpp
139+
${CMAKE_CURRENT_SOURCE_DIR}/api/dds-pim/TCPReqRepHelloWorldService.cpp
140140
)
141141

142-
file(GLOB DDS_BLACKBOXTESTS_TEST_SOURCE "common/DDSBlackboxTests*.cpp")
142+
file(GLOB DDS_BLACKBOXTESTS_TEST_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/common/DDSBlackboxTests*.cpp")
143143
set(DDS_BLACKBOXTESTS_SOURCE
144144
${DDS_BLACKBOXTESTS_TEST_SOURCE}
145145
${BLACKBOXTESTS_SOURCE}
146-
${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/CDRMessage.cpp
146+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/cpp/rtps/messages/CDRMessage.cpp
147147
)
148148

149149
# Prepare static discovery xml file for blackbox tests.
@@ -191,18 +191,18 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/datagrams" DESTINATION "${CMAKE_CURRENT_B
191191
if(FASTDDS_PIM_API_TESTS)
192192
set(BLACKBOXTESTS_FASTDDS_PIM_SOURCE
193193
${DDS_BLACKBOXTESTS_SOURCE}
194-
api/dds-pim/ReqRepHelloWorldRequester.cpp
195-
api/dds-pim/ReqRepHelloWorldReplier.cpp
196-
api/dds-pim/ReqRepHelloWorldService.cpp
194+
${CMAKE_CURRENT_SOURCE_DIR}/api/dds-pim/ReqRepHelloWorldRequester.cpp
195+
${CMAKE_CURRENT_SOURCE_DIR}/api/dds-pim/ReqRepHelloWorldReplier.cpp
196+
${CMAKE_CURRENT_SOURCE_DIR}/api/dds-pim/ReqRepHelloWorldService.cpp
197197
)
198198

199199
if (FASTDDS_STATISTICS)
200200

201201
set(statistics_sources
202-
${PROJECT_SOURCE_DIR}/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx
203-
${PROJECT_SOURCE_DIR}/src/cpp/statistics/types/monitorservice_typesTypeObjectSupport.cxx
204-
${PROJECT_SOURCE_DIR}/src/cpp/statistics/types/typesPubSubTypes.cxx
205-
${PROJECT_SOURCE_DIR}/src/cpp/statistics/types/typesTypeObjectSupport.cxx
202+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx
203+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/cpp/statistics/types/monitorservice_typesTypeObjectSupport.cxx
204+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/cpp/statistics/types/typesPubSubTypes.cxx
205+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/cpp/statistics/types/typesTypeObjectSupport.cxx
206206
)
207207

208208
list(APPEND BLACKBOXTESTS_FASTDDS_PIM_SOURCE ${statistics_sources})
@@ -220,7 +220,7 @@ if(FASTDDS_PIM_API_TESTS)
220220
)
221221
target_include_directories(BlackboxTests_DDS_PIM PRIVATE
222222
${Asio_INCLUDE_DIR}
223-
api/dds-pim)
223+
${CMAKE_CURRENT_SOURCE_DIR}/api/dds-pim)
224224
target_link_libraries(BlackboxTests_DDS_PIM
225225
fastdds
226226
fastcdr
@@ -230,7 +230,7 @@ if(FASTDDS_PIM_API_TESTS)
230230
)
231231
gtest_discover_tests(BlackboxTests_DDS_PIM
232232
PROPERTIES
233-
ENVIRONMENT "CERTS_PATH=${PROJECT_SOURCE_DIR}/test/certs"
233+
ENVIRONMENT "CERTS_PATH=${CMAKE_CURRENT_SOURCE_DIR}/../certs"
234234
ENVIRONMENT "TOPIC_RANDOM_NUMBER=${TOPIC_RANDOM_NUMBER}"
235235
ENVIRONMENT "W_UNICAST_PORT_RANDOM_NUMBER=${W_UNICAST_PORT_RANDOM_NUMBER}"
236236
ENVIRONMENT "R_UNICAST_PORT_RANDOM_NUMBER=${R_UNICAST_PORT_RANDOM_NUMBER}"

0 commit comments

Comments
 (0)