svn commit: r400866 - in head/games/wesnoth: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Nov  5 20:34:17 2015
New Revision: 400866
URL: https://svnweb.freebsd.org/changeset/ports/400866

Log:
  - Fix build with TEST enabled
  
  Approved by:	portmgr blanket

Added:
  head/games/wesnoth/files/
  head/games/wesnoth/files/patch-src_tests_test__util.cpp   (contents, props changed)
Modified:
  head/games/wesnoth/Makefile
  head/games/wesnoth/pkg-plist

Modified: head/games/wesnoth/Makefile
==============================================================================
--- head/games/wesnoth/Makefile	Thu Nov  5 20:34:14 2015	(r400865)
+++ head/games/wesnoth/Makefile	Thu Nov  5 20:34:17 2015	(r400866)
@@ -69,7 +69,6 @@ RAWSOCKETS_CFLAGS=-DNETWORK_USE_RAW_SOCK
 SERVER_DESC=	Server
 SERVER_CMAKE_OFF=-DENABLE_SERVER=off
 TEST_CMAKE_ON=	-DENABLE_TESTS=on
-TEST_BROKEN=	Does not compile with TEST option enabled
 TOOLS_DESC=	Extra tools for artists and translators
 TOOLS_CMAKE_ON=	-DENABLE_TOOLS=on
 

Added: head/games/wesnoth/files/patch-src_tests_test__util.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/wesnoth/files/patch-src_tests_test__util.cpp	Thu Nov  5 20:34:17 2015	(r400866)
@@ -0,0 +1,11 @@
+--- src/tests/test_util.cpp.orig	2015-06-25 23:08:11 UTC
++++ src/tests/test_util.cpp
+@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE( test_count_leading
+ 	BOOST_CHECK( count_leading_ones(static_cast<boost::uint8_t>(0xFF)) == 8 );
+ 	BOOST_CHECK( count_leading_ones(static_cast<boost::uint16_t>(0xFFFF)) == 16 );
+ 	BOOST_CHECK( count_leading_ones(static_cast<boost::uint32_t>(0xFFFFFFFF)) == 32 );
+-	BOOST_CHECK( count_leading_ones(static_cast<boost::uint64_t>(0xFFFFFFFFFFFFFFFF))
++	BOOST_CHECK( count_leading_ones(static_cast<boost::uint64_t>(0xFFFFFFFFFFFFFFFFULL))
+ 		== 64 );
+ 	BOOST_CHECK( count_leading_ones(static_cast<boost::uint8_t>(0xF8)) == 5 );
+ 	BOOST_CHECK( count_leading_ones(static_cast<boost::uint16_t>(54321)) == 2 );

Modified: head/games/wesnoth/pkg-plist
==============================================================================
--- head/games/wesnoth/pkg-plist	Thu Nov  5 20:34:14 2015	(r400865)
+++ head/games/wesnoth/pkg-plist	Thu Nov  5 20:34:17 2015	(r400866)
@@ -13,7 +13,6 @@ bin/wesnoth
 %%TOOLS%%bin/schema_generator
 %%TOOLS%%bin/schema_validator
 %%TOOLS%%bin/wesmage
-%%TEST%%bin/wesnoth_test
 %%SERVER%%bin/wesnothd
 share/applications/wesnoth.desktop
 share/applications/wesnoth_editor.desktop