Skip to content

Commit

Permalink
Revert ignoring MP test failures due to video init failure (2e5c5da)
Browse files Browse the repository at this point in the history
This code ended up ignoring *all* MP test failures, in particular the one
fixed in commit 11d7b9f.

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.
  • Loading branch information
jyrkive committed Nov 29, 2017
1 parent 11d7b9f commit 72739c5
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions utils/travis/mp_test_executor.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 72739c5

Please sign in to comment.