[SCM] UID Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  940aa64 tests: Fix tests on Solaris
      from  319c52b uwrap: Removed double newline

https://git.samba.org/?p=uid_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 940aa64fde39a46c311eade4e9992e9a9bc65253
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Aug 18 10:10:41 2015 +0200

    tests: Fix tests on Solaris
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 tests/test_syscall_gid.c | 10 ++++++++--
 tests/test_syscall_uid.c | 13 ++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tests/test_syscall_gid.c b/tests/test_syscall_gid.c
index d87bb84..3ccdd4a 100644
--- a/tests/test_syscall_gid.c
+++ b/tests/test_syscall_gid.c
@@ -48,7 +48,9 @@ static void test_uwrap_syscall_setregid(void **state)
 
 	g = getegid();
 	assert_int_equal(g, 0);
+#ifdef SYS_getegid /* not available on Solaris */
 	assert_int_equal(g, syscall(SYS_getegid));
+#endif
 
 	rc = syscall(SYS_setregid, -1, 42);
 	assert_int_equal(rc, 0);
@@ -59,7 +61,7 @@ static void test_uwrap_syscall_setregid(void **state)
 	assert_int_equal(g, 42);
 }
 
-#if defined(SYS_setresgid) && defined(SYS_getresgid)
+#if defined(SYS_setresgid)
 static void test_uwrap_syscall_setresgid(void **state)
 {
 	long int rc;
@@ -72,11 +74,15 @@ static void test_uwrap_syscall_setresgid(void **state)
 	assert_int_equal(rc, 0);
 
 	g = getegid();
+	assert_int_equal(g, 0);
+
+#ifdef SYS_getresgid /* not available on Solaris */
 	rc = syscall(SYS_getresgid, &g_r, &g_e, &g_s);
 	assert_return_code(rc, errno);
 
 	assert_int_equal(g_r, 42);
 	assert_int_equal(g, g_e);
+#endif
 
 	rc = syscall(SYS_setregid, -1, 42);
 	assert_return_code(rc, errno);
@@ -121,7 +127,7 @@ int main(void) {
 	const struct CMUnitTest uwrap_tests[] = {
 		cmocka_unit_test(test_uwrap_syscall_setgid),
 		cmocka_unit_test(test_uwrap_syscall_setregid),
-#if defined(SYS_setresgid) && defined(SYS_getresgid)
+#if defined(SYS_setresgid)
 		cmocka_unit_test(test_uwrap_syscall_setresgid),
 #endif
 #if defined(SYS_setgroups)
diff --git a/tests/test_syscall_uid.c b/tests/test_syscall_uid.c
index 7c702c3..c7f8ef3 100644
--- a/tests/test_syscall_uid.c
+++ b/tests/test_syscall_uid.c
@@ -44,7 +44,10 @@ static void test_uwrap_syscall_setreuid(void **state)
 	assert_int_equal(rc, 0);
 
 	u = geteuid();
+	assert_int_equal(u, 0);
+#ifdef SYS_geteuid /* not available on Solaris */
 	assert_int_equal(u, syscall(SYS_geteuid));
+#endif
 
 	rc = syscall(SYS_setreuid, -1, 42);
 	assert_int_equal(rc, 0);
@@ -56,8 +59,7 @@ static void test_uwrap_syscall_setreuid(void **state)
 	assert_int_equal(u, 2);
 }
 
-/* not available on Solaris */
-#if defined(SYS_setresuid) && defined(SYS_getresuid)
+#if defined(SYS_setresuid)
 static void test_uwrap_syscall_setresuid(void **state)
 {
 	long int rc;
@@ -69,15 +71,16 @@ static void test_uwrap_syscall_setresuid(void **state)
 	rc = syscall(SYS_setresuid, 3, 0, 1);
 	assert_int_equal(rc, 0);
 
+	u = geteuid();
+	assert_int_equal(u, 0);
+#ifdef 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, 3);
-
-	u = geteuid();
 	assert_int_equal(u_e, u);
-
 	assert_int_equal(u_s, 1);
+#endif
 
 	rc = syscall(SYS_setresuid, -1, 42, -1);
 	assert_return_code(rc, errno);


-- 
UID Wrapper Repository