tests: Update to new cmocka test runner

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/tests/test_glibc_thread_support.c b/tests/test_glibc_thread_support.c
index 31a7b7b9e52eb7f67dba0b07ca62bcd6523efb7e..e902b0d6fd762825bce9993314c90ac948b0459d 100644 (file)
--- a/tests/test_glibc_thread_support.c
+++ b/tests/test_glibc_thread_support.c
@@ -454,17 +454,17 @@ static void test_thread_create_thread_setgid(void **state)
 int main(void) {
        int rc;
 
-       const UnitTest tests[] = {
-               unit_test(test_syscall_setreuid),
-               unit_test(test_sync_setreuid),
-               unit_test(test_sync_setgid),
-               unit_test(test_sync_setgid_syscall),
-               unit_test(test_real_sync_setuid),
-               unit_test(test_sync_setgroups),
-               unit_test(test_thread_create_thread_setgid),
+       const struct CMUnitTest thread_tests[] = {
+               cmocka_unit_test(test_syscall_setreuid),
+               cmocka_unit_test(test_sync_setreuid),
+               cmocka_unit_test(test_sync_setgid),
+               cmocka_unit_test(test_sync_setgid_syscall),
+               cmocka_unit_test(test_real_sync_setuid),
+               cmocka_unit_test(test_sync_setgroups),
+               cmocka_unit_test(test_thread_create_thread_setgid),
        };
 
-       rc = run_tests(tests);
+       rc = cmocka_run_group_tests(thread_tests, NULL, NULL);
 
        return rc;
 }

diff --git a/tests/test_uwrap_disabled.c b/tests/test_uwrap_disabled.c
index f2336a46fbc3206003c208e23a04bbd40bc0c584..c830e1ddda3ec533e51d5cf11788999cee579681 100644 (file)
--- a/tests/test_uwrap_disabled.c
+++ b/tests/test_uwrap_disabled.c
@@ -23,7 +23,7 @@ struct test_opts {
        gid_t nbgid;
 };
 
-static void setup(void **state)
+static int setup(void **state)
 {
        struct test_opts *t;
        struct passwd *pwd;
@@ -47,9 +47,11 @@ static void setup(void **state)
        }
 
        *state = t;
+
+       return 0;
 }
 
-static void teardown(void **state)
+static int teardown(void **state)
 {
        struct test_opts *t = (struct test_opts *)*state;
 
@@ -59,6 +61,8 @@ static void teardown(void **state)
        setegid(t->mygid);
 
        free(t);
+
+       return 0;
 }
 
 static void test_uwrap_setuid(void **state)
