From 278e47261ed4cc8693ee25e8e8baacfd34841e4e Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 23 Sep 2022 18:36:26 +0200 Subject: [PATCH] Remove patch for ARM failures after changes in code (#18) --- .../0004_fix_test_pose_zero_positive.patch | 23 ------------------- ubuntu/debian/patches/series | 1 - 2 files changed, 24 deletions(-) delete mode 100644 ubuntu/debian/patches/0004_fix_test_pose_zero_positive.patch diff --git a/ubuntu/debian/patches/0004_fix_test_pose_zero_positive.patch b/ubuntu/debian/patches/0004_fix_test_pose_zero_positive.patch deleted file mode 100644 index a53e861..0000000 --- a/ubuntu/debian/patches/0004_fix_test_pose_zero_positive.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Jose Luis Rivero" -Date: 08/09/2020 -Subject: Check expected string in architectures that fail with negative zero due to optimizations -Upstream: No - -diff --git a/src/Pose_TEST.cc b/src/Pose_TEST.cc -index 978c85df..7c0f8040 100644 ---- a/src/Pose_TEST.cc -+++ b/src/Pose_TEST.cc -@@ -184,8 +184,11 @@ TEST(PoseTest, OperatorStreamOut) - math::Pose3d p(0.1, 1.2, 2.3, 0.0, 0.1, 1.0); - std::ostringstream stream; - stream << p; -- EXPECT_EQ(stream.str(), "0.1 1.2 2.3 0 0.1 1"); --} -+ // some compiler optimizations returns negative zero (-0) in the stream, workaround -+ // using prefix and postfix check. Not nice I know. -+ EXPECT_TRUE(stream.str().find("0.1 1.2 2.3") != std::string::npos) << "stream.str is: " << stream.str(); -+ EXPECT_TRUE(stream.str().find("0 0.1 1") != std::string::npos) << "stream.str is: " << stream.str(); -+ } - - ///////////////////////////////////////////////// - TEST(PoseTest, OperatorStreamOutZero) diff --git a/ubuntu/debian/patches/series b/ubuntu/debian/patches/series index 8f262d0..c4128dc 100644 --- a/ubuntu/debian/patches/series +++ b/ubuntu/debian/patches/series @@ -1,2 +1 @@ -0004_fix_test_pose_zero_positive.patch 0001_arm_not_buildsamples_test.patch