[ignition-math4] 02/04: Update test

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository ignition-math4.

commit 506a7d86734b927b78fb9c8c94664372e482a468
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Jan 3 00:09:10 2018 +0000

    Update test
---
 .../0004_test_failures_in_non_x64_arches.patch       | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0004_test_failures_in_non_x64_arches.patch b/debian/patches/0004_test_failures_in_non_x64_arches.patch
index d924185..2e64e85 100644
--- a/debian/patches/0004_test_failures_in_non_x64_arches.patch
+++ b/debian/patches/0004_test_failures_in_non_x64_arches.patch
@@ -4,19 +4,19 @@ Bug: https://bitbucket.org/ignitionrobotics/ign-math/issues/25
 Submitted: No
 
 diff --git a/src/Box_TEST.cc b/src/Box_TEST.cc
-index 8c11efc..8cbd90b 100644
+index 81b636d..70a98b0 100644
 --- a/src/Box_TEST.cc
 +++ b/src/Box_TEST.cc
-@@ -348,6 +348,8 @@ TEST(BoxTest, Intersect)
-       math::Vector3d(1, 1, 0), 0, 1000)), dist);
+@@ -378,6 +378,8 @@ TEST(BoxTest, Intersect)
+       math::Vector3d(-1, 0, 0), 0, 1000)), dist);
    EXPECT_EQ(pt, math::Vector3d(1, 0, 0));
  
 +  /* Not working on 32 bits archictectures */
 +  #ifndef __i386__
-   std::tie(intersect, dist, pt) = b.Intersect(math::Vector3d(2, 1, 0),
+   std::tie(intersect, dist, pt) = b.Intersect(math::Vector3d(2, 2, 0),
        math::Vector3d(-1, -1, 0), 0, 1000);
    EXPECT_TRUE(intersect);
-@@ -357,6 +359,7 @@ TEST(BoxTest, Intersect)
+@@ -417,6 +419,7 @@ TEST(BoxTest, Intersect)
    EXPECT_DOUBLE_EQ(std::get<1>(b.IntersectDist(math::Vector3d(2, 1, 0),
        math::Vector3d(-1, -1, 0), 0, 1000)), dist);
    EXPECT_EQ(pt, math::Vector3d(1, 0, 0));
@@ -25,10 +25,10 @@ index 8c11efc..8cbd90b 100644
    std::tie(intersect, dist, pt) = b.Intersect(math::Vector3d(0.5, 0.5, 2),
        math::Vector3d(0, 0, -1), 0, 1000);
 diff --git a/src/Helpers_TEST.cc b/src/Helpers_TEST.cc
-index 3a0c838..4fd12d1 100644
+index ed65003..77a9fe9 100644
 --- a/src/Helpers_TEST.cc
 +++ b/src/Helpers_TEST.cc
-@@ -343,7 +343,10 @@ TEST(HelpersTest, Pair)
+@@ -434,7 +434,10 @@ TEST(HelpersTest, Pair)
  #endif
  
    std::tie(maxC, maxD) = math::Unpair(maxKey);
@@ -38,8 +38,8 @@ index 3a0c838..4fd12d1 100644
 +  #endif
    EXPECT_EQ(maxD, maxB);
  
- #ifdef _MSC_VER
-@@ -416,8 +419,11 @@ TEST(HelpersTest, Pair)
+ #if defined _MSC_VER || defined __arm__
+@@ -491,8 +494,11 @@ TEST(HelpersTest, Pair)
        {
          math::PairOutput key = math::Pair(a, b);
          std::tie(c, d) = math::Unpair(key);
@@ -49,5 +49,5 @@ index 3a0c838..4fd12d1 100644
          EXPECT_EQ(b, d);
 +        #endif
          EXPECT_TRUE(set.find(key) == set.end());
-         EXPECT_TRUE(key != minKey);
+         EXPECT_TRUE(key != maxKey);
          set.insert(key);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ignition-math4.git