]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
travis: add MAKE_CHECK_OPTS
authorKarel Zak <kzak@redhat.com>
Tue, 17 Mar 2015 11:03:28 +0000 (12:03 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 17 Mar 2015 11:03:28 +0000 (12:03 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
.travis-functions.sh

index ee4988d9e078cc68e4ed2689d2d1950572cef9c0..86146b0cdce60e39e1a2246fcb005f1aecf74fef 100755 (executable)
@@ -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
 }