summaryrefslogtreecommitdiffstats
path: root/CIbuild.sh
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-12-22 19:25:46 +0100
committerAlexander Harkness <me@bearbin.net>2017-12-22 19:25:46 +0100
commit832b39471512fa9543f981053573fb6b3342a396 (patch)
tree5738e02d526f882f9497d4d7d44d0e3aa9043230 /CIbuild.sh
parentFix typo in #4095. (diff)
downloadcuberite-832b39471512fa9543f981053573fb6b3342a396.tar
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.gz
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.bz2
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.lz
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.xz
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.zst
cuberite-832b39471512fa9543f981053573fb6b3342a396.zip
Diffstat (limited to '')
-rwxr-xr-xCIbuild.sh23
1 files changed, 9 insertions, 14 deletions
diff --git a/CIbuild.sh b/CIbuild.sh
index f152a15e1..b1d4d1b3c 100755
--- a/CIbuild.sh
+++ b/CIbuild.sh
@@ -6,11 +6,6 @@ export CUBERITE_BUILD_SERIES_NAME="Travis $CC $TRAVIS_CUBERITE_BUILD_TYPE"
export CUBERITE_BUILD_ID=$TRAVIS_JOB_NUMBER
export CUBERITE_BUILD_DATETIME=`date`
-if [ "$CXX" == "g++" ]; then
- # This is a temporary workaround to allow the identification of GCC-4.8 by CMake, required for C++11 features
- # Travis Docker containers don't allow sudo, which update-alternatives needs, and it seems no alternative to this command is provided, hence:
- export CXX="/usr/bin/g++-4.8"
-fi
cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1;
echo "Building..."
@@ -22,22 +17,22 @@ echo -e "define hook-quit\n\tset confirm off\nend\n" > ~/.gdbinit
echo "Testing..."
-# OSX builds need sudo because gdb isn't signed
+# OSX builds don't have gdb
if [ "$TRAVIS_OS_NAME" = osx ]; then
- GDB_COMMAND="sudo gdb"
+ GDB_COMMAND=""
else
- GDB_COMMAND="gdb"
+ GDB_COMMAND="gdb -return-child-result -ex run -ex \"bt\" -ex \"info threads\" -ex \"thread apply all bt\" -ex \"quit\" --args"
fi
cd Server/;
touch apiCheckFailed.flag
if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then
- ${GDB_COMMAND} -return-child-result -ex run -ex "bt" -ex "info threads" -ex "thread apply all bt" -ex "quit" --args $CUBERITE_PATH << EOF
-load APIDump
-apicheck
-restart
-stop
-EOF
+ ${GDB_COMMAND} ${CUBERITE_PATH} <<- EOF
+ load APIDump
+ apicheck
+ restart
+ stop
+ EOF
if [ -f ./NewlyUndocumented.lua ]; then
echo "ERROR: Newly undocumented API symbols found:"
cat ./NewlyUndocumented.lua