From 266f8562608cebb28fcfea1aae1001789f5df4df Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 17 Mar 2015 12:03:28 +0100 Subject: travis: add MAKE_CHECK_OPTS Signed-off-by: Karel Zak --- .travis-functions.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '.travis-functions.sh') diff --git a/.travis-functions.sh b/.travis-functions.sh index ee4988d9e..86146b0cd 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 } -- cgit v1.2.3-55-g7522