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

Attempt to fix gdb error when attempting to disable aslr

Browse source
This commit is contained in:
Pentarctagon 2019-07-25 18:27:19 -05:00
parent 4607205f53
commit b0200d1380
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/travis/play_test_executor.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash
gdb -q -batch -return-child-result -ex "run" -ex "thread apply all bt" -ex "quit" --args ./wesnoth -m --controller 1:ai --controller 2:ai --nogui 2> error.log
gdb -q -batch -return-child-result -ex "set disable-randomization off" -ex "run" -ex "thread apply all bt" -ex "quit" --args ./wesnoth -m --controller 1:ai --controller 2:ai --nogui 2> error.log
error_code="$?"
while grep -q 'Could not initialize SDL_video' error.log; do
echo "Could not initialize SDL_video error, retrying..."

1
utils/travis/steps/script.sh
View file

@ -43,5 +43,6 @@ else
docker run --volume "$HOME"/build-cache:/home/wesnoth-travis/build \
--volume "$HOME"/.ccache:/root/.ccache \
--tty wesnoth-repo:"$LTS"-"$BRANCH" \
--cap-add=SYS_PTRACE \
unbuffer ./utils/travis/docker_run.sh "$NLS" "$TOOL" "$CC" "$CXX" "$CXXSTD" "$OPT" "$WML_TESTS" "$WML_TEST_TIME" "$PLAY_TEST" "$MP_TEST" "$BOOST_TEST" "$LTO" "$SAN" "$VALIDATE"
fi

2
utils/travis/test_executor.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash
gdb -q -batch -return-child-result -ex "run" -ex "thread apply all bt" -ex "quit" --args ./boost_unit_tests 2> error.log
gdb -q -batch -return-child-result -ex "set disable-randomization off" -ex "run" -ex "thread apply all bt" -ex "quit" --args ./boost_unit_tests 2> error.log
error_code="$?"
while grep -q 'Could not initialize SDL_video' error.log; do
echo "Could not initialize SDL_video error, retrying..."