[springlobby] 01/02: Add revert-test-for-hash-conversion.patch.

Markus Koschany apo-guest at moszumanska.debian.org
Tue Jun 9 23:17:37 UTC 2015


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

apo-guest pushed a commit to branch master
in repository springlobby.

commit 5b7827fd6fc2de36c2b5e04cb2f204610a1c7a36
Author: Markus Koschany <apo at gambaru.de>
Date:   Wed Jun 10 00:40:29 2015 +0200

    Add revert-test-for-hash-conversion.patch.
---
 .../patches/revert-test-for-hash-conversion.patch  | 50 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 51 insertions(+)

diff --git a/debian/patches/revert-test-for-hash-conversion.patch b/debian/patches/revert-test-for-hash-conversion.patch
new file mode 100644
index 0000000..e1f1e75
--- /dev/null
+++ b/debian/patches/revert-test-for-hash-conversion.patch
@@ -0,0 +1,50 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Wed, 10 Jun 2015 00:40:03 +0200
+Subject: revert test for hash conversion
+
+Revert newly added test for hash conversion because it causes a FTBFS on 32bit
+architectures. This should only be a temporary solution until the real cause
+can be identified.
+
+Forwarded: https://github.com/springlobby/springlobby/issues/466
+---
+ src/tests/lslconversion.cpp | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/src/tests/lslconversion.cpp b/src/tests/lslconversion.cpp
+index 815b5cd..d0f2e78 100644
+--- a/src/tests/lslconversion.cpp
++++ b/src/tests/lslconversion.cpp
+@@ -6,9 +6,7 @@
+ #include <stdio.h>
+ #include "utils/lslconversion.h"
+ #include <lslutils/misc.h>
+-#include <lslutils/conversion.h>
+ #include "user.h"
+-#include "utils/conversion.h"
+ #include <wx/colour.h>
+ 
+ 
+@@ -168,22 +166,3 @@ BOOST_AUTO_TEST_CASE(userstatus)
+ 	us.bot = true;
+ 	BOOST_CHECK(us == UserStatus::FromInt(UserStatus::ToInt(us)));
+ }
+-
+-BOOST_AUTO_TEST_CASE(hashes)
+-{
+-	const unsigned int overflow = 2232970410; //this
+-	const int negative = -2147483648;
+-
+-	BOOST_CHECK("-2061996886" == LSL::Util::MakeHashSigned(LSL::Util::ToString(overflow)));
+-	BOOST_CHECK(stdprintf("%d", negative) == LSL::Util::MakeHashSigned(LSL::Util::ToString(negative)));
+-
+-	BOOST_CHECK("2232970410" == LSL::Util::MakeHashUnsigned(LSL::Util::ToString(overflow)));
+-	BOOST_CHECK(stdprintf("%u", negative) == LSL::Util::MakeHashUnsigned(LSL::Util::ToString(negative)));
+-
+-	BOOST_CHECK("2232970410" == LSL::Util::MakeHashUnsigned(stdprintf("%d", overflow)));
+-	BOOST_CHECK(stdprintf("%u", negative) == LSL::Util::MakeHashUnsigned(stdprintf("%d", negative)));
+-
+-	BOOST_CHECK("2232970410" == LSL::Util::MakeHashUnsigned(stdprintf("%u", overflow)));
+-	BOOST_CHECK("2147483648" == LSL::Util::MakeHashUnsigned(stdprintf("%u", negative)));
+-}
+-
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..de4fc51
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+revert-test-for-hash-conversion.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/springlobby.git



More information about the Pkg-games-commits mailing list