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

Merge branch 'tests-features' of https://github.com/rudimeier/util-linux 

* 'tests-features' of https://github.com/rudimeier/util-linux:
  tests: style Makefile and make output
  tests: allow to add or override test suite options
  tests: add exit case "KNOWN FAILED"
  tests: fix var names
  tests: allow test options to be overridden by env
  tests: call ts_init_env as early as possible
This commit is contained in:
Karel Zak 2014-05-12 12:32:33 +02:00
parent 6e69f1ee0f 9b240fd03a
commit 8e3ac29e8b
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Makemodule.am
View File

@ -13,8 +13,12 @@ clean-local-tests:
CLEAN_LOCALS += clean-local-tests
TS_OPTS = --nonroot
TS_COMMAND = $(top_srcdir)/tests/run.sh \
--srcdir=$(abs_top_srcdir) --builddir=$(abs_top_builddir) \
--parallel $(TS_OPTS)
check-local-tests: $(check_PROGRAMS)
$(top_srcdir)/tests/run.sh --parallel --srcdir=$(abs_top_srcdir) --builddir=$(abs_top_builddir) --nonroot
$(AM_V_GEN) $(TS_COMMAND)
CHECK_LOCALS += check-local-tests

46
tests/functions.sh
View File

@ -76,6 +76,15 @@ function ts_failed {
exit 1
}
function ts_known_failed {
if [ x"$1" == x"" ]; then
ts_report " KNOWN FAILED ($TS_NS)"
else
ts_report " KNOWN FAILED ($1)"
fi
exit 0
}
function ts_ok_subtest {
if [ x"$1" == x"" ]; then
ts_report " OK"
@ -97,6 +106,24 @@ function ts_log {
function ts_has_option {
NAME="$1"
ALL="$2"
# user may set options by env for a single test or whole component
# e.g. TS_OPT_ipcs_limits2_fake="yes" or TS_OPT_ipcs_fake="yes"
local v_test=${TS_TESTNAME//[-.]/_}
local v_comp=${TS_COMPONENT//[-.]/_}
local v_name=${NAME//[-.]/_}
eval local env_opt_test=\$TS_OPT_${v_comp}_${v_test}_${v_name}
eval local env_opt_comp=\$TS_OPT_${v_comp}_${v_name}
if [ "$env_opt_test" = "yes" \
-o "$env_opt_comp" = "yes" -a "$env_opt_test" != "no" ]; then
echo "yes"
return
elif [ "$env_opt_test" = "no" \
-o "$env_opt_comp" = "no" -a "$env_opt_test" != "yes" ]; then
return
fi
# or just check the global command line options
echo -n $ALL | sed 's/ //g' | awk 'BEGIN { FS="="; RS="--" } /('$NAME'$|'$NAME'=)/ { print "yes" }'
}
@ -132,6 +159,7 @@ function ts_init_core_subtest_env {
function ts_init_env {
local mydir=$(ts_abspath ${0%/*})
local tmp
LANG="POSIX"
LANGUAGE="POSIX"
@ -177,6 +205,12 @@ function ts_init_env {
TS_VERBOSE=$(ts_has_option "verbose" "$*")
TS_PARALLEL=$(ts_has_option "parallel" "$*")
TS_KNOWN_FAIL=$(ts_has_option "known-fail" "$*")
tmp=$( ts_has_option "memcheck" "$*")
if [ "$tmp" == "yes" -a -f /usr/bin/valgrind ]; then
TS_VALGRIND_CMD="/usr/bin/valgrind"
fi
BLKID_FILE="$TS_OUTDIR/${TS_TESTNAME}.blkidtab"
@ -233,15 +267,10 @@ function ts_init_subtest {
}
function ts_init {
ts_init_env "$*"
local is_fake=$( ts_has_option "fake" "$*")
local is_force=$( ts_has_option "force" "$*")
local is_memcheck=$( ts_has_option "memcheck" "$*")
if [ "$is_memcheck" == "yes" -a -f /usr/bin/valgrind ]; then
TS_VALGRIND_CMD="/usr/bin/valgrind"
fi
ts_init_env "$*"
if [ "$TS_PARALLEL" == "yes" ]; then
TS_TITLE=$(printf "%13s: %-30s ..." "$TS_COMPONENT" "$TS_DESC")
@ -364,6 +393,9 @@ function ts_finalize {
if [ -s $TS_EXPECTED ]; then
ts_gen_diff
if [ $? -eq 1 ]; then
if [ "$TS_KNOWN_FAIL" = "yes" ]; then
ts_known_failed "$1"
fi
ts_failed "$1"
fi
ts_ok "$1"