Fix tests on armel

diff --git a/debian/patches/0006-Fix-alignment-in-tests-for-armhf-armel.patch b/debian/patches/0006-Fix-alignment-in-tests-for-armhf-armel.patch
new file mode 100644 (file)
index 0000000..a87371e
--- /dev/null
+++ b/debian/patches/0006-Fix-alignment-in-tests-for-armhf-armel.patch
@@ -0,0 +1,54 @@
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Fri, 8 Oct 2021 19:22:51 +0200
+Subject: Fix alignment in tests for armhf/armel
+
+---
+ test/common/test_pointcloud.cpp      | 1 +
+ test/filters/test_crop_hull.cpp      | 1 +
+ test/filters/test_functor_filter.cpp | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/test/common/test_pointcloud.cpp b/test/common/test_pointcloud.cpp
+index 2e43620..922177d 100644
+--- a/test/common/test_pointcloud.cpp
++++ b/test/common/test_pointcloud.cpp
+@@ -16,6 +16,7 @@ using namespace pcl;
+ 
+ //////////////////////////////////////////////
+ struct pointCloudTest : public testing::Test {
++  EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+   protected:
+     PointCloud<PointXYZ> cloud;
+ };
+diff --git a/test/filters/test_crop_hull.cpp b/test/filters/test_crop_hull.cpp
+index d46838a..fcac94c 100644
+--- a/test/filters/test_crop_hull.cpp
++++ b/test/filters/test_crop_hull.cpp
+@@ -101,6 +101,7 @@ class PCLCropHullTestFixture : public ::testing::Test
+       baseOffsetList_.emplace_back(10, 1, 5);
+       baseOffsetList_.emplace_back(10, 5, 1);
+     }
++  EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+   protected:
+ 
+     void
+diff --git a/test/filters/test_functor_filter.cpp b/test/filters/test_functor_filter.cpp
+index e4a1190..741ffb1 100644
+--- a/test/filters/test_functor_filter.cpp
++++ b/test/filters/test_functor_filter.cpp
+@@ -52,6 +52,7 @@ struct FunctorFilterRandom : public testing::TestWithParam<std::uint32_t> {
+ 
+   shared_ptr<PointCloud<PointXYZ>> cloud;
+   PointCloud<PointXYZ> out_cloud, negative_cloud, positive_cloud;
++  EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+ };
+ 
+ TEST_P(FunctorFilterRandom, functioning)
+@@ -172,6 +173,7 @@ struct FunctorFilterFunctionObject : public ::testing::Test {
+     cloud.resize(2);
+   }
+   PointCloud<PointXYZ> cloud;
++  EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+ };
+ TYPED_TEST_SUITE_P(FunctorFilterFunctionObject);
+ 

diff --git a/debian/patches/0006-Fix-alignment-in-tests-for-armhf.patch b/debian/patches/0006-Fix-alignment-in-tests-for-armhf.patch
deleted file mode 100644 (file)
index e5d3111..0000000
--- a/debian/patches/0006-Fix-alignment-in-tests-for-armhf.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Fri, 8 Oct 2021 19:22:51 +0200
-Subject: Fix alignment in tests for armhf
-
----
- test/common/test_pointcloud.cpp      | 1 +
- test/filters/test_crop_hull.cpp      | 1 +
- test/filters/test_functor_filter.cpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/test/common/test_pointcloud.cpp b/test/common/test_pointcloud.cpp
-index 2e43620..922177d 100644
---- a/test/common/test_pointcloud.cpp
-+++ b/test/common/test_pointcloud.cpp
-@@ -16,6 +16,7 @@ using namespace pcl;
- 
- //////////////////////////////////////////////
- struct pointCloudTest : public testing::Test {
-+  EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-   protected:
-     PointCloud<PointXYZ> cloud;
- };
-diff --git a/test/filters/test_crop_hull.cpp b/test/filters/test_crop_hull.cpp
-index d46838a..fcac94c 100644
---- a/test/filters/test_crop_hull.cpp
-+++ b/test/filters/test_crop_hull.cpp
-@@ -101,6 +101,7 @@ class PCLCropHullTestFixture : public ::testing::Test
-       baseOffsetList_.emplace_back(10, 1, 5);
-       baseOffsetList_.emplace_back(10, 5, 1);
-     }
-+  EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-   protected:
- 
-     void
-diff --git a/test/filters/test_functor_filter.cpp b/test/filters/test_functor_filter.cpp
-index e4a1190..03f541f 100644
---- a/test/filters/test_functor_filter.cpp
-+++ b/test/filters/test_functor_filter.cpp
-@@ -172,6 +172,7 @@ struct FunctorFilterFunctionObject : public ::testing::Test {
-     cloud.resize(2);
-   }
-   PointCloud<PointXYZ> cloud;
-+  EIGEN_MAKE_ALIGNED_OPERATOR_NEW
- };
- TYPED_TEST_SUITE_P(FunctorFilterFunctionObject);
- 

diff --git a/debian/patches/series b/debian/patches/series
index 59d021e57623f9d75be4112edc71a451c401d349..85e3b3f2ebaf56ece3a6906d92e5ce322eb88f50 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@
 0003-Use-newly-build-libs-when-testing.patch
 0004-Disable-failing-tests.patch
 0005-Adopt-unit-test-for-i386.patch
-0006-Fix-alignment-in-tests-for-armhf.patch
+0006-Fix-alignment-in-tests-for-armhf-armel.patch