diff options
| author | Karel Zak | 2019-03-05 11:06:41 +0100 |
|---|---|---|
| committer | Karel Zak | 2019-03-05 11:06:41 +0100 |
| commit | 7c90efa384cbb2ace873e2b90e8cc396a1719535 (patch) | |
| tree | 72ee38753d663a376938b8898455ece65379f660 /tests | |
| parent | tests: add missing TS_CMD_UMOUNT check (diff) | |
| download | kernel-qcow2-util-linux-7c90efa384cbb2ace873e2b90e8cc396a1719535.tar.gz kernel-qcow2-util-linux-7c90efa384cbb2ace873e2b90e8cc396a1719535.tar.xz kernel-qcow2-util-linux-7c90efa384cbb2ace873e2b90e8cc396a1719535.zip | |
tests: add --noskip-commands
The default is SKIP missing commands on --use-system-commands, but
with --noskip-commands the test will FAIL.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/functions.sh | 9 | ||||
| -rwxr-xr-x | tests/run.sh | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tests/functions.sh b/tests/functions.sh index ab607c4ce..0605a1320 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -85,7 +85,13 @@ function ts_check_test_command { *) # just command names (e.g. --use-system-commands) local cmd=$1 - type "$cmd" >/dev/null 2>&1 || ts_skip "missing in PATH: $cmd" + type "$cmd" >/dev/null 2>&1 + if [ $? -ne 0 ]; then + if [ "$TS_NOSKIP_COMMANDS" = "yes" ]; then + ts_failed "missing in PATH: $cmd" + fi + ts_skip "missing in PATH: $cmd" + fi ;; esac } @@ -301,6 +307,7 @@ function ts_init_env { ts_init_core_env + TS_NOSKIP_COMMANDS=$(ts_has_option "noskip-commands" "$*") TS_VERBOSE=$(ts_has_option "verbose" "$*") TS_SHOWDIFF=$(ts_has_option "show-diff" "$*") TS_PARALLEL=$(ts_has_option "parallel" "$*") diff --git a/tests/run.sh b/tests/run.sh index 881148a06..2a7133149 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -65,6 +65,7 @@ while [ -n "$1" ]; do --show-diff |\ --verbose |\ --skip-loopdevs |\ + --noskip-commands |\ --parsable) # these options are simply forwarded to the test scripts OPTS="$OPTS $1" @@ -113,6 +114,7 @@ while [ -n "$1" ]; do echo " --show-diff show diff from failed tests" echo " --nonroot ignore test suite if user is root" echo " --use-system-commands use PATH rather than builddir" + echo " --noskip-commands fail on missing commands" echo " --srcdir=<path> autotools top source directory" echo " --builddir=<path> autotools top build directory" echo " --parallel=<num> number of parallel test jobs, default: num cpus" |