Skip to content

Commit

Permalink
Merge pull request #1190 from wkentaro/comment-out-if-block-for-add-r…
Browse files Browse the repository at this point in the history
…ostest

[jsk_topic_tools] ``add_rostest`` problem should be fixed in latest catkin
  • Loading branch information
garaemon committed Oct 22, 2015
2 parents 42c4162 + 9a0b0d8 commit 29533f1
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions jsk_topic_tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,17 @@ add_library(jsk_topic_tools SHARED
add_dependencies(jsk_topic_tools ${PROJECT_NAME}_gencpp)
target_link_libraries(jsk_topic_tools ${catkin_LIBRARIES})

if (NOT $ENV{ROS_DISTRO} STREQUAL "indigo")
add_rostest(test/test_topic_buffer.test)
add_rostest(test/test_topic_buffer_close_wait.test)
add_rostest(test/test_topic_buffer_fixed_rate.test)
add_rostest(test/test_topic_buffer_fixed_rate_and_update_rate.test)
add_rostest(test/test_topic_buffer_update_rate.test)
add_rostest(test/test_lightweight_throttle.test)
add_rostest(test/test_topic_compare.test)
add_rostest(test/test_hz_measure.test)
add_rostest(test/test_block.test)
add_rostest(test/test_connection_based_nodelet.test)
add_rostest(test/test_connection_based_transport.test)
endif(NOT $ENV{ROS_DISTRO} STREQUAL "indigo")
add_rostest(test/test_topic_buffer.test)
add_rostest(test/test_topic_buffer_close_wait.test)
add_rostest(test/test_topic_buffer_fixed_rate.test)
add_rostest(test/test_topic_buffer_fixed_rate_and_update_rate.test)
add_rostest(test/test_topic_buffer_update_rate.test)
add_rostest(test/test_lightweight_throttle.test)
add_rostest(test/test_topic_compare.test)
add_rostest(test/test_hz_measure.test)
add_rostest(test/test_block.test)
add_rostest(test/test_connection_based_nodelet.test)
add_rostest(test/test_connection_based_transport.test)

install(TARGETS topic_buffer_server topic_buffer_client jsk_topic_tools
${jsk_topic_tools_nodelet_executable_names}
Expand Down

0 comments on commit 29533f1

Please sign in to comment.