tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / setgroups.c

diff --git a/tests/setgroups.c b/tests/setgroups.c
index 5068ff47a7e612a482e2e3f4ee471e82f0657fda..5645c22b7ef9173d4b3b5cef193d5a5034734323 100644 (file)
--- a/tests/setgroups.c
+++ b/tests/setgroups.c
@@ -2,6 +2,7 @@
  * Check decoding of setgroups/setgroups32 syscalls.
  *
  * Copyright (c) 2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2016-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,14 +58,25 @@
 # include <stdio.h>
 # include <unistd.h>
 
+void
+printuid(GID_TYPE id)
+{
+       if (id == (GID_TYPE) -1U)
+               printf("-1");
+       else
+               printf("%u", id);
+}
+
 int
 main(void)
 {
+       const char *errstr;
+
        /* check how the first argument is decoded */
        long rc = syscall(SYSCALL_NR, 0, 0);
        printf("%s(0, NULL) = %s\n", SYSCALL_NAME, sprintrc(rc));
 
-       rc = syscall(SYSCALL_NR, (long) 0xffffffff00000000ULL, 0);
+       rc = syscall(SYSCALL_NR, F8ILL_KULONG_MASK, 0);
        printf("%s(0, NULL) = %s\n", SYSCALL_NAME, sprintrc(rc));
 
        rc = syscall(SYSCALL_NR, 1, 0);
@@ -74,13 +86,13 @@ main(void)
        printf("%s(1, NULL) = %s\n", SYSCALL_NAME, sprintrc(rc));
 
        rc = syscall(SYSCALL_NR, -1U, 0);
-       printf("%s(%u, NULL) = %s\n", SYSCALL_NAME, -1U, sprintrc(rc));
+       printf("%s(%d, NULL) = %s\n", SYSCALL_NAME, -1, sprintrc(rc));
 
        rc = syscall(SYSCALL_NR, -1L, 0);
-       printf("%s(%u, NULL) = %s\n", SYSCALL_NAME, -1U, sprintrc(rc));
+       printf("%s(%d, NULL) = %s\n", SYSCALL_NAME, -1, sprintrc(rc));
 
        /* check how the second argument is decoded */
-       const GID_TYPE *const g1 = tail_alloc(sizeof(*g1));
+       TAIL_ALLOC_OBJECT_CONST_PTR(const GID_TYPE, g1);
        GID_TYPE *const g2 = tail_alloc(sizeof(*g2) * 2);
        GID_TYPE *const g3 = tail_alloc(sizeof(*g3) * 3);
 
@@ -88,8 +100,10 @@ main(void)
        printf("%s(0, []) = %s\n", SYSCALL_NAME, sprintrc(rc));
 
        rc = syscall(SYSCALL_NR, 1, g1);
-       printf("%s(1, [%u]) = %s\n",
-              SYSCALL_NAME, (unsigned) *g1, sprintrc(rc));
+       errstr = sprintrc(rc);
+       printf("%s(1, [", SYSCALL_NAME);
+       printuid(*g1);
+       printf("]) = %s\n", errstr);
 
        rc = syscall(SYSCALL_NR, 1, g1 + 1);
        printf("%s(1, %p) = %s\n", SYSCALL_NAME, g1 + 1, sprintrc(rc));
@@ -98,48 +112,69 @@ main(void)
        printf("%s(1, %#lx) = %s\n", SYSCALL_NAME, -1L, sprintrc(rc));
 
        rc = syscall(SYSCALL_NR, 2, g1);
-       printf("%s(2, [%u, %p]) = %s\n",
-              SYSCALL_NAME, (unsigned) *g1, g1 + 1, sprintrc(rc));
+       errstr = sprintrc(rc);
+       printf("%s(2, [", SYSCALL_NAME);
+       printuid(*g1);
+       printf(", %p]) = %s\n", g1 + 1, errstr);
 
        g2[0] = -2;
        g2[1] = -3;
        rc = syscall(SYSCALL_NR, 2, g2);
-       printf("%s(2, [%u, %u]) = %s\n", SYSCALL_NAME,
-              (unsigned) g2[0], (unsigned) g2[1], sprintrc(rc));
+       errstr = sprintrc(rc);
+       printf("%s(2, [", SYSCALL_NAME);
+       printuid(g2[0]);
+       printf(", ");
+       printuid(g2[1]);
+       printf("]) = %s\n", errstr);
 
        rc = syscall(SYSCALL_NR, 3, g2);
-       printf("%s(3, [%u, %u, %p]) = %s\n", SYSCALL_NAME,
-              (unsigned) g2[0], (unsigned) g2[1], g2 + 2, sprintrc(rc));
+       errstr = sprintrc(rc);
+       printf("%s(3, [", SYSCALL_NAME);
+       printuid(g2[0]);
+       printf(", ");
+       printuid(g2[1]);
+       printf(", %p]) = %s\n", g2 + 2, errstr);
 
        g3[0] = 0;
        g3[1] = 1;
        rc = syscall(SYSCALL_NR, 3, g3);
-       printf("%s(3, [%u, %u%s]) = %s\n", SYSCALL_NAME,
-              (unsigned) g3[0], (unsigned) g3[1], rc ? ", ..." : "",
-              sprintrc(rc));
+       errstr = sprintrc(rc);
+       printf("%s(3, [", SYSCALL_NAME);
+       printuid(g3[0]);
+       printf(", ");
+       printuid(g3[1]);
+       printf(", ...]) = %s\n", errstr);
 
        rc = syscall(SYSCALL_NR, 4, g3);
-       printf("%s(4, [%u, %u, ...]) = %s\n", SYSCALL_NAME,
-              (unsigned) g3[0], (unsigned) g3[1], sprintrc(rc));
+       errstr = sprintrc(rc);
+       printf("%s(4, [", SYSCALL_NAME);
+       printuid(g3[0]);
+       printf(", ");
+       printuid(g3[1]);
+       printf(", ...]) = %s\n", errstr);
 
        rc = sysconf(_SC_NGROUPS_MAX);
        const unsigned ngroups_max = rc;
 
        if ((unsigned long) rc == ngroups_max && (int) ngroups_max > 0) {
                rc = syscall(SYSCALL_NR, ngroups_max, g3);
-               printf("%s(%u, [%u, %u, ...]) = %s\n", SYSCALL_NAME,
-                      ngroups_max, (unsigned) g3[0], (unsigned) g3[1],
-                      sprintrc(rc));
-
-               const unsigned long size =
-                       (unsigned long) 0xffffffff00000000ULL | ngroups_max;
-               rc = syscall(SYSCALL_NR, size, g3);
-               printf("%s(%u, [%u, %u, ...]) = %s\n", SYSCALL_NAME,
-                      ngroups_max, (unsigned) g3[0], (unsigned) g3[1],
-                      sprintrc(rc));
+               errstr = sprintrc(rc);
+               printf("%s(%d, [", SYSCALL_NAME, ngroups_max);
+               printuid(g3[0]);
+               printf(", ");
+               printuid(g3[1]);
+               printf(", ...]) = %s\n", errstr);
+
+               rc = syscall(SYSCALL_NR, F8ILL_KULONG_MASK | ngroups_max, g3);
+               errstr = sprintrc(rc);
+               printf("%s(%d, [", SYSCALL_NAME, ngroups_max);
+               printuid(g3[0]);
+               printf(", ");
+               printuid(g3[1]);
+               printf(", ...]) = %s\n", errstr);
 
                rc = syscall(SYSCALL_NR, ngroups_max + 1, g3);
-               printf("%s(%u, %p) = %s\n", SYSCALL_NAME,
+               printf("%s(%d, %p) = %s\n", SYSCALL_NAME,
                       ngroups_max + 1, g3, sprintrc(rc));
        }