fix(test/test-functions): shellcheck for test/test-functions
parent
e010f45524
commit
baa4acd402
|
@ -2,6 +2,7 @@
|
||||||
PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
||||||
export PATH
|
export PATH
|
||||||
|
|
||||||
|
# shellcheck disable=SC1090
|
||||||
[[ -e .testdir${TEST_RUN_ID:+-$TEST_RUN_ID} ]] && . .testdir${TEST_RUN_ID:+-$TEST_RUN_ID}
|
[[ -e .testdir${TEST_RUN_ID:+-$TEST_RUN_ID} ]] && . .testdir${TEST_RUN_ID:+-$TEST_RUN_ID}
|
||||||
if [[ -z $TESTDIR ]] || [[ ! -d $TESTDIR ]]; then
|
if [[ -z $TESTDIR ]] || [[ ! -d $TESTDIR ]]; then
|
||||||
TESTDIR=$(mktemp -d -p "/var/tmp" -t dracut-test.XXXXXX)
|
TESTDIR=$(mktemp -d -p "/var/tmp" -t dracut-test.XXXXXX)
|
||||||
|
@ -60,10 +61,10 @@ while (($# > 0)); do
|
||||||
--all)
|
--all)
|
||||||
check_root
|
check_root
|
||||||
if ! test_check 2 &> test${TEST_RUN_ID:+-$TEST_RUN_ID}.log; then
|
if ! test_check 2 &> test${TEST_RUN_ID:+-$TEST_RUN_ID}.log; then
|
||||||
echo -e "TEST: $TEST_DESCRIPTION " $COLOR_WARNING "[SKIPPED]" $COLOR_NORMAL
|
echo -e "TEST: $TEST_DESCRIPTION " "$COLOR_WARNING" "[SKIPPED]" "$COLOR_NORMAL"
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
echo -e "TEST: $TEST_DESCRIPTION " $COLOR_SUCCESS "[STARTED]" $COLOR_NORMAL
|
echo -e "TEST: $TEST_DESCRIPTION " "$COLOR_SUCCESS" "[STARTED]" "$COLOR_NORMAL"
|
||||||
fi
|
fi
|
||||||
if [[ $V == "1" ]]; then
|
if [[ $V == "1" ]]; then
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
@ -77,9 +78,10 @@ while (($# > 0)); do
|
||||||
rm -fr -- "$TESTDIR"
|
rm -fr -- "$TESTDIR"
|
||||||
rm -f -- .testdir${TEST_RUN_ID:+-$TEST_RUN_ID}
|
rm -f -- .testdir${TEST_RUN_ID:+-$TEST_RUN_ID}
|
||||||
exit $ret
|
exit $ret
|
||||||
) < /dev/null 2>&1 | tee test${TEST_RUN_ID:+-$TEST_RUN_ID}.log
|
) < /dev/null 2>&1 | tee "test${TEST_RUN_ID:+-$TEST_RUN_ID}.log"
|
||||||
elif [[ $V == "2" ]]; then
|
elif [[ $V == "2" ]]; then
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
# shellcheck disable=SC2154
|
||||||
(
|
(
|
||||||
test_setup && test_run
|
test_setup && test_run
|
||||||
ret=$?
|
ret=$?
|
||||||
|
@ -90,7 +92,7 @@ while (($# > 0)); do
|
||||||
rm -fr -- "$TESTDIR"
|
rm -fr -- "$TESTDIR"
|
||||||
rm -f -- .testdir${TEST_RUN_ID:+-$TEST_RUN_ID}
|
rm -f -- .testdir${TEST_RUN_ID:+-$TEST_RUN_ID}
|
||||||
exit $ret
|
exit $ret
|
||||||
) < /dev/null 2>&1 | $basedir/logtee test${TEST_RUN_ID:+-$TEST_RUN_ID}.log
|
) < /dev/null 2>&1 | "$basedir/logtee" "test${TEST_RUN_ID:+-$TEST_RUN_ID}.log"
|
||||||
else
|
else
|
||||||
(
|
(
|
||||||
test_setup && test_run
|
test_setup && test_run
|
||||||
|
@ -105,12 +107,12 @@ while (($# > 0)); do
|
||||||
set +o pipefail
|
set +o pipefail
|
||||||
if [ $ret -eq 0 ]; then
|
if [ $ret -eq 0 ]; then
|
||||||
rm -- test${TEST_RUN_ID:+-$TEST_RUN_ID}.log
|
rm -- test${TEST_RUN_ID:+-$TEST_RUN_ID}.log
|
||||||
echo -e "TEST: $TEST_DESCRIPTION " $COLOR_SUCCESS "[OK]" $COLOR_NORMAL
|
echo -e "TEST: $TEST_DESCRIPTION " "$COLOR_SUCCESS" "[OK]" "$COLOR_NORMAL"
|
||||||
else
|
else
|
||||||
echo -e "TEST: $TEST_DESCRIPTION " $COLOR_FAILURE "[FAILED]" $COLOR_NORMAL
|
echo -e "TEST: $TEST_DESCRIPTION " "$COLOR_FAILURE" "[FAILED]" "$COLOR_NORMAL"
|
||||||
if [ "$V" == "2" ]; then
|
if [ "$V" == "2" ]; then
|
||||||
tail -c 1048576 $(pwd)/server${TEST_RUN_ID:+-$TEST_RUN_ID}.log $(pwd)/test${TEST_RUN_ID:+-$TEST_RUN_ID}.log
|
tail -c 1048576 "$(pwd)/server${TEST_RUN_ID:+-$TEST_RUN_ID}.log" "$(pwd)/test${TEST_RUN_ID:+-$TEST_RUN_ID}.log"
|
||||||
echo -e "TEST: $TEST_DESCRIPTION " $COLOR_FAILURE "[FAILED]" $COLOR_NORMAL
|
echo -e "TEST: $TEST_DESCRIPTION " "$COLOR_FAILURE" "[FAILED]" "$COLOR_NORMAL"
|
||||||
else
|
else
|
||||||
echo "see $(pwd)/test${TEST_RUN_ID:+-$TEST_RUN_ID}.log"
|
echo "see $(pwd)/test${TEST_RUN_ID:+-$TEST_RUN_ID}.log"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue