kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test: fixed test.log name

master
Harald Hoyer 2018-08-16 11:13:55 +02:00
parent 0ae5848245
commit 67f43d2124
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/test-functions
View File

@ -54,7 +54,7 @@ while (($# > 0)); do
exit $?;; exit $?;;
--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
@ -68,7 +68,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 >test-${TEST_RUN_ID:+-$TEST_RUN_ID}.log 2>&1 ) </dev/null >test${TEST_RUN_ID:+-$TEST_RUN_ID}.log 2>&1
elif [[ "$V" == "2" ]]; then elif [[ "$V" == "2" ]]; then
set -o pipefail set -o pipefail
( (
@ -81,7 +81,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
set -o pipefail set -o pipefail
( (
@ -94,20 +94,20 @@ 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
fi fi
ret=$? ret=$?
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
cat $(pwd)/server${TEST_RUN_ID:+-$TEST_RUN_ID}.log $(pwd)/test-${TEST_RUN_ID:+-$TEST_RUN_ID}.log cat $(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
fi fi
exit $ret;; exit $ret;;