@@ -235,27 +239,27 @@ int main(void)
 {
        int rc;
 
-       const UnitTest tests[] = {
-               unit_test_setup_teardown(test_uwrap_setuid, setup, teardown),
-               unit_test_setup_teardown(test_uwrap_seteuid, setup, teardown),
+       const struct CMUnitTest tests[] = {
+               cmocka_unit_test_setup_teardown(test_uwrap_setuid, setup, teardown),
+               cmocka_unit_test_setup_teardown(test_uwrap_seteuid, setup, teardown),
 #ifdef HAVE_SETREUID
-               unit_test_setup_teardown(test_uwrap_setreuid, setup, teardown),
+               cmocka_unit_test_setup_teardown(test_uwrap_setreuid, setup, teardown),
 #endif
 #ifdef HAVE_SETRESUID
-               unit_test_setup_teardown(test_uwrap_setresuid, setup, teardown),
+               cmocka_unit_test_setup_teardown(test_uwrap_setresuid, setup, teardown),
 #endif
-               unit_test_setup_teardown(test_uwrap_setgid, setup, teardown),
-               unit_test_setup_teardown(test_uwrap_setegid, setup, teardown),
+               cmocka_unit_test_setup_teardown(test_uwrap_setgid, setup, teardown),
+               cmocka_unit_test_setup_teardown(test_uwrap_setegid, setup, teardown),
 #ifdef HAVE_SETREGID
-               unit_test_setup_teardown(test_uwrap_setregid, setup, teardown),
+               cmocka_unit_test_setup_teardown(test_uwrap_setregid, setup, teardown),
 #endif
 #ifdef HAVE_SETRESGID
-               unit_test_setup_teardown(test_uwrap_setresgid, setup, teardown),
+               cmocka_unit_test_setup_teardown(test_uwrap_setresgid, setup, teardown),
 #endif
-               unit_test_setup_teardown(test_uwrap_setgroups, setup, teardown),
+               cmocka_unit_test_setup_teardown(test_uwrap_setgroups, setup, teardown),
        };
 
-       rc = run_tests(tests);
+       rc = cmocka_run_group_tests(tests, NULL, NULL);
 
        return rc;
 }

diff --git a/tests/test_uwrap_enabled.c b/tests/test_uwrap_enabled.c
index b0be077e6a7fa910e6c72dac15b9168adeb64828..9cc8387ff5dacc3ae7f3ce86e095e5870d9a0f60 100644 (file)
--- a/tests/test_uwrap_enabled.c
+++ b/tests/test_uwrap_enabled.c
@@ -22,11 +22,11 @@ static void test_uid_wrapper_enabled(void **state)
 int main(void) {
        int rc;
 
-       const UnitTest tests[] = {
-               unit_test(test_uid_wrapper_enabled),
+       const struct CMUnitTest tests[] = {
+               cmocka_unit_test(test_uid_wrapper_enabled),
        };
 
-       rc = run_tests(tests);
+       rc = cmocka_run_group_tests(tests, NULL, NULL);
 
        return rc;
 }

diff --git a/tests/testsuite.c b/tests/testsuite.c
index 38c9b77bb1e556ee48568d75bac95477b767c6bd..5e7606a54f6119e4cf2cd5ecacdfd403ed0b3171 100644 (file)
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -365,38 +365,38 @@ static void test_uwrap_syscall_setgroups(void **state)
 int main(void) {
        int rc;
 
-       const UnitTest tests[] = {
-               unit_test(test_uwrap_syscall),
-               unit_test(test_uwrap_getgroups),
+       const struct CMUnitTest uwrap_tests[] = {
+               cmocka_unit_test(test_uwrap_syscall),
+               cmocka_unit_test(test_uwrap_getgroups),
 
-               unit_test(test_uwrap_seteuid),
+               cmocka_unit_test(test_uwrap_seteuid),
 #ifdef HAVE_SETREUID
-               unit_test(test_uwrap_setreuid),
+               cmocka_unit_test(test_uwrap_setreuid),
 #endif
 #ifdef HAVE_SETRESUID
-               unit_test(test_uwrap_setresuid),
+               cmocka_unit_test(test_uwrap_setresuid),
 #endif
 #ifdef HAVE_GETRESUID
-               unit_test(test_uwrap_getresuid),
+               cmocka_unit_test(test_uwrap_getresuid),
 #endif
-               unit_test(test_uwrap_setuid),
-               unit_test(test_uwrap_setegid),
+               cmocka_unit_test(test_uwrap_setuid),
+               cmocka_unit_test(test_uwrap_setegid),
 #ifdef HAVE_SETREGID
-               unit_test(test_uwrap_setregid),
+               cmocka_unit_test(test_uwrap_setregid),
 #endif
 #ifdef HAVE_SETRESGID
-               unit_test(test_uwrap_setresgid),
+               cmocka_unit_test(test_uwrap_setresgid),
 #endif
-               unit_test(test_uwrap_setgid),
-               unit_test(test_uwrap_syscall_setreuid),
-               unit_test(test_uwrap_syscall_setregid),
-               unit_test(test_uwrap_setgroups),
+               cmocka_unit_test(test_uwrap_setgid),
+               cmocka_unit_test(test_uwrap_syscall_setreuid),
+               cmocka_unit_test(test_uwrap_syscall_setregid),
+               cmocka_unit_test(test_uwrap_syscall_setresgid),
 #if defined(SYS_setgroups) || defined(SYS_setroups32)
-               unit_test(test_uwrap_syscall_setgroups),
+               cmocka_unit_test(test_uwrap_syscall_setgroups),
 #endif
        };
 
-       rc = run_tests(tests);
+       rc = cmocka_run_group_tests(uwrap_tests, NULL, NULL);
 
        return rc;
 }