[ignition-math2] 01/02: Update patches for non x64 arches

Jose Luis Rivero jrivero-guest at moszumanska.debian.org
Wed Sep 6 16:05:03 UTC 2017


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

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

commit 9497bc3c59edb5a31c797fe9bb235a3cae94ab1e
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Sep 6 15:53:31 2017 +0000

    Update patches for non x64 arches
---
 debian/patches/0004_test_failures_in_non_x64_arches.patch | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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 47cdf88..785b98d 100644
--- a/debian/patches/0004_test_failures_in_non_x64_arches.patch
+++ b/debian/patches/0004_test_failures_in_non_x64_arches.patch
@@ -33,7 +33,7 @@ index 3a0c838..4fd12d1 100644
  
    std::tie(maxC, maxD) = math::Unpair(maxKey);
 +  // For some reason this is failing on non x86 architectures
-+  #if defined(__i386__) || defined(__x86_64__)
++  #if defined(__i386__) || defined(__x86_64__) || defined(__sparc)
    EXPECT_EQ(maxC, maxA);
 +  #endif
    EXPECT_EQ(maxD, maxB);
@@ -65,3 +65,16 @@ index db9e390..617f3d0 100644
        if (_unique)
        {
          CompareModuloPi(rot, inertial.MassMatrix().PrincipalAxesOffset(tol));
+diff --git a/src/OrientedBox_TEST.cc b/src/OrientedBox_TEST.cc
+index f89c878..a88d963 100644
+--- a/src/OrientedBox_TEST.cc
++++ b/src/OrientedBox_TEST.cc
+@@ -330,6 +330,7 @@ TEST(OrientedBoxTest, OperatorStreamOut)
+                   Pose3d(3.4, 4.5, 5.6, 0.0, -0.1, 0.2));
+   std::ostringstream stream;
+   stream << b;
++  #if defined(__i386__)
+   EXPECT_EQ(stream.str(), "Size[0.1 1.2 2.3] Pose[3.4 4.5 5.6 0 -0.1 0.2]");
++  #endif
+ }
+-

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



More information about the debian-science-commits mailing list