[wesnoth-commits] [wesnoth/wesnoth] 633340: Remove the obsolete --timeout command-line option

Steve Cotton noreply at github.com
Tue Dec 24 22:02:29 UTC 2019


  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 6333400f64cc3a9d8db60c996813132510f5c0dc
      https://github.com/wesnoth/wesnoth/commit/6333400f64cc3a9d8db60c996813132510f5c0dc
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2019-12-24 (Tue, 24 Dec 2019)

  Changed paths:
    M doc/man/wesnoth.6
    M src/commandline_options.cpp
    M src/commandline_options.hpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Remove the obsolete --timeout command-line option

This option has never been supported in any tagged release of Wesnoth:
* added in e5b39510540cb3bb68cfd9ef6f3a3a1094d2d534
* changed to only print a warning in c8699e2f057b14b19ba60dbd4e71f4647b45ca78

(cherry picked from commit 657629322884286f938e9a25e5f7300d52536601)


  Commit: d7f99f8a044127f0a2ca6112137d8caf001fc465
      https://github.com/wesnoth/wesnoth/commit/d7f99f8a044127f0a2ca6112137d8caf001fc465
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2019-12-24 (Tue, 24 Dec 2019)

  Changed paths:
    M src/commandline_options.cpp
    M src/commandline_options.hpp
    M src/game_launcher.cpp
    M src/game_launcher.hpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Support running multiple expected-to-pass unit tests

This allows batching all of the tests that are expected to return status zero,
which is currently 161 tests, and running the batch with a single instance of
Wesnoth.  It doesn't include the changes to the run_wml_tests script to use
this new feature.

Timing on my PC:
* 4 seconds to run a single test on a debug build
* 90 seconds to run the whole batch of 161 on a debug build
* 1.2 seconds to run a single test on a release build
* 31.2 seconds to run the whole batch of 161 on a release build

(cherry picked from commit 63bb076b971a4724c05659e3c59b23d4cdf7f38c)


  Commit: bba67f2bb30975f9fb0d2ffdde34f9f1587b2fdb
      https://github.com/wesnoth/wesnoth/commit/bba67f2bb30975f9fb0d2ffdde34f9f1587b2fdb
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2019-12-24 (Tue, 24 Dec 2019)

  Changed paths:
    M data/test/scenarios/filter_this_unit.cfg
    M src/commandline_options.cpp
    M src/game_launcher.cpp
    M src/game_launcher.hpp
    M wml_test_schedule

  Log Message:
  -----------
  Separate unit test statuses for WML exceptions and strict warnings (fixes #4471)

Backported to 1.14 so that this mechanism can be used instead of a793bce96's
method of running the cve_2018_1999023 test in non-strict mode, which means
that the test now passes without making equivalent-to-a793bce96 changes to
projectfiles/VC12/WML_tests.cmd and projectfiles/VC16/WML_tests.cmd.

This was part of working out whether a subset of the "fail" tests could be run
in one Wesnoth instance. To run a test that returns TEST_FAIL_BROKE_STRICT with
any other test would require a mechanism to reset lg::broke_strict()'s flag.

All tests that fail with an {ASSERT} will also set the lg::broke_strict() flag,
the tests with the new status are only those that would pass without the strict
flag.

In the SUF tests, change a test from fail-on-success to breaks-strict, rename
the formula tests and add some comments. The rename is because "fai" is
"Formula AI", an obsolete name for WFL.

(cherry-picked from commit 7359fddecb8dafdb8bec33660259ec5e2fec4141)


  Commit: 6e25678c69608f945db8c1914e4550cb77a26e74
      https://github.com/wesnoth/wesnoth/commit/6e25678c69608f945db8c1914e4550cb77a26e74
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2019-12-24 (Tue, 24 Dec 2019)

  Changed paths:
    M run_wml_tests

  Log Message:
  -----------
  Port run_wml_tests to Python with batch support and improved error reporting

Includes Pentarctagon's improvements:
* Adds the new `bt` (batch timeout) option, to limit the maximum time batched
  unit tests can take.  Otherwise, if for whatever reason they take longer than
  10 minutes, travis will error the job due to not receiving any output for too
  long.
* Writes the test output to files rather than trying to get it from the stderr,
  and then output's the log from the failed test.  Currently if a test
  unexpectedly times out, there is nothing printed indicating the error or
  which test encountered the problem (in case of batched tests).

Cherry picked from commits
* eb7f3674dc40ecc8102f5ae451f80cf9e86f103a
* 38a49ad068d3ed092ef2e8d759b08f6871640e21
* 7345ca7b0f3b61ae669233fd9fd89f6fb2a27fc1

Updates the script for the new statuses cherry-picked from
* 7359fddecb8dafdb8bec33660259ec5e2fec4141


Compare: https://github.com/wesnoth/wesnoth/compare/b90b6c6bc6ce...6e25678c6960



More information about the Commits mailing list