Skip to content

Commit 36b76fe

Browse files
YadunundYadunund
committed
Cleanup
Signed-off-by: Yadunund <[email protected]>
1 parent 5cc51f3 commit 36b76fe

File tree

3 files changed

+14
-36
lines changed

3 files changed

+14
-36
lines changed

‎test_communication/CMakeLists.txt

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,10 @@ if(BUILD_TESTING)
8585
function(custom_test target with_message_argument)
8686
set(rmw_implementation_env_var RMW_IMPLEMENTATION=${rmw_implementation})
8787
# If the rmw_implementation is rmw_zenoh_cpp, run the tests with multicast discovery enabled.
88+
# Note: This is a temporary change that will be reverted before we branch into Kilted.
8889
if(rmw_implementation STREQUAL "rmw_zenoh_cpp")
8990
list(APPEND rmw_implementation_env_var
90-
ZENOH_ROUTER_CHECK_ATTEMPTS=-1
9191
ZENOH_CONFIG_OVERRIDE=scouting/multicast/enabled=true
92-
RUST_LOG=z=error
9392
)
9493
endif()
9594
if(with_message_argument)
@@ -103,9 +102,8 @@ if(BUILD_TESTING)
103102
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
104103
APPEND_LIBRARY_DIRS "${append_library_dirs}"
105104
ENV
106-
RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}
107-
${rmw_implementation_env_var}
108-
)
105+
RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}
106+
${rmw_implementation_env_var})
109107
set_tests_properties(
110108
"${target}${target_suffix}__${TEST_MESSAGE_TYPE}"
111109
PROPERTIES REQUIRED_FILES "$<TARGET_FILE:${target}>"
@@ -119,9 +117,8 @@ if(BUILD_TESTING)
119117
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
120118
APPEND_LIBRARY_DIRS "${append_library_dirs}"
121119
ENV
122-
RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}
123-
${rmw_implementation_env_var}
124-
)
120+
RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}
121+
${rmw_implementation_env_var})
125122
set_tests_properties(
126123
"${target}${target_suffix}"
127124
PROPERTIES REQUIRED_FILES "$<TARGET_FILE:${target}>"
@@ -143,21 +140,19 @@ if(BUILD_TESTING)
143140
function(custom_test_c target)
144141
set(rmw_implementation_env_var RMW_IMPLEMENTATION=${rmw_implementation})
145142
# If the rmw_implementation is rmw_zenoh_cpp, run the tests with multicast discovery enabled.
143+
# Note: This is a temporary change that will be reverted before we branch into Kilted.
146144
if(rmw_implementation STREQUAL "rmw_zenoh_cpp")
147145
list(APPEND rmw_implementation_env_var
148-
ZENOH_ROUTER_CHECK_ATTEMPTS=-1
149146
ZENOH_CONFIG_OVERRIDE=scouting/multicast/enabled=true
150-
RUST_LOG=z=error
151147
)
152148
endif()
153-
154149
ament_add_gtest(
155150
"${target}${target_suffix}" ${ARGN}
156151
TIMEOUT 90
157152
APPEND_LIBRARY_DIRS "${append_library_dirs}"
158153
ENV
159-
RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}
160-
${rmw_implementation_env_var})
154+
RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}
155+
${rmw_implementation_env_var})
161156
if(TARGET ${target}${target_suffix})
162157
rosidl_get_typesupport_target(c_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_c")
163158
target_link_libraries(${target}${target_suffix}
@@ -500,18 +495,15 @@ if(BUILD_TESTING)
500495
endif()
501496

502497
macro(serialize)
503-
message(STATUS "Creating tests for '${rmw_implementation}'")
504498
set(rmw_implementation_env_var RMW_IMPLEMENTATION=${rmw_implementation})
505499
# If the rmw_implementation is rmw_zenoh_cpp, run the tests with multicast discovery enabled.
500+
# Note: This is a temporary change that will be reverted before we branch into Kilted.
506501
if(rmw_implementation STREQUAL "rmw_zenoh_cpp")
507502
list(APPEND rmw_implementation_env_var
508-
ZENOH_ROUTER_CHECK_ATTEMPTS=-1
509503
ZENOH_CONFIG_OVERRIDE=scouting/multicast/enabled=true
510-
RUST_LOG=z=error
511504
)
512505
endif()
513506
set(serialize_target_name "test_serialize${target}${target_suffix}")
514-
515507
ament_add_gtest(
516508
${serialize_target_name} test/test_message_serialization.cpp
517509
TIMEOUT 30
@@ -536,24 +528,21 @@ if(BUILD_TESTING)
536528
endmacro()
537529

538530
macro(pub_sub_serialized)
539-
message(STATUS "Creating tests for '${rmw_implementation}'")
540531
set(rmw_implementation_env_var RMW_IMPLEMENTATION=${rmw_implementation})
541532
# If the rmw_implementation is rmw_zenoh_cpp, run the tests with multicast discovery enabled.
533+
# Note: This is a temporary change that will be reverted before we branch into Kilted.
542534
if(rmw_implementation STREQUAL "rmw_zenoh_cpp")
543535
list(APPEND rmw_implementation_env_var
544-
ZENOH_ROUTER_CHECK_ATTEMPTS=-1
545536
ZENOH_CONFIG_OVERRIDE=scouting/multicast/enabled=true
546-
RUST_LOG=z=error
547537
)
548538
endif()
549539
set(target_name "test_publisher_subscriber_serialized${target}${target_suffix}")
550-
551540
ament_add_gtest(
552541
${target_name} test/test_publisher_subscriber_serialized.cpp
553542
TIMEOUT 30
554543
ENV
555-
RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}
556-
${rmw_implementation_env_var}
544+
RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}
545+
${rmw_implementation_env_var}
557546
)
558547
if(TARGET ${target_name})
559548
add_dependencies(${target_name} ${PROJECT_NAME})

‎test_quality_of_service/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,14 @@ if(BUILD_TESTING)
5151
)
5252

