[Commits] [wesnoth/wesnoth] 91d545: fixup test directory

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 91d545c7d730cf062e0adcd03d7341d90ee99114
      https://github.com/wesnoth/wesnoth/commit/91d545c7d730cf062e0adcd03d7341d90ee99114
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M data/_main.cfg
    M data/test/_main.cfg
    M src/tests/utils/game_config_manager.cpp

  Log Message:
  -----------
  fixup test directory

C++ tests load from /data/test/ again, and the _main includes in
data/ and data/test/ are fixed up to accomodate this.

This fixes up cc138a4ed96f3ac1f8c5130aa6842d1429013da4


  Commit: 090566effd644a8d73382f11ddb7e9a3ea8d99ab
      https://github.com/wesnoth/wesnoth/commit/090566effd644a8d73382f11ddb7e9a3ea8d99ab
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M run_wml_tests

  Log Message:
  -----------
  fixup run_wml_tests

Prev version could sometimes give an error if test timed out and
error.log was not created, so add a check for if error.log exists.

Also refactor so the error log handling is in its own function.


  Commit: 20e35b471a36568c8d1af20db5e4c4fe5d7c975e
      https://github.com/wesnoth/wesnoth/commit/20e35b471a36568c8d1af20db5e4c4fe5d7c975e
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    R Debian7-32.zip
    M changelog
    M src/actions/undo.cpp
    M src/actions/undo.hpp
    M src/mouse_events.cpp
    M src/play_controller.cpp
    M src/playmp_controller.cpp
    M src/replay.cpp
    M src/synced_commands.cpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/1be545661475...20e35b471a36