tests: Move syscall uid tests to own test

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 13bd3464855bbbce1166a092d0d41fe89f5cc606..75c2677d60ec2d470a2a0d24ce4b956de77cf9db 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -21,7 +21,8 @@ set(UWRAP_TESTS
     testsuite
     test_uid
     test_gid
-    test_syscall)
+    test_syscall
+    test_syscall_uid)
 
 foreach(_UWRAP_TEST ${UWRAP_TESTS})
     add_cmocka_test(${_UWRAP_TEST} ${_UWRAP_TEST}.c ${TESTSUITE_LIBRARIES})

diff --git a/tests/test_syscall_uid.c b/tests/test_syscall_uid.c
new file mode 100644 (file)
index 0000000..53a70c0
--- /dev/null
+++ b/tests/test_syscall_uid.c
@@ -0,0 +1,101 @@
+#include "config.h"
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include <errno.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <pwd.h>
+
+#ifdef HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif
+#ifdef HAVE_SYSCALL_H
+#include <syscall.h>
+#endif
+
+static void test_uwrap_syscall_setreuid(void **state)
+{
+       long int rc;
+       uid_t u;
+
+       (void) state; /* unused */
+
+#if defined(SYS_setreuid)
+       rc = syscall(SYS_setreuid, -1, 0);
+#elif defined(SYS_setreuid32)
+       rc = syscall(SYS_setreuid32, -1, 0);
+#endif
+       assert_int_equal(rc, 0);
+
+       u = geteuid();
+#if defined(SYS_geteuid) /* not available on Solaris */
+       assert_int_equal(u, syscall(SYS_geteuid));
+#elif defined(SYS_geteuid32)
+       assert_int_equal(u, syscall(SYS_geteuid32));
+#endif
+
+#if defined(SYS_setreuid)
+       rc = syscall(SYS_setreuid, -1, 42);
+#elif defined(SYS_setreuid32)
+       rc = syscall(SYS_setreuid32, -1, 42);
+#endif
+       assert_int_equal(rc, 0);
+
+       u = geteuid();
+       assert_int_equal(u, 42);
+}
+
+static void test_uwrap_syscall_setresuid(void **state)
+{
+       long int rc;
+       uid_t u;
+       uid_t u_r, u_e, u_s;
+
+       (void) state; /* unused */
+
+       rc = syscall(SYS_setresuid, 42, 0, -1);
+       assert_int_equal(rc, 0);
+
+       u = geteuid();
+#if defined(SYS_getresuid) /* not available on Solaris */
+       rc = syscall(SYS_getresuid, &u_r, &u_e, &u_s);
+       assert_return_code(rc, errno);
+
+       assert_int_equal(u_r, 42);
+       assert_int_equal(u, u_e);
+#elif defined(SYS_getresuid32)
+       rc = syscall(SYS_getresuid32, &u_r, &u_e, &u_s);
+       assert_return_code(rc, errno);
+
+       assert_int_equal(u_r, 42);
+       assert_int_equal(u, u_e);
+#endif
+
+#if defined(SYS_setreuid)
+       rc = syscall(SYS_setreuid, -1, 42);
+#elif defined(SYS_setreuid)
+       rc = syscall(SYS_setreuid32, -1, 42);
+#endif
+       assert_return_code(rc, errno);
+
+       u = geteuid();
+       assert_int_equal(u, 42);
+}
+
+int main(void) {
+       int rc;
+
+       const struct CMUnitTest uwrap_tests[] = {
+               cmocka_unit_test(test_uwrap_syscall_setreuid),
+               cmocka_unit_test(test_uwrap_syscall_setresuid),
+       };
+
+       rc = cmocka_run_group_tests(uwrap_tests, NULL, NULL);
+
+       return rc;
+}

diff --git a/tests/testsuite.c b/tests/testsuite.c
index 66cc88a36efff15b6f2b0139aebddada363bbfeb..707ff3b492ee14fadb337eb257d1b0f25ac7a08a 100644 (file)
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -7,14 +7,9 @@
 
 #include <errno.h>
 #include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
 #include <unistd.h>
 
-#include <pwd.h>
 #include <grp.h>
 
 #ifdef HAVE_SYS_SYSCALL_H
@@ -24,78 +19,8 @@
 #include <syscall.h>
 #endif
 
-#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
 #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
 
-static void test_uwrap_syscall_setreuid(void **state)
-{
-       long int rc;
-       uid_t u;
-
-       (void) state; /* unused */
-
-#if defined(SYS_setreuid)
-       rc = syscall(SYS_setreuid, -1, 0);
-#elif defined(SYS_setreuid32)
-       rc = syscall(SYS_setreuid32, -1, 0);
-#endif
-       assert_int_equal(rc, 0);
-
-       u = geteuid();
-#if defined(SYS_geteuid) /* not available on Solaris */
-       assert_int_equal(u, syscall(SYS_geteuid));
-#elif defined(SYS_geteuid32)
-       assert_int_equal(u, syscall(SYS_geteuid32));
-#endif
-
-#if defined(SYS_setreuid)
-       rc = syscall(SYS_setreuid, -1, 42);
-#elif defined(SYS_setreuid32)
-       rc = syscall(SYS_setreuid32, -1, 42);
-#endif
-       assert_int_equal(rc, 0);
-
-       u = geteuid();
-       assert_int_equal(u, 42);
-}
-
-static void test_uwrap_syscall_setresuid(void **state)
-{
-       long int rc;
-       uid_t u;
-       uid_t u_r, u_e, u_s;
-
-       (void) state; /* unused */
-
-       rc = syscall(SYS_setresuid, 42, 0, -1);
-       assert_int_equal(rc, 0);
-
-       u = geteuid();
-#if defined(SYS_getresuid) /* not available on Solaris */
-       rc = syscall(SYS_getresuid, &u_r, &u_e, &u_s);
-       assert_return_code(rc, errno);
-
-       assert_int_equal(u_r, 42);
-       assert_int_equal(u, u_e);
-#elif defined(SYS_getresuid32)
-       rc = syscall(SYS_getresuid32, &u_r, &u_e, &u_s);
-       assert_return_code(rc, errno);
-
-       assert_int_equal(u_r, 42);
-       assert_int_equal(u, u_e);
-#endif
-
-#if defined(SYS_setreuid)
-       rc = syscall(SYS_setreuid, -1, 42);
-#elif defined(SYS_setreuid)
-       rc = syscall(SYS_setreuid32, -1, 42);
-#endif
-       assert_return_code(rc, errno);
-
-       u = geteuid();
-       assert_int_equal(u, 42);
-}
-
 static void test_uwrap_syscall_setregid(void **state)
 {
        long int rc;
@@ -202,8 +127,6 @@ int main(void) {
        int rc;
 
        const struct CMUnitTest uwrap_tests[] = {
-               cmocka_unit_test(test_uwrap_syscall_setreuid),
-               cmocka_unit_test(test_uwrap_syscall_setresuid),
                cmocka_unit_test(test_uwrap_syscall_setregid),
                cmocka_unit_test(test_uwrap_syscall_setresgid),
 #if defined(SYS_setgroups) || defined(SYS_setroups32)