X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=.travis-functions.sh;h=ba7ba1eaf85edbae40ab6cb0682ad1c1fb8751ad;hb=0d955cd8ac75f3da301e0adf89d46ba39045a7e9;hp=f0a0d8990f474825fcccd5efafddc2a2fb7aa0ee;hpb=d1a7c00eaed1b37bae81c67b038c40bd49384eb3;p=thirdparty%2Futil-linux.git

diff --git a/.travis-functions.sh b/.travis-functions.sh
index f0a0d8990f..ba7ba1eaf8 100755
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -49,17 +49,22 @@ function make_checkusage
 
 function check_nonroot
 {
-	local opts="$MAKE_CHECK_OPTS --show-diff"
-
-	xconfigure \
+	local make_opts="$MAKE_CHECK_OPTS --show-diff"
+	local conf_opts="\
 		--disable-use-tty-group \
 		--disable-makeinstall-chown \
-		--enable-all-programs \
-		|| return
+		--enable-all-programs"
+
+	if [ "$TRAVIS_OS_NAME" != "osx" ]; then
+		conf_opts="$conf_opts --enable-asan"
+		make_opts="$make_opts --memcheck-asan"
+	fi
+
+	xconfigure $conf_opts || return
 	$MAKE || return
 
 	osx_prepare_check
-	$MAKE check TS_OPTS="$opts" || return
+	$MAKE check TS_OPTS="$make_opts" || return
 
 	make_checkusage || return
 
@@ -68,16 +73,23 @@ function check_nonroot
 
 function check_root
 {
-	local opts="$MAKE_CHECK_OPTS --parallel=1 --show-diff"
+	local make_opts="$MAKE_CHECK_OPTS --show-diff"
+	local conf_opts="--enable-all-programs"
 
-	xconfigure \
-		--enable-all-programs \
-		|| return
+	if [ "$TRAVIS_OS_NAME" != "osx" ]; then
+		conf_opts="$conf_opts --enable-asan"
+		make_opts="$make_opts --memcheck-asan"
+	fi
+
+	xconfigure $conf_opts || return
 	$MAKE || return
 
 	$MAKE check TS_COMMAND="true" || return
 	osx_prepare_check
-	sudo -E $MAKE check TS_OPTS="$opts" || return
+	sudo -E $MAKE check TS_OPTS="$make_opts" || return
+
+	# root on osx has not enough permission for make install ;)
+	[ "$TRAVIS_OS_NAME" = "osx" ] && return
 
 	# keep PATH to make sure sudo would find $CC
 	sudo env "PATH=$PATH" $MAKE install || return
@@ -123,7 +135,6 @@ function travis_install_script
 function osx_install_script
 {
 	brew update >/dev/null
-	brew tap homebrew/dupes
 
 	brew install gettext ncurses socat xz
 	brew link --force gettext