[Commits] [wesnoth/wesnoth] 5aba22: fixup tests

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 5aba222f004df5ae2c9b069b303c9599ca821952
      https://github.com/wesnoth/wesnoth/commit/5aba222f004df5ae2c9b069b303c9599ca821952
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/tests/test_config.cpp

  Log Message:
  -----------
  fixup tests

Test was calling the wrong function in place of to_double. Also
fix up an answer value after this.

Fixes up commit 7cd205832f34098375aff05e34a12c37f16046d5


  Commit: 50ed2187e1f328ba12fae314239fb33ee77c5112
      https://github.com/wesnoth/wesnoth/commit/50ed2187e1f328ba12fae314239fb33ee77c5112
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-31 (Sat, 31 May 2014)

  Changed paths:
    M src/floating_point_emulation.hpp
    M src/game_end_exceptions.cpp
    M src/game_end_exceptions.hpp
    M src/multiplayer_connect_engine.cpp
    M src/play_controller.cpp
    M src/playcampaign.cpp
    M src/playsingle_controller.cpp
    M src/sdl_utils.cpp
    M src/tests/test_config.cpp
    M src/tests/test_map_location.cpp
    M src/tod_manager.cpp
    M src/tod_manager.hpp

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/wesnoth/wesnoth

This partially reverts mordante's change to drop abs
rather than correct the expected result of expression.

Conflicts:
	src/tests/test_config.cpp


Compare: https://github.com/wesnoth/wesnoth/compare/bafab2261d36...50ed2187e1f3