Drop patches to disable tests
authorJochen Sprickerhof <git@jochen.sprickerhof.de>
Sun, 1 Jan 2023 10:58:24 +0000 (11:58 +0100)
committerJochen Sprickerhof <git@jochen.sprickerhof.de>
Sun, 1 Jan 2023 10:58:24 +0000 (11:58 +0100)
debian/patches/0004-Disable-failing-tests.patch [deleted file]
debian/patches/0005-Adopt-unit-test-for-i386.patch [deleted file]
debian/patches/0007-Adopt-unit-tests-for-arm64-and-ppc64el.patch [deleted file]
debian/patches/series

diff --git a/debian/patches/0004-Disable-failing-tests.patch b/debian/patches/0004-Disable-failing-tests.patch
deleted file mode 100644 (file)
index e7d2031..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Wed, 29 Sep 2021 22:19:25 +0200
-Subject: Disable failing tests
-
----
- test/features/CMakeLists.txt             | 4 ----
- test/features/test_normal_estimation.cpp | 2 +-
- test/octree/test_octree.cpp              | 4 ++--
- 3 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/test/features/CMakeLists.txt b/test/features/CMakeLists.txt
-index 4dbab6e..6dc21fc 100644
---- a/test/features/CMakeLists.txt
-+++ b/test/features/CMakeLists.txt
-@@ -92,10 +92,6 @@ if(BUILD_io)
-   PCL_ADD_TEST(features_narf test_narf
-                FILES test_narf.cpp
-                LINK_WITH pcl_gtest pcl_features FLANN::FLANN)
--  PCL_ADD_TEST(a_ii_normals_test test_ii_normals
--               FILES test_ii_normals.cpp
--               LINK_WITH pcl_gtest pcl_io pcl_features
--               ARGUMENTS "${PCL_SOURCE_DIR}/test/table_scene_mug_stereo_textured.pcd")
-   PCL_ADD_TEST(feature_moment_of_inertia_estimation test_moment_of_inertia_estimation
-                FILES test_moment_of_inertia_estimation.cpp
-                LINK_WITH pcl_gtest pcl_io pcl_features
-diff --git a/test/features/test_normal_estimation.cpp b/test/features/test_normal_estimation.cpp
-index c93f910..b297609 100644
---- a/test/features/test_normal_estimation.cpp
-+++ b/test/features/test_normal_estimation.cpp
-@@ -409,7 +409,7 @@ TEST (PCL, NormalEstimationOpenMP)
- // IntegralImageNormalEstimation could crash or produce
- // incorrect normals.
- // This test reproduces the issue.
--TEST (PCL, IntegralImageNormalEstimationIndexingIssue)
-+TEST (PCL, DISABLED_IntegralImageNormalEstimationIndexingIssue)
- {
-   PointCloud<PointXYZ>::Ptr cloudptr(new PointCloud<PointXYZ>());
-diff --git a/test/octree/test_octree.cpp b/test/octree/test_octree.cpp
-index e150248..4130a90 100644
---- a/test/octree/test_octree.cpp
-+++ b/test/octree/test_octree.cpp
-@@ -1121,7 +1121,7 @@ public:
- };
--TEST (PCL, Octree_Pointcloud_Nearest_K_Neighbour_Search)
-+TEST (PCL, DISABLED_Octree_Pointcloud_Nearest_K_Neighbour_Search)
- {
-   constexpr unsigned int test_runs = 10;
-@@ -1224,7 +1224,7 @@ TEST (PCL, Octree_Pointcloud_Nearest_K_Neighbour_Search)
-   }
- }
--TEST (PCL, Octree_Pointcloud_Box_Search)
-+TEST (PCL, DISABLED_Octree_Pointcloud_Box_Search)
- {
-   constexpr unsigned int test_runs = 30;
diff --git a/debian/patches/0005-Adopt-unit-test-for-i386.patch b/debian/patches/0005-Adopt-unit-test-for-i386.patch
deleted file mode 100644 (file)
index 50950d4..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Fri, 8 Oct 2021 19:09:12 +0200
-Subject: Adopt unit test for i386
-
----
- test/features/test_curvatures_estimation.cpp                 | 12 ++++++------
- test/features/test_gasd_estimation.cpp                       |  2 +-
- test/filters/test_convolution.cpp                            |  2 ++
- test/io/test_tim_grabber.cpp                                 |  2 +-
- test/octree/test_octree.cpp                                  |  2 +-
- test/sample_consensus/test_sample_consensus_plane_models.cpp |  6 +++---
- 6 files changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/test/features/test_curvatures_estimation.cpp b/test/features/test_curvatures_estimation.cpp
-index 11e858f..51e5ba3 100644
---- a/test/features/test_curvatures_estimation.cpp
-+++ b/test/features/test_curvatures_estimation.cpp
-@@ -90,14 +90,14 @@ TEST (PCL, PrincipalCurvaturesEstimation)
-   int indices_size = static_cast<int> (indices.size ());
-   pc.computePointPrincipalCurvatures (*normals, indices_size - 3, indices, pcx, pcy, pcz, pc1, pc2);
--  EXPECT_NEAR (pcx, 0.86725, 1e-4);
--  EXPECT_NEAR (pcy, -0.37599, 1e-4);
-+  EXPECT_NEAR (pcx, 0.86725, 1e-3);
-+  EXPECT_NEAR (pcy, -0.37599, 1e-3);
-   EXPECT_NEAR (pcz, 0.32635, 1e-4);
-   EXPECT_NEAR (pc1, 0.25900053977966309, 1e-4);
-   EXPECT_NEAR (pc2, 0.17906945943832397, 1e-4);
-   pc.computePointPrincipalCurvatures (*normals, indices_size - 1, indices, pcx, pcy, pcz, pc1, pc2);
--  EXPECT_NEAR (pcx, 0.86725, 1e-4);
-+  EXPECT_NEAR (pcx, 0.86725, 1e-3);
-   EXPECT_NEAR (pcy, -0.375851, 1e-3);
-   EXPECT_NEAR (pcz, 0.32636, 1e-4);
-   EXPECT_NEAR (pc1, 0.2590005099773407,  1e-4);
-@@ -129,13 +129,13 @@ TEST (PCL, PrincipalCurvaturesEstimation)
-   EXPECT_NEAR ((*pcs)[2].pc1, 0.27207502722740173, 1e-4);
-   EXPECT_NEAR ((*pcs)[2].pc2, 0.1946497857570648,  1e-4);
--  EXPECT_NEAR ((*pcs)[indices.size () - 3].principal_curvature[0], 0.86725, 1e-4);
--  EXPECT_NEAR ((*pcs)[indices.size () - 3].principal_curvature[1], -0.37599, 1e-4);
-+  EXPECT_NEAR ((*pcs)[indices.size () - 3].principal_curvature[0], 0.86725, 1e-3);
-+  EXPECT_NEAR ((*pcs)[indices.size () - 3].principal_curvature[1], -0.37599, 1e-3);
-   EXPECT_NEAR ((*pcs)[indices.size () - 3].principal_curvature[2], 0.32636, 1e-4);
-   EXPECT_NEAR ((*pcs)[indices.size () - 3].pc1, 0.2590007483959198,  1e-4);
-   EXPECT_NEAR ((*pcs)[indices.size () - 3].pc2, 0.17906941473484039, 1e-4);
--  EXPECT_NEAR ((*pcs)[indices.size () - 1].principal_curvature[0], 0.86725, 1e-4);
-+  EXPECT_NEAR ((*pcs)[indices.size () - 1].principal_curvature[0], 0.86725, 1e-3);
-   EXPECT_NEAR ((*pcs)[indices.size () - 1].principal_curvature[1], -0.375851, 1e-3);
-   EXPECT_NEAR ((*pcs)[indices.size () - 1].principal_curvature[2], 0.32636, 1e-4);
-   EXPECT_NEAR ((*pcs)[indices.size () - 1].pc1, 0.25900065898895264, 1e-4);
-diff --git a/test/features/test_gasd_estimation.cpp b/test/features/test_gasd_estimation.cpp
-index 0b000cb..c8f8598 100644
---- a/test/features/test_gasd_estimation.cpp
-+++ b/test/features/test_gasd_estimation.cpp
-@@ -160,7 +160,7 @@ TEST(PCL, GASDShapeEstimationTrilinearInterp)
-   EXPECT_EQ (descriptor.size (), 1);
-   for (std::size_t i = 0; i < std::size_t (descriptor[0].descriptorSize ()); ++i)
-   {
--    EXPECT_NEAR (descriptor[0].histogram[i], ref_values[i], 1e-5);
-+    EXPECT_NEAR (descriptor[0].histogram[i], ref_values[i], 1e-4);
-   }
- }
-diff --git a/test/filters/test_convolution.cpp b/test/filters/test_convolution.cpp
-index 2bae7ae..3e5c0a0 100644
---- a/test/filters/test_convolution.cpp
-+++ b/test/filters/test_convolution.cpp
-@@ -393,6 +393,7 @@ TEST (Convolution, convolveRowsXYZRGB)
-     RGB(0, 0, 0),        RGB(0, 0, 0),
-   };
-+#ifndef __i386__
-   // check result
-   for (std::uint32_t i = 0; i < output->width ; ++i)
-   {
-@@ -403,6 +404,7 @@ TEST (Convolution, convolveRowsXYZRGB)
-     EXPECT_EQ ((*output) (i, 47).g, output_results[i * 2 + 1].g);
-     EXPECT_EQ ((*output) (i, 47).b, output_results[i * 2 + 1].b);
-   }
-+#endif
- }
- int
-diff --git a/test/io/test_tim_grabber.cpp b/test/io/test_tim_grabber.cpp
-index f245e0c..046900f 100644
---- a/test/io/test_tim_grabber.cpp
-+++ b/test/io/test_tim_grabber.cpp
-@@ -89,7 +89,7 @@ TEST_F (TimGrabberTest, Test1)
-     for (std::size_t j = 0; j < correct_clouds_.at(i).size (); j++) {
-       PointT const& correct_point = correct_clouds_.at(i).at(j);
-       PointT const& answer_point = answer_cloud->at(j);
--      EXPECT_NEAR (correct_point.x, answer_point.x, 1.0e-3);
-+      EXPECT_NEAR (correct_point.x, answer_point.x, 5.0e-3);
-       EXPECT_NEAR (correct_point.y, answer_point.y, 1.0e-3);
-       EXPECT_NEAR (correct_point.z, answer_point.z, 1.0e-3);
-     }
-diff --git a/test/octree/test_octree.cpp b/test/octree/test_octree.cpp
-index 4130a90..d6110ac 100644
---- a/test/octree/test_octree.cpp
-+++ b/test/octree/test_octree.cpp
-@@ -1538,7 +1538,7 @@ TEST (PCL, Octree_Pointcloud_Ray_Traversal)
-     {
-       pt = (*cloudIn)[i];
-       d = Eigen::Vector3f (pt.x, pt.y, pt.z) - o;
--      ASSERT_GE (d.norm (), min_dist);
-+      ASSERT_GE (d.norm (), min_dist - 1e-4);
-     }
-   }
- }
-diff --git a/test/sample_consensus/test_sample_consensus_plane_models.cpp b/test/sample_consensus/test_sample_consensus_plane_models.cpp
-index 82141b3..351ca93 100644
---- a/test/sample_consensus/test_sample_consensus_plane_models.cpp
-+++ b/test/sample_consensus/test_sample_consensus_plane_models.cpp
-@@ -556,10 +556,10 @@ TEST (SampleConsensusModelPlane, OptimizeFarFromOrigin)
-   Eigen::VectorXf coeffs(4); // Doesn't have to be initialized, the function doesn't use them
-   Eigen::VectorXf optimized_coeffs(4);
-   model.optimizeModelCoefficients(inliers, coeffs, optimized_coeffs);
--  EXPECT_NEAR(optimized_coeffs[0], z[0], 5e-6);
--  EXPECT_NEAR(optimized_coeffs[1], z[1], 5e-6);
-+  EXPECT_NEAR(optimized_coeffs[0], z[0], 5e-5);
-+  EXPECT_NEAR(optimized_coeffs[1], z[1], 5e-5);
-   EXPECT_NEAR(optimized_coeffs[2], z[2], 5e-6);
--  EXPECT_NEAR(optimized_coeffs[3], -z.dot(center), 5e-2);
-+  EXPECT_NEAR(optimized_coeffs[3], -z.dot(center), 5e-1);
- }
- int
diff --git a/debian/patches/0007-Adopt-unit-tests-for-arm64-and-ppc64el.patch b/debian/patches/0007-Adopt-unit-tests-for-arm64-and-ppc64el.patch
deleted file mode 100644 (file)
index a4eae42..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Mon, 13 Dec 2021 22:14:08 +0100
-Subject: Adopt unit tests for arm64 and ppc64el
-
----
- test/segmentation/test_non_linear.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/segmentation/test_non_linear.cpp b/test/segmentation/test_non_linear.cpp
-index 1410182..823070f 100644
---- a/test/segmentation/test_non_linear.cpp
-+++ b/test/segmentation/test_non_linear.cpp
-@@ -73,7 +73,7 @@ TEST (SACSegmentation, Segmentation)
-   EXPECT_NEAR (sphere_coefficients->values[2], 1.24558,   1e-2);
-   EXPECT_NEAR (sphere_coefficients->values[3], 0.0536238, 1e-2);
--  EXPECT_NEAR (static_cast<int> (inliers->indices.size ()), 3516, 15);
-+  EXPECT_NEAR (static_cast<int> (inliers->indices.size ()), 3516, 18);
- }
- //* ---[ */
index 6ac2aa444e31aa0c3e7cb31cd6920310f4bc124b..a4a2c6b250e9b877fadabda071205a3bf3e06fca 100644 (file)
@@ -1,5 +1,2 @@
 0001-Fix-PCL_ROOT-path.patch
 0003-Use-newly-build-libs-when-testing.patch
-0004-Disable-failing-tests.patch
-0005-Adopt-unit-test-for-i386.patch
-0007-Adopt-unit-tests-for-arm64-and-ppc64el.patch