X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=.travis-functions.sh;h=ba7ba1eaf85edbae40ab6cb0682ad1c1fb8751ad;hb=02a51ce1e3d8cd7b7d41fc8d84018f421b1aa553;hp=684c20588d9c2349517f53e10b110bd0c031c519;hpb=c4127289f2541e594a3a12bc2d4c24805492dc97;p=thirdparty%2Futil-linux.git

diff --git a/.travis-functions.sh b/.travis-functions.sh
index 684c20588d..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,20 @@ function check_nonroot
 
 function check_root
 {
-	local opts="$MAKE_CHECK_OPTS --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