prefer kyua over atf

diff --git a/unit/unittest.sh.in b/unit/unittest.sh.in
index b94d40d40f2c09c77882475b3b613900de80b0d2..3300c61cfab14bf4ecc431bc2ac1deb915a83786 100755 (executable)
--- 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