From afa90b35873c6adc2c1da7beaad8e94c4b35c59d Mon Sep 17 00:00:00 2001
From: Fabien Spindler <Fabien.Spindler@inria.fr>
Date: Tue, 9 Mar 2021 14:25:14 +0100
Subject: [PATCH] Add patches to fix test issues on i386
---
.../0001-Turn-rpath-off-for-install.patch | 2 +-
...ld-in-testGenericTracker-KLT-for-Deb.patch | 26 +++++++++++++++++++
...g-test-threshold-when-lapack-is-used.patch | 25 ++++++++++++++++++
debian/patches/series | 2 ++
4 files changed, 54 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/0002-Increase-threshold-in-testGenericTracker-KLT-for-Deb.patch
create mode 100644 debian/patches/0003-Relax-apriltag-test-threshold-when-lapack-is-used.patch
diff --git a/debian/patches/0001-Turn-rpath-off-for-install.patch b/debian/patches/0001-Turn-rpath-off-for-install.patch
index 39246cb4..27f12636 100644
--- a/debian/patches/0001-Turn-rpath-off-for-install.patch
+++ b/debian/patches/0001-Turn-rpath-off-for-install.patch
@@ -1,7 +1,7 @@
From da384b078fdd4e4aeca2d76e3805fa22af9d7579 Mon Sep 17 00:00:00 2001
From: Fabien Spindler <Fabien.Spindler@inria.fr>
Date: Fri, 26 Feb 2021 22:17:38 +0100
-Subject: [PATCH] Turn rpath off for install
+Subject: [PATCH 1/3] Turn rpath off for install
---
CMakeLists.txt | 13 ++-----------
diff --git a/debian/patches/0002-Increase-threshold-in-testGenericTracker-KLT-for-Deb.patch b/debian/patches/0002-Increase-threshold-in-testGenericTracker-KLT-for-Deb.patch
new file mode 100644
index 00000000..2bde545e
--- /dev/null
+++ b/debian/patches/0002-Increase-threshold-in-testGenericTracker-KLT-for-Deb.patch
@@ -0,0 +1,26 @@
+From 366da5d2dd9edee8f13e4b24d959cc28b2228564 Mon Sep 17 00:00:00 2001
+From: Fabien Spindler <Fabien.Spindler@inria.fr>
+Date: Sun, 7 Mar 2021 10:24:42 +0100
+Subject: [PATCH 2/3] Increase threshold in testGenericTracker-KLT for
+ Debian/i386 arch
+
+---
+ modules/tracker/mbt/test/testGenericTracker.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/tracker/mbt/test/testGenericTracker.cpp b/modules/tracker/mbt/test/testGenericTracker.cpp
+index b6ff75a..d2519b1 100644
+--- a/modules/tracker/mbt/test/testGenericTracker.cpp
++++ b/modules/tracker/mbt/test/testGenericTracker.cpp
+@@ -365,7 +365,7 @@ namespace
+ = useScanline ? std::pair<double, double>(0.005, 3.9) : std::pair<double, double>(0.007, 3.7);
+ #if defined(VISP_HAVE_MODULE_KLT) && (defined(VISP_HAVE_OPENCV) && (VISP_HAVE_OPENCV_VERSION >= 0x020100))
+ map_thresh[vpMbGenericTracker::KLT_TRACKER]
+- = useScanline ? std::pair<double, double>(0.007, 1.9) : std::pair<double, double>(0.005, 1.8);
++ = useScanline ? std::pair<double, double>(0.007, 1.9) : std::pair<double, double>(0.007, 1.8);
+ map_thresh[vpMbGenericTracker::EDGE_TRACKER | vpMbGenericTracker::KLT_TRACKER]
+ = useScanline ? std::pair<double, double>(0.005, 3.5) : std::pair<double, double>(0.006, 3.4);
+ #endif
+--
+2.30.0
+
diff --git a/debian/patches/0003-Relax-apriltag-test-threshold-when-lapack-is-used.patch b/debian/patches/0003-Relax-apriltag-test-threshold-when-lapack-is-used.patch
new file mode 100644
index 00000000..72373b02
--- /dev/null
+++ b/debian/patches/0003-Relax-apriltag-test-threshold-when-lapack-is-used.patch
@@ -0,0 +1,25 @@
+From 62f02f14dcdd351f18f23ed2ff7d0e91006a2cb7 Mon Sep 17 00:00:00 2001
+From: Fabien Spindler <Fabien.Spindler@inria.fr>
+Date: Tue, 9 Mar 2021 14:21:13 +0100
+Subject: [PATCH 3/3] Relax apriltag test threshold when lapack is used
+
+---
+ modules/detection/test/testAprilTag.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/detection/test/testAprilTag.cpp b/modules/detection/test/testAprilTag.cpp
+index 5c5a833..23875a4 100644
+--- a/modules/detection/test/testAprilTag.cpp
++++ b/modules/detection/test/testAprilTag.cpp
+@@ -736,7 +736,7 @@ TEST_CASE("Apriltag getTagsPoints3D test", "[apriltag_get_tags_points3D_test]")
+ // failing on Ubuntu 18.04 when none of the Lapack 3rd party libraries, nor the built-in are used.
+ // Admissible espilon value is 1e-14. Using 1e-15 makes the test failing.
+ #ifdef VISP_HAVE_LAPACK
+- double epsilon = std::numeric_limits<double>::epsilon();
++ double epsilon = 1e-12;// std::numeric_limits<double>::epsilon();
+ #else
+ double epsilon = 1e-12;
+ #endif
+--
+2.30.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 86e9a1ae..89fdb648 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
0001-Turn-rpath-off-for-install.patch
+0002-Increase-threshold-in-testGenericTracker-KLT-for-Deb.patch
+0003-Relax-apriltag-test-threshold-when-lapack-is-used.patch
--
GitLab