libfdisk: (gpt) add functionality to move backup header

[thirdparty/util-linux.git] / .travis-functions.sh

diff --git a/.travis-functions.sh b/.travis-functions.sh
index a608e3ac84c625b5347697af0413e006de8bfa49..992905a1639eb4e0b2a272cb113c7c2368b2f4d5 100755 (executable)
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -5,6 +5,20 @@
 #   - helper functions to be sourced from .travis.yml
 #   - designed to respect travis' environment but testing locally is possible
 #
+# Variables:
+#
+#   TS_OPT_<name>_<something>=yes
+#          - forces tests/functions.sh:ts_has_option() to return "yes" for
+#            variable <something> in test <name>
+#
+#   TESTS_OPTIONS=
+#   TESTS_PARALLEL=
+#   TESTS_COMMAND=
+#          - overwrites default from tests/Makemodule.am
+#
+#   Do not use TS_* prefix for any travis or build-system stuff. This prefix is
+#   exclusively used by tests/ stuff.
+#
 
 if [ ! -f "configure.ac" ]; then
        echo ".travis-functions.sh must be sourced from source dir" >&2
@@ -15,7 +29,6 @@ fi
 # travis docs say we get 1.5 CPUs
 MAKE="make -j2"
 DUMP_CONFIG_LOG="short"
-export TS_OPT_parsable="yes"
 
 # workaround ugly warning on travis OSX,
 # see https://github.com/direnv/direnv/issues/210
@@ -49,7 +62,7 @@ function make_checkusage
 
 function check_nonroot
 {
-       local make_opts="$MAKE_CHECK_OPTS --show-diff"
+       local make_opts="$MAKE_CHECK_OPTS --show-diff --parsable"
        local conf_opts="\
                --disable-use-tty-group \
                --disable-makeinstall-chown \
@@ -65,8 +78,8 @@ function check_nonroot
 
        osx_prepare_check
 
-       # TS_OPTS= overwrites default from tests/Makemodule.am
-       $MAKE check TS_OPTS="$make_opts" || return
+       # TESTS_* overwrites default from tests/Makemodule.am
+       $MAKE check TESTS_OPTIONS="$make_opts" || return
 
        make_checkusage || return
 
@@ -92,8 +105,8 @@ function check_root
        # Modify environment for OSX
        osx_prepare_check
 
-       # TS_OPTS= overwrites default from tests/Makemodule.am
-       sudo -E $MAKE check TS_PARALLEL=' ' TS_OPTS="$make_opts" || return
+       # TESTS_* overwrites default from tests/Makemodule.am
+       sudo -E $MAKE check TESTS_PARALLEL="" TESTS_OPTIONS="$make_opts" || return
 
        # root on osx has not enough permission for make install ;)
        [ "$TRAVIS_OS_NAME" = "osx" ] && return