From 590d391bbbb71ae089df14a14e0068aa4b3f200b Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 13 Nov 2018 07:57:44 +1100
Subject: [PATCH] prefer kyua over atf

---
 unit/unittest.sh.in | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

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