From 242cd114616123a2f43e9b714ecf33914772d558 Mon Sep 17 00:00:00 2001 From: kazuki0824 Date: Sat, 6 Aug 2022 19:32:03 +0900 Subject: [PATCH] Add CATKIN_ENABLE_TESTING --- hironx_moveit_config/CMakeLists.txt | 4 +++- hironx_ros_bridge/CMakeLists.txt | 14 +++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hironx_moveit_config/CMakeLists.txt b/hironx_moveit_config/CMakeLists.txt index f8513ffc..fa93d1a4 100644 --- a/hironx_moveit_config/CMakeLists.txt +++ b/hironx_moveit_config/CMakeLists.txt @@ -20,4 +20,6 @@ install(DIRECTORY launch config models test www USE_SOURCE_PERMISSIONS) -add_rostest(test/test-hironx-moveit.test) +if (CATKIN_ENABLE_TESTING) + add_rostest(test/test-hironx-moveit.test) +endif() diff --git a/hironx_ros_bridge/CMakeLists.txt b/hironx_ros_bridge/CMakeLists.txt index c08dccbf..b10591ce 100644 --- a/hironx_ros_bridge/CMakeLists.txt +++ b/hironx_ros_bridge/CMakeLists.txt @@ -100,14 +100,14 @@ install(TARGETS acceptancetest_hironx_cpp ros_client_cpp LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}) -add_rostest(test/test-hironx.test) -add_rostest(test/test-hironx-ros-bridge.test) -add_rostest(test/test-hironx-ros-bridge-send.test) -add_rostest(test/test-hironx-ros-bridge-pose.test) -add_rostest(test/test-hironx-ros-bridge-controller.test) -add_rostest(test/test-hironx-rtc-on-off.test) - if (CATKIN_ENABLE_TESTING) + add_rostest(test/test-hironx.test) + add_rostest(test/test-hironx-ros-bridge.test) + add_rostest(test/test-hironx-ros-bridge-send.test) + add_rostest(test/test-hironx-ros-bridge-pose.test) + add_rostest(test/test-hironx-ros-bridge-controller.test) + add_rostest(test/test-hironx-rtc-on-off.test) + catkin_add_nosetests(test/test_no_ros.py) endif()