Yuya Nishihara <yuya@tcha.org> [Tue, 29 Apr 2014 12:37:36 +0900] rev 1372
killdaemons: correct typo of _check() function caught by pyflakes
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Apr 2014 13:21:25 +0100] rev 1371
Merge with stable
Simon Heimberg <simohe@besonet.ch> [Mon, 25 Nov 2013 22:00:46 +0100] rev 1370
run-tests: test result shows when a failed test could not start a server
Failing to start a server happens regularly, at least on windows buildbot.
Such a failure often has nothing to do with the test, but with the environment.
But half the test output can change because some data is missing. Therefore this
is worth an extended error message.
Detect the server failure in the diff output because it is most reliable
there. Checking the output only does not show if the server failure was
expected.
Old failure message when server start failed:
Failed test-serve.t: output changed
New message:
Failed test-serve.t: serve failed and output changed
[ original upstream message ]
Mads Kiilerich <madski@unity3d.com> [Sun, 13 Apr 2014 19:01:00 +0200] rev 1369
spelling: fixes from spell checker
[ original upstream message ]
Mads Kiilerich <madski@unity3d.com> [Sun, 13 Apr 2014 19:01:00 +0200] rev 1368
tests: warn on invalid #if directive
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 12 Apr 2014 18:13:57 +0100] rev 1367
Merge with stable