Travis: Remove gdb (#4140)

This commit is contained in:
peterbell10 2018-01-14 15:08:08 +00:00 committed by Alexander Harkness
parent 4242431407
commit 44519225b2
2 changed files with 1 additions and 21 deletions

View File

@ -18,27 +18,18 @@ matrix:
- TRAVIS_CUBERITE_BUILD_TYPE=DEBUG CUBERITE_PATH=./Cuberite_debug - TRAVIS_CUBERITE_BUILD_TYPE=DEBUG CUBERITE_PATH=./Cuberite_debug
# Default clang # Default clang
- compiler: clang - compiler: clang
addons: &gdb
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gdb
env: *Release env: *Release
- compiler: clang - compiler: clang
addons: *gdb
env: *Debug env: *Debug
# clang 3.5 # clang 3.5
- compiler: clang - compiler: clang
addons: &clang35 addons: &clang35
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.5 - llvm-toolchain-precise-3.5
packages: packages:
- clang++-3.5 - clang++-3.5
- clang-3.5 - clang-3.5
- gdb
before_install: before_install:
- CC=clang-3.5;CXX=clang++-3.5 - CC=clang-3.5;CXX=clang++-3.5
env: *Release env: *Release
@ -56,7 +47,6 @@ matrix:
packages: packages:
- g++-4.8 - g++-4.8
- gcc-4.8 - gcc-4.8
- gdb
before_install: before_install:
- CC=gcc-4.8;CXX=g++-4.8 - CC=gcc-4.8;CXX=g++-4.8
env: *Release env: *Release

View File

@ -12,22 +12,12 @@ echo "Building..."
cmake --build . -- -j 2; cmake --build . -- -j 2;
ctest -j 2 -V; ctest -j 2 -V;
# Create .gdbinit in home directory. Switches off the confirmation on quit
echo -e "define hook-quit\n\tset confirm off\nend\n" > ~/.gdbinit
echo "Testing..." echo "Testing..."
# OSX builds don't have gdb
if [ "$TRAVIS_OS_NAME" = osx ]; then
GDB_COMMAND=""
else
GDB_COMMAND="gdb -return-child-result -ex run -ex \"bt\" -ex \"info threads\" -ex \"thread apply all bt\" -ex \"quit\" --args"
fi
cd Server/; cd Server/;
touch apiCheckFailed.flag touch apiCheckFailed.flag
if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then
${GDB_COMMAND} ${CUBERITE_PATH} <<- EOF ${CUBERITE_PATH} <<- EOF
load APIDump load APIDump
apicheck apicheck
restart restart