0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Travis

Browse source 
test/test_lua no longer applies

All it did was check rounding coming from Lua matched the expected values.

You can no long obtain an integer value from a Lua NUMBER (float), unless that float value has no fractional part and is in the range of valid integers. To obtain a rounded value, instead, use luaL_checknumber to obtain the float value and round it as needed (with a cast, floor or ceil, usually) in your program.
This commit is contained in:
Gregory A Lundberg 2016-10-14 01:25:47 -05:00
parent 8839a5ee8e
commit a90ef4a1cb
3 changed files with 0 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/CMakeLists.txt
View file

@ -1375,7 +1375,6 @@ if(ENABLE_TESTS)
tests/test_formula_function.cpp
tests/test_image_modifications.cpp
tests/test_lexical_cast.cpp
tests/test_lua.cpp
tests/test_map_location.cpp
tests/test_make_enum.cpp
tests/test_rng.cpp

1
src/SConscript
View file

@ -731,7 +731,6 @@ test_sources = Split("""
tests/test_formula_function.cpp
tests/test_image_modifications.cpp
tests/test_lexical_cast.cpp
tests/test_lua.cpp
tests/test_make_enum.cpp
tests/test_map_location.cpp
tests/test_mp_connect.cpp

88
src/tests/test_lua.cpp
View file

@ -1,88 +0,0 @@
/*
Copyright (C) 2015 - 2016 by the Battle for Wesnoth Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
See the COPYING file for more details.
*/
#define GETTEXT_DOMAIN "wesnoth-test"
#include <boost/test/unit_test.hpp>
#include "scripting/lua_kernel_base.hpp"
#include "lua/lualib.h"
#include "lua/lauxlib.h"
#include "lua/llimits.h"
#ifndef _WIN32
# include <fenv.h>
#endif
#pragma GCC diagnostic ignored "-Wold-style-cast"
BOOST_AUTO_TEST_SUITE( lua )
static int lua_round(lua_State * L, double d)
{
lua_pushnumber(L, d);
int res = luaL_checkinteger(L, -1);
lua_pop(L, 1);
return res;
}
static int lua_round2(double d)
{
int res;
lua_number2int(res, d);
return res;
}
static int lua_round3(double d)
{
LUAI_EXTRAIEEE
volatile union luai_Cast u; u.l_d = (d) + 6755399441055744.0;
return u.l_p[LUA_IEEEENDIANLOC];
}
BOOST_AUTO_TEST_CASE(fpu_rounding)
{
#ifndef _WIN32
BOOST_CHECK_EQUAL(fegetround(), FE_TONEAREST);
#endif
double d1 = 0.6;
double d2 = 6755399441055744.0;
BOOST_CHECK_EQUAL(d1 + d2, 6755399441055745.0);
}
BOOST_AUTO_TEST_CASE(lua_rounding)
{
lua_kernel_base kernel(nullptr);
lua_State * L = kernel.get_state();
BOOST_CHECK_EQUAL(lua_round(L, -2.5), -2);
BOOST_CHECK_EQUAL(lua_round(L, -1.5), -2);
BOOST_CHECK_EQUAL(lua_round(L, -1 ), -1);
BOOST_CHECK_EQUAL(lua_round(L, -0.5), 0);
BOOST_CHECK_EQUAL(lua_round(L, 0.4), 0);
BOOST_CHECK_EQUAL(lua_round(L, 0.5), 0);
BOOST_CHECK_EQUAL(lua_round(L, 0.6), 1);
BOOST_CHECK_EQUAL(lua_round(L, 1.5), 2);
BOOST_CHECK_EQUAL(lua_round(L, 1.6), 2);
BOOST_CHECK_EQUAL(lua_round(L, 2 ), 2);
BOOST_CHECK_EQUAL(lua_round(L, 2.5), 2);
BOOST_CHECK_EQUAL(lua_round(L, 2.6), 3);
BOOST_CHECK_EQUAL(lua_round(L, 3.5), 4);
BOOST_CHECK_EQUAL(lua_round2(-1.5), -2);
BOOST_CHECK_EQUAL(lua_round2(-1.5), -2);
BOOST_CHECK_EQUAL(lua_round3( 0.6), 1);
BOOST_CHECK_EQUAL(lua_round3( 0.6), 1);
}
BOOST_AUTO_TEST_SUITE_END()