From: Karel Zak <kzak@redhat.com>
Date: Tue, 17 Mar 2015 11:03:28 +0000 (+0100)
Subject: travis: add MAKE_CHECK_OPTS
X-Git-Tag: v2.26.2~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=467eb52e9fd9e240ebb692e34abb016807029b51;p=thirdparty%2Futil-linux.git

travis: add MAKE_CHECK_OPTS

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/.travis-functions.sh b/.travis-functions.sh
index ee4988d9e0..86146b0cdc 100755
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -39,6 +39,8 @@ function configure_travis
 
 function check_nonroot
 {
+	local opts="$MAKE_CHECK_OPTS"
+
 	configure_travis \
 		--disable-use-tty-group \
 		--with-python \
@@ -46,19 +48,21 @@ function check_nonroot
 		--enable-gtk-doc \
 		|| return
 	$MAKE || return
-	$MAKE check || return
+	$MAKE check TS_OPTS="$opts" || return
 	$MAKE install DESTDIR=/tmp/dest || return
 }
 
 function check_root
 {
+	local opts="$MAKE_CHECK_OPTS --parallel=1"
+
 	configure_travis \
 		--with-python \
 		--enable-all-programs \
 		|| return
 	$MAKE || return
 	$MAKE check TS_COMMAND="true" || return
-	sudo -E $MAKE check TS_OPTS='--parallel=1' || return
+	sudo -E $MAKE check TS_OPTS="$opts" || return
 	sudo $MAKE install || return
 }