Attempt to fix gdb error when attempting to disable aslr

wesnoth · Jul 25, 2019 · b0200d1 · b0200d1
1 parent 4607205
commit b0200d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/utils/travis/play_test_executor.sh b/utils/travis/play_test_executor.sh
@@ -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..."

diff --git a/utils/travis/steps/script.sh b/utils/travis/steps/script.sh
@@ -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
diff --git a/utils/travis/test_executor.sh b/utils/travis/test_executor.sh
@@ -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..."