ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build-sys: cleanup prefixed used for tests 

It's ugly to use the same TS_ prefix in tests as well as in
build-system (e.g. make check), because then some env. variable can be
interpreted by our regression tests. For example TS_PARALLEL=.

It's seems better to use TS_ exclusively for tests and TESTS_ for
build-system.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2019-10-09 12:31:28 +02:00
parent 571f5f5ba1
commit 060c4cee0f
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.travis-functions.sh
View File

@ -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_OPTION=
# 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
@ -65,8 +79,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 +106,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=--parallel=none" TS_OPTS="$make_opts" || return
# TESTS_* overwrites default from tests/Makemodule.am
sudo -E $MAKE check "TESTS_PARALLEL_OPTION=--parallel=none" TESTS_OPTIONS="$make_opts" || return
# root on osx has not enough permission for make install ;)
[ "$TRAVIS_OS_NAME" = "osx" ] && return

14
tests/Makemodule.am
View File

@ -13,13 +13,15 @@ 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) \
$(TS_PARALLEL) $(TS_OPTS)
TESTS_OPTIONS = --nonroot
TESTS_PARALLEL_OPTION = --parallel
TESTS_COMMAND = $(top_srcdir)/tests/run.sh \
--srcdir=$(abs_top_srcdir) \
--builddir=$(abs_top_builddir) \
$(TESTS_PARALLEL_OPTION) \
$(TESTS_OPTIONS)
check-local-tests: $(check_PROGRAMS)
$(AM_V_GEN) $(TS_COMMAND)
$(AM_V_GEN) $(TESTS_COMMAND)
CHECK_LOCALS += check-local-tests