tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / ioctl_dm.c

diff --git a/tests/ioctl_dm.c b/tests/ioctl_dm.c
index 08f036c6a2237e23d1ccb2d7cf34b59861efb71e..544d70b3f524361683ddc3e7255d99abebdbed8d 100644 (file)
--- a/tests/ioctl_dm.c
+++ b/tests/ioctl_dm.c
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2016 Mikulas Patocka <mpatocka@redhat.com>
  * Copyright (c) 2016 Eugene Syromyatnikov <evgsyr@gmail.com>
+ * Copyright (c) 2016-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -234,15 +235,15 @@ main(void)
        dm_arg->version[1] = 0xbadc0dee;
        dm_arg->version[2] = 0xbadc0def;
        ioctl(-1, DM_VERSION, dm_arg);
-       printf("ioctl(-1, DM_VERSION, {version=%u.%u.%u, "
-              "/* Unsupported device mapper ABI version */ ...}) = "
+       printf("ioctl(-1, DM_VERSION, {version=%u.%u.%u"
+              " /* unsupported device mapper ABI version */}) = "
               "-1 EBADF (%m)\n", 0xbadc0ded, 0xbadc0dee, 0xbadc0def);
 
        /* Incorrect data_size */
        init_s(dm_arg, 14, 64);
        ioctl(-1, DM_VERSION, dm_arg);
-       printf("ioctl(-1, DM_VERSION, {version=4.1.2, data_size=14, "
-              "/* Incorrect data_size */ ...}) = -1 EBADF (%m)\n");
+       printf("ioctl(-1, DM_VERSION, {version=4.1.2, data_size=14"
+              " /* data_size too small */}) = -1 EBADF (%m)\n");
 
        /* Unterminated name/uuid */
        init_s(dm_arg, min_sizeof_dm_ioctl, 0);
@@ -395,8 +396,8 @@ main(void)
               "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", "
               "target_count=1234, flags=0, "
 # if VERBOSE
-              "/* misplaced struct dm_target_spec */ ..."
-# else /* !VERBOSE */
+              "??? /* misplaced struct dm_target_spec */"
+# else
               "..."
 # endif /* VERBOSE */
               "}) = -1 EBADF (%m)\n", sizeof(*dm_arg), 0xfffffff8);
@@ -491,7 +492,7 @@ main(void)
        print_dm_target_spec(&dm_arg_open3->target1, 15);
        printf("\"\\377\"}, ");
        print_dm_target_spec(&dm_arg_open3->target1, 42);
-       printf("\"\\1\\2\"}, /* misplaced struct dm_target_spec */ ...");
+       printf("\"\\1\\2\"}, ??? /* misplaced struct dm_target_spec */");
 # else /* !VERBOSE */
        printf("...");
 # endif /* VERBOSE */
@@ -575,7 +576,7 @@ main(void)
               "{version=4.1.2, data_size=%zu, data_start=%zu, "
               "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=0, "
 # if VERBOSE
-              "/* misplaced struct dm_target_msg */"
+              "??? /* misplaced struct dm_target_msg */"
 # else /* !VERBOSE */
               "..."
 # endif /* VERBOSE */
@@ -590,7 +591,7 @@ main(void)
               "{version=4.1.2, data_size=%zu, data_start=%u, "
               "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=0, "
 # if VERBOSE
-              "/* misplaced struct dm_target_msg */"
+              "??? /* misplaced struct dm_target_msg */"
 # else /* !VERBOSE */
               "..."
 # endif /* VERBOSE */
@@ -706,7 +707,7 @@ main(void)
               "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", event_nr=0, "
               "flags=0, "
 # if VERBOSE
-              "/* misplaced string */"
+              "??? /* misplaced string */"
 # else /* !VERBOSE */
               "..."
 # endif /* VERBOSE */
@@ -757,10 +758,12 @@ main(void)
               "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", "
               "target_count=4294967295, flags=0, "
 # if VERBOSE
-              "{sector_start=0, length=0, target_type=\"\", string=\"\"}, "
-              "/* misplaced struct dm_target_spec */ "
+              "{sector_start=0, length=0, target_type=\"\", string=\"\"}"
+              ", ??? /* misplaced struct dm_target_spec */"
+# else
+              "..."
 # endif /* VERBOSE */
-              "...}) = -1 EBADF (%m)\n",
+              "}) = -1 EBADF (%m)\n",
               s.ioc.data_size, s.ioc.data_start);
 
        puts("+++ exited with 0 +++");