summaryrefslogtreecommitdiffstats
path: root/.travis-functions.sh
diff options
context:
space:
mode:
authorKarel Zak2015-03-17 12:03:28 +0100
committerKarel Zak2015-03-17 12:03:28 +0100
commit266f8562608cebb28fcfea1aae1001789f5df4df (patch)
tree568499796a77dc113c3616f8c6fb44a312264a40 /.travis-functions.sh
parenttests: add --skip-loopdevs (diff)
downloadkernel-qcow2-util-linux-266f8562608cebb28fcfea1aae1001789f5df4df.tar.gz
kernel-qcow2-util-linux-266f8562608cebb28fcfea1aae1001789f5df4df.tar.xz
kernel-qcow2-util-linux-266f8562608cebb28fcfea1aae1001789f5df4df.zip
travis: add MAKE_CHECK_OPTS
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to '.travis-functions.sh')
-rwxr-xr-x.travis-functions.sh8
1 files changed, 6 insertions, 2 deletions
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
}