From b18cfda53bf7511ec489d2e21e22d41ecf1fdcbd Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Wed, 10 Apr 2024 13:36:32 -0400 Subject: [PATCH] Actually skip the gtest_subscription test on Connext. (#544) After a relatively recent refactoring, the old way we were marking to skip the test no longer worked (because in the new system, there are no targets that are actually named gtest_subscription__rmw_connextdds). Use another method to skip the test. Signed-off-by: Chris Lalancette --- test_rclcpp/CMakeLists.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/test_rclcpp/CMakeLists.txt b/test_rclcpp/CMakeLists.txt index 0b051310..882db42e 100644 --- a/test_rclcpp/CMakeLists.txt +++ b/test_rclcpp/CMakeLists.txt @@ -366,6 +366,9 @@ if(BUILD_TESTING) ${rmw_implementation_env_var} ) + # TODO(clalancette): Under load, the gtest_subscription__rmw_connextdds test fails deep in the + # bowels of Connext; see https://github.com/ros2/rmw_connextdds/issues/136 for details. Skip it + # for now so we can keep CI green. ament_add_gtest_test(gtest_subscription TEST_NAME gtest_subscription${target_suffix} APPEND_LIBRARY_DIRS "${append_library_dirs}" @@ -373,6 +376,9 @@ if(BUILD_TESTING) ENV ${rmw_implementation_env_var} ) + if("${rmw_implementation}" STREQUAL "rmw_connextdds") + ament_add_test_label(gtest_subscription${target_suffix} xfail) + endif() ament_add_gtest_test(gtest_multiple_service_calls TEST_NAME gtest_multiple_service_calls${target_suffix} @@ -517,13 +523,6 @@ if(BUILD_TESTING) get_available_rmw_implementations(rmw_implementations) call_for_each_rmw_implementation(test_target) - - # TODO(clalancette): Under load, the gtest_subscription__rmw_connextdds test fails deep in the - # bowels of Connext; see https://github.com/ros2/rmw_connextdds/issues/136 for details. Mark it - # as xfail for now so we can keep CI green. - if(TARGET gtest_subscription__rmw_connextdds) - ament_add_test_label(gtest_subscription__rmw_connextdds xfail) - endif() endif() # BUILD_TESTING # TODO should not install anything