From: Evan Hunt <each@isc.org>
Date: Wed, 14 Nov 2018 22:22:32 +0000 (+0000)
Subject: remove atf-run from unittest.sh.in
X-Git-Tag: v9.13.4~21^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d534ae5c126cb881e0089fa20c37eeee3a30f7fc;p=thirdparty%2Fbind9.git

remove atf-run from unittest.sh.in
---

diff --git a/unit/unittest.sh.in b/unit/unittest.sh.in
index 3300c61cfab..eb6c29735c3 100755
--- a/unit/unittest.sh.in
+++ b/unit/unittest.sh.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