travis: don't call tests in parallel for root

Let's make it more readable in logs for root user.

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

diff --git a/.travis-functions.sh b/.travis-functions.sh
index ba7ba1eaf85edbae40ab6cb0682ad1c1fb8751ad..c8c0e4cffa168bc07ad832b2004d1cf72d3275b5 100755 (executable)
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -64,6 +64,8 @@ function check_nonroot
        $MAKE || return
 
        osx_prepare_check
+
+       # TS_OPTS= overwrites default from tests/Makemodule.am
        $MAKE check TS_OPTS="$make_opts" || return
 
        make_checkusage || return
@@ -84,9 +86,14 @@ function check_root
        xconfigure $conf_opts || return
        $MAKE || return
 
-       $MAKE check TS_COMMAND="true" || return
+       # compile tests only
+       $MAKE check-programs || return
+
+       # Modify environment for OSX
        osx_prepare_check
-       sudo -E $MAKE check TS_OPTS="$make_opts" || return
+
+       # TS_OPTS= overwrites default from tests/Makemodule.am
+       sudo -E $MAKE check TS_PARALLEL="" TS_OPTS="$make_opts" || return
 
        # root on osx has not enough permission for make install ;)
        [ "$TRAVIS_OS_NAME" = "osx" ] && return

diff --git a/tests/Makemodule.am b/tests/Makemodule.am
index 61798c98efeb8dcf3cd0a346ec256f51659dc39e..9be544f4a36eb6f01196bb08ddf693dfe3f7c6d0 100644 (file)
--- a/tests/Makemodule.am
+++ b/tests/Makemodule.am
@@ -14,9 +14,10 @@ clean-local-tests:
 CLEAN_LOCALS += clean-local-tests
 
 TS_OPTS = --nonroot
+TS_PARALLEL = --parallel
 TS_COMMAND = $(top_srcdir)/tests/run.sh \
        --srcdir=$(abs_top_srcdir) --builddir=$(abs_top_builddir) \
-       --parallel $(TS_OPTS)
+       $(TS_PARALLEL) $(TS_OPTS)
 
 check-local-tests: $(check_PROGRAMS)
        $(AM_V_GEN) $(TS_COMMAND)