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

Revert ignoring MP test failures due to video init failure (2e5c5da003)

Browse source 
This code ended up ignoring *all* MP test failures, in particular the one
fixed in commit 11d7b9f0cf.

I'd test the code and fix it if I could, but unfortunately I can no longer
develop on GNU/Linux because of PC issues (which I mentioned in Discord).
Therefore I'm just reverting the entire change.
This commit is contained in:
Jyrki Vesterinen 2017-11-29 21:34:03 +02:00
parent 11d7b9f0cf
commit 72739c56a5
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
utils/travis/mp_test_executor.sh
View file

@ -5,16 +5,14 @@ set -v #Print shell commands as they are read
TIMEOUT_TIME=300
LOOP_TIME=6
HOSTLOG=/tmp/host.log
JOINLOG=/tmp/join.log
./wesnothd --port 12345 --log-debug=server --log-warning=config &
serverpid=$!
./wesnoth --plugin=host.lua --server=localhost:12345 --username=host --mp-test --noaddons --nogui 2> >(tee $HOSTLOG >&2) &
./wesnoth --plugin=host.lua --server=localhost:12345 --username=host --mp-test --noaddons --nogui &
hostpid=$!
./wesnoth --plugin=join.lua --server=localhost:12345 --username=join --mp-test --noaddons --nogui 2> >(tee $JOINLOG >&2) &
./wesnoth --plugin=join.lua --server=localhost:12345 --username=join --mp-test --noaddons --nogui &
joinpid=$!
START_TIME=$SECONDS
@ -57,15 +55,9 @@ done
STATUS=0
wait $hostpid || (
grep "Could not initialize SDL_video" $HOSTLOG && \
echo -e "\nFailed to initialize video.\nThis is a common CI issue.\nTreating the test as successful.\n"
) || STATUS=1
wait $hostpid || STATUS=1
wait $joinpid || (
grep "Could not initialize SDL_video" $JOINLOG && \
echo -e "\nFailed to initialize video.\nThis is a common CI issue.\nTreating the test as successful.\n"
) || STATUS=1
wait $joinpid || STATUS=1
kill $serverpid