mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

remove atf-run from unittest.sh.in

Browse Source
This commit is contained in:
Evan Hunt
2018-11-14 22:22:32 +00:00
parent 336d5a5374
commit d534ae5c12
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
unit/unittest.sh.in
View File

@@ -2,7 +2,6 @@
PATH="@ATFBIN@:${PATH}" PATH="@ATFBIN@:${PATH}"
export PATH export PATH
ATFRUN=`command -v atf-run 2>/dev/null`
KYUA=`command -v kyua 2>/dev/null` KYUA=`command -v kyua 2>/dev/null`
CMOCKA_MESSAGE_OUTPUT=TAP CMOCKA_MESSAGE_OUTPUT=TAP
export CMOCKA_MESSAGE_OUTPUT export CMOCKA_MESSAGE_OUTPUT
@@ -13,10 +12,10 @@ then
echo "S:unit:`date`" echo "S:unit:`date`"
echo "T:unit:1:A" echo "T:unit:1:A"
echo "I: unit tests (using kyua)" 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=$? status=$?
kyua report --results-file ${KYUA_RESULT:-LATEST} $KYUA report --results-file ${KYUA_RESULT:-LATEST}
if [ $status -eq 0 ] if [ $status -eq 0 ]
then then
@@ -26,24 +25,5 @@ then
echo R:FAIL echo R:FAIL
fi fi
echo "E:unit:`date`" 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 fi
exit $status exit $status