[springlobby] 04/05: Drop revert-test-for-hash-conversion.patch. Fixed upstream.

Markus Koschany apo-guest at moszumanska.debian.org
Wed Jun 24 22:34:46 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 a2aacbd4a622655c73903048e9c102907d99de4f
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Jun 19 14:20:58 2015 +0200

    Drop revert-test-for-hash-conversion.patch. Fixed upstream.
---
 .../patches/revert-test-for-hash-conversion.patch  | 50 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 51 deletions(-)

diff --git a/debian/patches/revert-test-for-hash-conversion.patch b/debian/patches/revert-test-for-hash-conversion.patch
deleted file mode 100644
index e1f1e75..0000000
--- a/debian/patches/revert-test-for-hash-conversion.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index de4fc51..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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