aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rwxr-xr-xutil/travis/before_install.sh3
-rwxr-xr-xutil/travis/script.sh9
2 files changed, 11 insertions, 1 deletions
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh
index 891371984..ea85b3db6 100755
--- a/util/travis/before_install.sh
+++ b/util/travis/before_install.sh
@@ -18,6 +18,9 @@ if [[ $PLATFORM == "Unix" ]]; then
# Linking to LevelDB is broken, use a custom build
wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z
sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z
+ if [[ "$VALGRIND" == "1" ]]; then
+ sudo apt-get install valgrind
+ fi
else
brew update
brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit
diff --git a/util/travis/script.sh b/util/travis/script.sh
index 24a74d186..84ea578a5 100755
--- a/util/travis/script.sh
+++ b/util/travis/script.sh
@@ -24,8 +24,15 @@ if [[ $PLATFORM == "Unix" ]]; then
-DBUILD_SERVER=TRUE \
$CMAKE_FLAGS ..
make -j2
+
echo "Running unit tests."
- ../bin/minetest --run-unittests && exit 0
+ CMD="../bin/minetest --run-unittests"
+ if [[ "$VALGRIND" == "1" ]]; then
+ valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ${CMD} && exit 0
+ else
+ ${CMD} && exit 0
+ fi
+
elif [[ $PLATFORM == Win* ]]; then
[[ $CC == "clang" ]] && exit 1 # Not supposed to happen
# We need to have our build directory outside of the minetest directory because