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.

Sign up for GitHub

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

Jump to bottom

fix roslaunch checks for all cob_supported_robots #107

Merged
merged 1 commit into from
Aug 21, 2019
Merged

fix roslaunch checks for all cob_supported_robots #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion cob_mapping_slam/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,17 @@ catkin_package()
#############

install(DIRECTORY launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

#############
## Testing ##
#############
if(CATKIN_ENABLE_TESTING)
find_package(cob_supported_robots REQUIRED)
find_package(roslaunch REQUIRED)
foreach(robot ${cob_supported_robots_ROBOTLIST})
message("testing for robot: ${robot}")
roslaunch_add_file_check(launch ROBOT=${robot}) # testing environment variables
roslaunch_add_file_check(launch robot:=${robot}) # testing launch file arguments
endforeach()
endif()
4 changes: 3 additions & 1 deletion cob_mapping_slam/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<exec_depend>cob_navigation_global</exec_depend>
<exec_depend>gmapping</exec_depend>

</package>
<test_depend>cob_supported_robots</test_depend>
<test_depend>roslaunch</test_depend>

</package>

0 cob_navigation_config/robots/cob4-2 → cob_navigation_config/robots/cob4-10
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions cob_navigation_config/robots/cob4-11
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cob4
1 change: 1 addition & 0 deletions cob_navigation_config/robots/cob4-18
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cob4
1 change: 1 addition & 0 deletions cob_navigation_config/robots/cob4-20
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cob4
1 change: 1 addition & 0 deletions cob_navigation_config/robots/cob4-22
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cob4
1 change: 1 addition & 0 deletions cob_navigation_config/robots/cob4-25
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cob4
1 change: 1 addition & 0 deletions cob_navigation_config/robots/cob4-3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cob4
1 change: 1 addition & 0 deletions cob_navigation_config/robots/cob4-4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cob4
1 change: 1 addition & 0 deletions cob_navigation_config/robots/cob4-6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cob4
1 change: 1 addition & 0 deletions cob_navigation_config/robots/cob4-8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cob4
1 change: 1 addition & 0 deletions cob_navigation_config/robots/cob4-9
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cob4
20 changes: 6 additions & 14 deletions cob_navigation_global/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,15 @@ install(DIRECTORY launch config
#############
## Testing ##
#############
SET(robotlist
cob4-2
cob4-5
cob4-7
raw3-1
raw3-3
raw3-5
)

if(CATKIN_ENABLE_TESTING)
find_package(cob_default_env_config REQUIRED)
find_package(cob_supported_robots REQUIRED)
find_package(roslaunch REQUIRED)
foreach(robot ${robotlist})
foreach(robot ${cob_supported_robots_ROBOTLIST})
foreach(env ${cob_default_env_config_ENVLIST})
message("testing for robot: ${robot} in env: ${env}")
roslaunch_add_file_check(launch ROBOT=${robot} ROBOT_ENV=${env}) # testing environment variables
roslaunch_add_file_check(launch robot:=${robot} robot_env:=${env}) # testing launch file arguments
endforeach(env)
endforeach(robot)
roslaunch_add_file_check(launch ROBOT=${robot} ROBOT_ENV=${env}) # testing environment variables
roslaunch_add_file_check(launch robot:=${robot} robot_env:=${env}) # testing launch file arguments
endforeach()
endforeach()
endif()
18 changes: 5 additions & 13 deletions cob_navigation_local/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,19 @@ catkin_package()
## Install ##
#############

install(DIRECTORY launch config
install(DIRECTORY config launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)

#############
## Testing ##
#############
SET(robotlist
cob4-2
cob4-5
cob4-7
raw3-1
raw3-3
raw3-5
)

if(CATKIN_ENABLE_TESTING)
find_package(cob_supported_robots REQUIRED)
find_package(roslaunch REQUIRED)
foreach(robot ${robotlist})
foreach(robot ${cob_supported_robots_ROBOTLIST})
message("testing for robot: ${robot}")
roslaunch_add_file_check(launch ROBOT=${robot}) # testing environment variables
roslaunch_add_file_check(launch robot:=${robot}) # testing launch file arguments
roslaunch_add_file_check(launch ROBOT=${robot}) # testing environment variables
roslaunch_add_file_check(launch robot:=${robot}) # testing launch file arguments
endforeach()
endif()
18 changes: 5 additions & 13 deletions cob_navigation_slam/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,19 @@ catkin_package()
## Install ##
#############

install(DIRECTORY launch config
install(DIRECTORY config launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)

#############
## Testing ##
#############
SET(robotlist
cob4-2
cob4-5
cob4-7
raw3-1
raw3-3
raw3-5
)

if(CATKIN_ENABLE_TESTING)
find_package(cob_supported_robots REQUIRED)
find_package(roslaunch REQUIRED)
foreach(robot ${robotlist})
foreach(robot ${cob_supported_robots_ROBOTLIST})
message("testing for robot: ${robot}")
roslaunch_add_file_check(launch ROBOT=${robot}) # testing environment variables
roslaunch_add_file_check(launch robot:=${robot}) # testing launch file arguments
roslaunch_add_file_check(launch ROBOT=${robot}) # testing environment variables
roslaunch_add_file_check(launch robot:=${robot}) # testing launch file arguments
endforeach()
endif()