From a2ce1df772a15220e4b9220ba0c884891c980b0f Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Wed, 26 Feb 2014 22:23:51 -0300
Subject: Modify travis configuration to install valgrind

This should fix previous build failures
---
 scripts/travis.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/travis.sh b/scripts/travis.sh
index 5662f5f06d..ff0a625d6e 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -1,12 +1,11 @@
-#!/bin/sh
+#!/bin/sh -e
 
 export VALGRIND_CHECK=1
-make cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$PWD/dist" || exit 1
-make || exit 1
+make cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$PWD/dist"
+make
 echo "Running tests with valgrind..."
 if ! make test > /dev/null 2>&1; then
-	failed=$(ls src/testdir/valgrind.*)
-	if [ -n "$failed" ]; then
+	if ls src/testdir/valgrind.* > /dev/null 2>&1; then
 		echo "Memory leak detected" >&2 
 		cat src/testdir/valgrind.*
 	else
-- 
cgit