Fix GoogleTestVerification.UninstantiatedTypeParameterizedTestSuite

KanRobotics · Jan 8, 2023 · 73b0a52 · 73b0a52
1 parent ef3d364
commit 73b0a52
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/moveit_core/collision_detection_bullet/test/test_bullet_collision_detection_panda.cpp b/moveit_core/collision_detection_bullet/test/test_bullet_collision_detection_panda.cpp
@@ -40,6 +40,12 @@
 INSTANTIATE_TYPED_TEST_SUITE_P(BulletCollisionCheckPanda, CollisionDetectorPandaTest,
                                collision_detection::CollisionDetectorAllocatorBullet);
 
+// These are not instantiated, because be don't yet have distance checking for Bullet
+#ifdef GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DistanceCheckPandaTest);
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DistanceFullPandaTest);
+#endif
+
 int main(int argc, char* argv[])
 {
   testing::InitGoogleTest(&argc, argv);

diff --git a/moveit_core/collision_detection_fcl/test/test_fcl_collision_detection_panda.cpp b/moveit_core/collision_detection_fcl/test/test_fcl_collision_detection_panda.cpp
@@ -47,9 +47,15 @@ INSTANTIATE_TYPED_TEST_SUITE_P(FCLCollisionCheckPanda, CollisionDetectorPandaTes
 #if MOVEIT_FCL_VERSION >= FCL_VERSION_CHECK(0, 6, 0)
 INSTANTIATE_TYPED_TEST_SUITE_P(FCLDistanceCheckPanda, DistanceFullPandaTest,
                                collision_detection::CollisionDetectorAllocatorFCL);
+#ifdef GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DistanceCheckPandaTest);
+#endif
 #else
 INSTANTIATE_TYPED_TEST_SUITE_P(FCLDistanceCheckPanda, DistanceCheckPandaTest,
                                collision_detection::CollisionDetectorAllocatorFCL);
+#ifdef GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DistanceFullPandaTest);
+#endif
 #endif
 
 int main(int argc, char* argv[])