Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No tests will block the configuration step #1126

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions hrpsys_ros_bridge/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions hrpsys_tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

5 changes: 4 additions & 1 deletion openrtm_ros_bridge/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

7 changes: 4 additions & 3 deletions openrtm_tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

4 changes: 3 additions & 1 deletion rtmbuild/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()