5353
function(add_custom_gtest target)
54-
message(STATUS "Creating tests for '${rmw_implementation}'")
5554
set(rmw_implementation_env_var RMW_IMPLEMENTATION=${rmw_implementation})
56-
5755
# If the rmw_implementation is rmw_zenoh_cpp, run the tests with multicast discovery enabled.
56+
# Note: This is a temporary change that will be reverted before we branch into Kilted.
5857
if(rmw_implementation STREQUAL "rmw_zenoh_cpp")
5958
list(APPEND rmw_implementation_env_var
60-
ZENOH_ROUTER_CHECK_ATTEMPTS=-1
6159
ZENOH_CONFIG_OVERRIDE=scouting/multicast/enabled=true
62-
RUST_LOG=z=error
6360
)
6461
endif()
65-
6662
ament_add_gtest(${target}${target_suffix} ${ARGN}
6763
ENV
6864
RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}

‎test_rclcpp/CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,10 @@ if(BUILD_TESTING)
166166
set(TEST_RMW_IMPLEMENTATION2 "${_ARG_RMW2}")
167167

168168
set(rmw_implementation_env_var "")
169-
170169
if("${TEST_RMW_IMPLEMENTATION1}" STREQUAL "rmw_zenoh_cpp" OR
171170
"${TEST_RMW_IMPLEMENTATION2}" STREQUAL "rmw_zenoh_cpp")
172-
173171
list(APPEND rmw_implementation_env_var
174-
ZENOH_ROUTER_CHECK_ATTEMPTS=-1
175172
ZENOH_CONFIG_OVERRIDE=scouting/multicast/enabled=true
176-
RUST_LOG=z=error
177173
)
178174
endif()
179175

@@ -331,15 +327,12 @@ if(BUILD_TESTING)
331327
endmacro()
332328

333329
function(test_target)
334-
message(STATUS "Creating tests for '${rmw_implementation}'")
335330
set(rmw_implementation_env_var RMW_IMPLEMENTATION=${rmw_implementation})
336-
337331
# If the rmw_implementation is rmw_zenoh_cpp, run the tests with multicast discovery enabled.
332+
# Note: This is a temporary change that will be reverted before we branch into Kilted.
338333
if(rmw_implementation STREQUAL "rmw_zenoh_cpp")
339334
list(APPEND rmw_implementation_env_var
340-
ZENOH_ROUTER_CHECK_ATTEMPTS=-1
341335
ZENOH_CONFIG_OVERRIDE=scouting/multicast/enabled=true
342-
RUST_LOG=z=error
343336
)
344337
endif()
345338

0 commit comments

Comments
 (0)