ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '688-prefer-kyua-over-aft-run' into 'master'

Browse Source 
Resolve "prefer kyua over aft-run"

Closes #688

See merge request isc-projects/bind9!1030
This commit is contained in:
Mark Andrews
2018-11-14 06:12:04 -05:00
parent aa2c4bfdc0 590d391bbb
commit ac2ea36fa5
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
unit/unittest.sh.in
View File

@@ -8,7 +8,25 @@ CMOCKA_MESSAGE_OUTPUT=TAP
export CMOCKA_MESSAGE_OUTPUT
status=0
if [ -n "@UNITTESTS@" -a -x "$ATFRUN" -a -f Atffile ]
if [ -n "@UNITTESTS@" -a -x "$KYUA" -a -f Kyuafile ]
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}
status=$?
kyua report --results-file ${KYUA_RESULT:-LATEST}
if [ $status -eq 0 ]
then
rm -f kyua.log
echo R:PASS
else
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"
@@ -27,23 +45,5 @@ then
echo R:FAIL
fi
echo "E:unit:`date`"
elif [ -n "@UNITTESTS@" -a -x "$KYUA" -a -f Kyuafile ]
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}
status=$?
kyua report --results-file ${KYUA_RESULT:-LATEST}
if [ $status -eq 0 ]
then
rm -f kyua.log
echo R:PASS
else
echo R:FAIL
fi
echo "E:unit:`date`"
fi
exit $status