From 4e637a53e547515fb7533a02bc5278b6ba38e7ad Mon Sep 17 00:00:00 2001 From: Yuki Furuta Date: Sun, 12 Nov 2017 17:39:51 +0900 Subject: [PATCH 1/2] image_view2: support kinetic --- jsk_ros_patch/image_view2/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jsk_ros_patch/image_view2/CMakeLists.txt b/jsk_ros_patch/image_view2/CMakeLists.txt index c5051e46d..8be961233 100644 --- a/jsk_ros_patch/image_view2/CMakeLists.txt +++ b/jsk_ros_patch/image_view2/CMakeLists.txt @@ -9,6 +9,10 @@ if(CCACHE_FOUND) set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) endif(CCACHE_FOUND) +if(NOT $ENV{ROS_DISTRO} STRLESS kinetic) + add_compile_options(-std=c++11) +endif() + find_package(catkin REQUIRED COMPONENTS roscpp dynamic_reconfigure cv_bridge std_msgs sensor_msgs geometry_msgs image_transport tf image_geometry message_filters message_generation std_srvs pcl_ros) generate_dynamic_reconfigure_options( From 4c05ce9f1efee6e5f9b001df433b4c0449e6ba4a Mon Sep 17 00:00:00 2001 From: Yuki Furuta Date: Mon, 13 Nov 2017 12:10:11 +0900 Subject: [PATCH 2/2] jsk_tools: fix sanity lib test --- jsk_tools/test/python/test_sanity_lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsk_tools/test/python/test_sanity_lib.py b/jsk_tools/test/python/test_sanity_lib.py index 7849833d6..5ec5c2365 100755 --- a/jsk_tools/test/python/test_sanity_lib.py +++ b/jsk_tools/test/python/test_sanity_lib.py @@ -25,7 +25,7 @@ def test_TopicPublishedChecker_1(self): output = f.getvalue() sys.stdout = sys.__stdout__ self.assertIn('/input', output) - self.assertIn('data: input', output) + self.assertTrue('data: input' in output or 'data: "input"' in output) def test_TopicPublishedChecker_2(self): checker = sanity_lib.TopicPublishedChecker('/input', data_class=std_msgs.msg.String)