diff --git a/hrpsys_ros_bridge/CMakeLists.txt b/hrpsys_ros_bridge/CMakeLists.txt index 15594390e..b1912c810 100644 --- a/hrpsys_ros_bridge/CMakeLists.txt +++ b/hrpsys_ros_bridge/CMakeLists.txt @@ -248,14 +248,16 @@ file(WRITE models/SampleRobot_controller_config.yaml - LLEG_ANKLE_R ") -# stop other tests when euslisp test is commanded, because euslisp test takes much time -if (NOT ("true" STREQUAL "$ENV{IS_EUSLISP_TRAVIS_TEST}")) - add_rostest(test/test-samplerobot.test) - if (NOT $ENV{ROS_DISTRO} STREQUAL "hydro") - add_rostest(test/test-samplerobot-hcf.launch) # hydro-deb does not work with --unstable-rtc +if(CATKIN_ENABLE_TESTING) + # stop other tests when euslisp test is commanded, because euslisp test takes much time + if (NOT ("true" STREQUAL "$ENV{IS_EUSLISP_TRAVIS_TEST}")) + add_rostest(test/test-samplerobot.test) + if (NOT $ENV{ROS_DISTRO} STREQUAL "hydro") + add_rostest(test/test-samplerobot-hcf.launch) # hydro-deb does not work with --unstable-rtc + endif() + add_rostest(test/test-pa10.test) + add_rostest(test/test-import-python.test) endif() - add_rostest(test/test-pa10.test) - add_rostest(test/test-import-python.test) endif() # call catkin depends diff --git a/hrpsys_tools/CMakeLists.txt b/hrpsys_tools/CMakeLists.txt index 79a094d09..efea831ba 100644 --- a/hrpsys_tools/CMakeLists.txt +++ b/hrpsys_tools/CMakeLists.txt @@ -135,5 +135,9 @@ install(DIRECTORY scripts DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SO ## Add folders to be run by python nosetests # catkin_add_nosetests(test) install(DIRECTORY test samples DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) -add_rostest(test/test-hrpsys-config.test) -add_rostest(test/test-pa10.test) + +if(CATKIN_ENABLE_TESTING) + add_rostest(test/test-hrpsys-config.test) + add_rostest(test/test-pa10.test) +endif() + diff --git a/openrtm_ros_bridge/CMakeLists.txt b/openrtm_ros_bridge/CMakeLists.txt index e406de19d..8a0ebff4e 100644 --- a/openrtm_ros_bridge/CMakeLists.txt +++ b/openrtm_ros_bridge/CMakeLists.txt @@ -70,5 +70,8 @@ install(DIRECTORY test samples DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} U ## ## tests ## -add_rostest(test/test_myservice_rosbridge.test) + +if(CATKIN_ENABLE_TESTING) + add_rostest(test/test_myservice_rosbridge.test) +endif() diff --git a/openrtm_tools/CMakeLists.txt b/openrtm_tools/CMakeLists.txt index 526baa7fa..ea4864a05 100644 --- a/openrtm_tools/CMakeLists.txt +++ b/openrtm_tools/CMakeLists.txt @@ -139,7 +139,8 @@ install(PROGRAMS scripts/rtmlaunch scripts/rtmtest DESTINATION ${CATKIN_GLOBAL_B ## Add folders to be run by python nosetests # catkin_add_nosetests(test) - -add_rostest(test/test-openrtm-tools.test) -add_rostest(test/test-rtmlaunch.test) +if(CATKIN_ENABLE_TESTING) + add_rostest(test/test-openrtm-tools.test) + add_rostest(test/test-rtmlaunch.test) +endif() diff --git a/rtmbuild/CMakeLists.txt b/rtmbuild/CMakeLists.txt index 89fa2c9b8..a9f050a15 100644 --- a/rtmbuild/CMakeLists.txt +++ b/rtmbuild/CMakeLists.txt @@ -20,5 +20,7 @@ install(DIRECTORY cmake scripts test USE_SOURCE_PERMISSIONS ) -add_rostest(test/test-compile-idl.test) +if(CATKIN_ENABLE_TESTING) + add_rostest(test/test-compile-idl.test) +endif()