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

Feature branch fixes addressing issues in #1839 #1856

Merged
merged 1 commit into from
Jan 23, 2020
Merged

Feature branch fixes addressing issues in #1839 #1856

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
0 ...llision_detection/test_collision_common.h → ...ion_detection/test_collision_common_pr2.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion moveit_core/collision_detection_bullet/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if(CATKIN_ENABLE_TESTING)
find_package(moveit_resources REQUIRED)
include_directories(${moveit_resources_INCLUDE_DIRS})

catkin_add_gtest(test_bullet_collision_detection test/test_bullet_collision_detection.cpp)
catkin_add_gtest(test_bullet_collision_detection test/test_bullet_collision_detection_pr2.cpp)
target_link_libraries(test_bullet_collision_detection moveit_test_utils ${MOVEIT_LIB_NAME} ${Boost_LIBRARIES})

catkin_add_gtest(test_bullet_collision_detection_panda test/test_bullet_collision_detection_panda.cpp)
Expand Down
2 changes: 1 addition & 1 deletion .../test/test_bullet_collision_detection.cpp → ...t/test_bullet_collision_detection_pr2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/* Author: Jens Petit */

#include <moveit/collision_detection_bullet/collision_detector_allocator_bullet.h>
#include <moveit/collision_detection/test_collision_common.h>
#include <moveit/collision_detection/test_collision_common_pr2.h>

INSTANTIATE_TYPED_TEST_CASE_P(BulletCollisionCheck, CollisionDetectorTest,
collision_detection::CollisionDetectorAllocatorBullet);
Expand Down
2 changes: 1 addition & 1 deletion moveit_core/collision_detection_fcl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if(CATKIN_ENABLE_TESTING)
find_package(moveit_resources REQUIRED)
include_directories(${moveit_resources_INCLUDE_DIRS})

catkin_add_gtest(test_fcl_collision_detection test/test_fcl_collision_detection.cpp)
catkin_add_gtest(test_fcl_collision_detection test/test_fcl_collision_detection_pr2.cpp)
target_link_libraries(test_fcl_collision_detection moveit_test_utils ${MOVEIT_LIB_NAME} ${Boost_LIBRARIES})

catkin_add_gtest(test_fcl_collision_detection_panda test/test_fcl_collision_detection_panda.cpp)
Expand Down
2 changes: 1 addition & 1 deletion ...it_core/collision_detection_fcl/include/moveit/collision_detection_fcl/collision_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*********************************************************************/

/* Author: Ioan Sucan, Jens Petit */
/* Author: Ioan Sucan */

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion moveit_core/collision_detection_fcl/src/collision_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*********************************************************************/

/* Author: Ioan Sucan, Jia Pan, Jens Petit */
/* Author: Ioan Sucan, Jia Pan */

#include <moveit/collision_detection_fcl/collision_common.h>
#include <geometric_shapes/shapes.h>
Expand Down
2 changes: 1 addition & 1 deletion ...fcl/test/test_fcl_collision_detection.cpp → ...test/test_fcl_collision_detection_pr2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/* Author: Jens Petit */

#include <moveit/collision_detection_fcl/collision_detector_allocator_fcl.h>
#include <moveit/collision_detection/test_collision_common.h>
#include <moveit/collision_detection/test_collision_common_pr2.h>

INSTANTIATE_TYPED_TEST_CASE_P(FCLCollisionCheck, CollisionDetectorTest,
collision_detection::CollisionDetectorAllocatorFCL);
Expand Down