mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-30 14:07:59 +00:00
remove atf-run from unittest.sh.in
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
|
||||
PATH="@ATFBIN@:${PATH}"
|
||||
export PATH
|
||||
ATFRUN=`command -v atf-run 2>/dev/null`
|
||||
KYUA=`command -v kyua 2>/dev/null`
|
||||
CMOCKA_MESSAGE_OUTPUT=TAP
|
||||
export CMOCKA_MESSAGE_OUTPUT
|
||||
@@ -13,10 +12,10 @@ then
|
||||
echo "S:unit:`date`"
|
||||
echo "T:unit:1:A"
|
||||
echo "I: unit tests (using kyua)"
|
||||
kyua -v parallelism=${TEST_PARALLEL_JOBS:-1} --logfile kyua.log --loglevel debug test --results-file ${KYUA_RESULT:-NEW}
|
||||
$KYUA -v parallelism=${TEST_PARALLEL_JOBS:-1} --logfile kyua.log --loglevel debug test --results-file ${KYUA_RESULT:-NEW}
|
||||
status=$?
|
||||
|
||||
kyua report --results-file ${KYUA_RESULT:-LATEST}
|
||||
$KYUA report --results-file ${KYUA_RESULT:-LATEST}
|
||||
|
||||
if [ $status -eq 0 ]
|
||||
then
|
||||
@@ -26,24 +25,5 @@ then
|
||||
echo R:FAIL
|
||||
fi
|
||||
echo "E:unit:`date`"
|
||||
elif [ -n "@UNITTESTS@" -a -x "$ATFRUN" -a -f Atffile ]
|
||||
then
|
||||
echo "S:unit:`date`"
|
||||
echo "T:unit:1:A"
|
||||
echo "I: unit tests (using atf-run)"
|
||||
atf-run > atf.out
|
||||
status=$?
|
||||
|
||||
# | cat is there to force non-fancy output
|
||||
atf-report < atf.out | cat
|
||||
|
||||
if [ $status -eq 0 ]
|
||||
then
|
||||
rm -f atf.out
|
||||
echo R:PASS
|
||||
else
|
||||
echo R:FAIL
|
||||
fi
|
||||
echo "E:unit:`date`"
|
||||
fi
|
||||
exit $status
|
||||
|
Reference in New Issue
Block a user