aboutsummaryrefslogtreecommitdiff
path: root/util/travis
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2016-03-19 01:21:58 -0400
committerShadowNinja <shadowninja@minetest.net>2016-03-19 21:27:57 -0400
commiteb7db21d50f866d1e847d7556f83995294a7e54f (patch)
tree9e608365cebd1d577f9ea2f18b1e678a9403951c /util/travis
parent2ce02c99b4dee5c2c6c6260d1a7ff522c89db878 (diff)
downloadminetest-eb7db21d50f866d1e847d7556f83995294a7e54f.tar.gz
minetest-eb7db21d50f866d1e847d7556f83995294a7e54f.tar.bz2
minetest-eb7db21d50f866d1e847d7556f83995294a7e54f.zip
Tweak travis script
Exit if cd fails and don't insert '\' in string.
Diffstat (limited to 'util/travis')
-rwxr-xr-xutil/travis/script.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/util/travis/script.sh b/util/travis/script.sh
index 5be747e51..870954ebb 100755
--- a/util/travis/script.sh
+++ b/util/travis/script.sh
@@ -2,10 +2,8 @@
if [[ $PLATFORM == "Unix" ]]; then
mkdir -p travisbuild
- cd travisbuild
- CMAKE_FLAGS='-DCMAKE_BUILD_TYPE=Debug \
- -DRUN_IN_PLACE=TRUE \
- -DENABLE_GETTEXT=TRUE'
+ cd travisbuild || exit 1
+ CMAKE_FLAGS=''
# Clang builds with FreeType fail on Travis
if [[ $CC == "clang" ]]; then
CMAKE_FLAGS+=' -DENABLE_FREETYPE=FALSE'
@@ -13,7 +11,10 @@ if [[ $PLATFORM == "Unix" ]]; then
if [[ $TRAVIS_OS_NAME == "osx" ]]; then
CMAKE_FLAGS+=' -DCUSTOM_GETTEXT_PATH=/usr/local/opt/gettext'
fi
- cmake $CMAKE_FLAGS ..
+ cmake -DCMAKE_BUILD_TYPE=Debug \
+ -DRUN_IN_PLACE=TRUE \
+ -DENABLE_GETTEXT=TRUE \
+ $CMAKE_FLAGS ..
make -j2
echo "Running unit tests."
../bin/minetest --run-unittests && exit 0
@@ -34,9 +35,9 @@ elif [[ $PLATFORM == Win* ]]; then
export EXISTING_MINETEST_DIR=$OLDDIR
export NO_MINETEST_GAME=1
if [[ $PLATFORM == "Win32" ]]; then
- $OLDDIR/util/buildbot/buildwin32.sh travisbuild && exit 0
+ "$OLDDIR/util/buildbot/buildwin32.sh" travisbuild && exit 0
elif [[ $PLATFORM == "Win64" ]]; then
- $OLDDIR/util/buildbot/buildwin64.sh travisbuild && exit 0
+ "$OLDDIR/util/buildbot/buildwin64.sh" travisbuild && exit 0
fi
else
echo "Unknown platform \"${PLATFORM}\"."