tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / pwritev.c

diff --git a/tests/pwritev.c b/tests/pwritev.c
index beac680fde56e2621156ff2673867b4781564ae4..58e5b41e24e2ea5a0a057da2d871563dd4bd6dc9 100644 (file)
--- a/tests/pwritev.c
+++ b/tests/pwritev.c
@@ -43,12 +43,12 @@ print_iov(const struct iovec *iov)
        unsigned int i;
        unsigned char *buf = iov->iov_base;
 
-       fputs("{\"", stdout);
+       fputs("{iov_base=\"", stdout);
        for (i = 0; i < iov->iov_len; ++i) {
                if (i < LIM)
                        printf("\\%d", (int) buf[i]);
        }
-       printf("\"%s, %u}",
+       printf("\"%s, iov_len=%u}",
               i > LIM ? "..." : "", (unsigned) iov->iov_len);
 }
 
@@ -64,14 +64,14 @@ print_iovec(const struct iovec *iov, unsigned int cnt, unsigned int size)
        for (i = 0; i < cnt; ++i) {
                if (i)
                        fputs(", ", stdout);
-               if (i == LIM) {
-                       fputs("...", stdout);
-                       break;
-               }
                if (i == size) {
                        printf("%p", &iov[i]);
                        break;
                }
+               if (i == LIM) {
+                       fputs("...", stdout);
+                       break;
+               }
                print_iov(&iov[i]);
        }
        putchar(']');
@@ -95,7 +95,6 @@ main(void)
                iov[i].iov_base = &buf[i];
                iov[i].iov_len = LEN - i;
        }
-       tail_alloc(1);
 
        const off_t offset = 0xdefaceddeadbeefLL;
        long rc;
@@ -121,7 +120,7 @@ main(void)
 
        iov->iov_base = iov + LEN * 2;
        rc = pwritev(0, iov, 1, -1);
-       printf("pwritev(0, [{%p, %d}], 1, -1) = %ld %s (%m)\n",
+       printf("pwritev(0, [{iov_base=%p, iov_len=%d}], 1, -1) = %ld %s (%m)\n",
               iov->iov_base, LEN, rc, errno2name());
 
        iov += LEN;
@@ -133,7 +132,7 @@ main(void)
        printf("pwritev(0, NULL, 1, -3) = %ld %s (%m)\n",
               rc, errno2name());
 
-       rc = pwritev(0, NULL, 0, -4);
+       rc = pwritev(0, iov, 0, -4);
        printf("pwritev(0, [], 0, -4) = %ld %s (%m)\n",
               rc, errno2name());