convert errno_test

diff --git a/lib/isc/tests/Kyuafile b/lib/isc/tests/Kyuafile
index 8adf7ed51cf9d4768b30be3fe6790e003f7fc1b5..f4b02430c396829c6327a476c4fe6d8779fc0695 100644 (file)
--- a/lib/isc/tests/Kyuafile
+++ b/lib/isc/tests/Kyuafile
@@ -4,7 +4,7 @@ test_suite('bind9')
 tap_test_program{name='aes_test'}
 tap_test_program{name='buffer_test'}
 tap_test_program{name='counter_test'}
-atf_test_program{name='errno_test'}
+tap_test_program{name='errno_test'}
 atf_test_program{name='file_test'}
 atf_test_program{name='hash_test'}
 tap_test_program{name='heap_test'}

diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index 0fb8eb8ba7e51b8d44647ca80ca9426668754560..92f5731f326e6f65547904de13248af99f96b12a 100644 (file)
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -73,8 +73,9 @@ crc64_test@EXEEXT@: crc64_test.@O@ ${ISCDEPLIBS}
                        crc64_test.@O@ ${ISCLIBS} ${LIBS} ${CMOCKA_LIBS}
 
 errno_test@EXEEXT@: errno_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-                       errno_test.@O@ ${ISCLIBS} ${LIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} \
+               ${LDFLAGS} -o $@ errno_test.@O@ \
+               ${ISCLIBS} ${LIBS} ${CMOCKA_LIBS}
 
 file_test@EXEEXT@: file_test.@O@ ${ISCDEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \

diff --git a/lib/isc/tests/errno_test.c b/lib/isc/tests/errno_test.c
index e45bdd8035cb13f5f854e50e0516424b3b238e58..4ba253289623a7a0731b64665e8827e7cbddd577 100644 (file)
--- a/lib/isc/tests/errno_test.c
+++ b/lib/isc/tests/errno_test.c
@@ -11,13 +11,21 @@
 
 #include <config.h>
 
-#include <stdio.h>
+#if HAVE_CMOCKA
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+
+#include <string.h>
 #include <sys/errno.h>
 
-#include <atf-c.h>
+#define UNIT_TESTING
+#include <cmocka.h>
 
 #include <isc/errno.h>
 #include <isc/result.h>
+#include <isc/util.h>
 
 typedef struct {
        int err;
@@ -80,26 +88,38 @@ testpair_t testpair[] = {
        { 0, ISC_R_UNEXPECTED }
 };
 
-ATF_TC(isc_errno_toresult);
-ATF_TC_HEAD(isc_errno_toresult, tc) {
-       atf_tc_set_md_var(tc, "descr", "convert errno to ISC result");
-}
-ATF_TC_BODY(isc_errno_toresult, tc) {
+/* convert errno to ISC result */
+static void
+isc_errno_toresult_test(void **state) {
        isc_result_t result, expect;
        size_t i;
 
+       UNUSED(state);
+
        for (i = 0; i < sizeof(testpair)/sizeof(testpair[0]); i++) {
                result = isc_errno_toresult(testpair[i].err);
                expect = testpair[i].result;
-               ATF_CHECK(result == expect);
+               assert_int_equal(result, expect);
        }
 }
 
-/*
- * Main
- */
-ATF_TP_ADD_TCS(tp) {
-       ATF_TP_ADD_TC(tp, isc_errno_toresult);
-       return (atf_no_error());
+int
+main(void) {
+       const struct CMUnitTest tests[] = {
+               cmocka_unit_test(isc_errno_toresult_test),
+       };
+
+       return (cmocka_run_group_tests(tests, NULL, NULL));
 }
 
+#else /* HAVE_CMOCKA */
+
+#include <stdio.h>
+
+int
+main(void) {
+       printf("1..0 # Skipped: cmocka not available\n");
+       return (0);
+}
+
+#endif