From: Mark Andrews <marka@isc.org>
Date: Mon, 12 Nov 2018 20:57:44 +0000 (+1100)
Subject: prefer kyua over atf
X-Git-Tag: v9.13.4~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=590d391bbbb71ae089df14a14e0068aa4b3f200b;p=thirdparty%2Fbind9.git

prefer kyua over atf
---

diff --git a/unit/unittest.sh.in b/unit/unittest.sh.in
index b94d40d40f2..3300c61cfab 100755
--- a/unit/unittest.sh.in
+++ b/unit/unittest.sh.in
@@ -8,38 +8,38 @@ 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 atf-run)"
-	atf-run > atf.out
+	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=$?
 
-	# | cat is there to force non-fancy output
-	atf-report < atf.out | cat
+	kyua report --results-file ${KYUA_RESULT:-LATEST}
 
 	if [ $status -eq 0 ]
 	then
-		rm -f atf.out
+		rm -f kyua.log
 		echo R:PASS
 	else
 		echo R:FAIL
 	fi
 	echo "E:unit:`date`"
-elif [ -n "@UNITTESTS@" -a -x "$KYUA" -a -f Kyuafile ]
+elif [ -n "@UNITTESTS@" -a -x "$ATFRUN" -a -f Atffile ]
 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}
+	echo "I: unit tests (using atf-run)"
+	atf-run > atf.out
 	status=$?
 
-	kyua report --results-file ${KYUA_RESULT:-LATEST}
+	# | cat is there to force non-fancy output
+	atf-report < atf.out | cat
 
 	if [ $status -eq 0 ]
 	then
-		rm -f kyua.log
+		rm -f atf.out
 		echo R:PASS
 	else
 		echo R:FAIL