improve robustness of test_events

Signed-off-by: Miaofei <miaofei@amazon.com>
ros2 · May 3, 2019 · c05bd50 · c05bd50
1 parent 461ad9c
commit c05bd50
Show file tree

Hide file tree

Showing 2 changed files with 132 additions and 129 deletions.
diff --git a/rcl/test/CMakeLists.txt b/rcl/test/CMakeLists.txt
@@ -199,19 +199,12 @@ function(test_target_function)
     AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
   )
 
-  # TODO(mm318): test_events seem to be failing on the macOS build farm.
-  #   we will try to re-enable this test asap.
-  set(AMENT_GTEST_ARGS "")
-  if(APPLE)
-    set(AMENT_GTEST_ARGS "SKIP_TEST")
-  endif()
   rcl_add_custom_gtest(test_events${target_suffix}
     SRCS rcl/test_events.cpp
     ENV ${rmw_implementation_env_var}
     APPEND_LIBRARY_DIRS ${extra_lib_dirs}
     LIBRARIES ${PROJECT_NAME}
     AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
-    ${AMENT_GTEST_ARGS}
   )
 
   rcl_add_custom_gtest(test_wait${target_suffix}