netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / mpers_test.sh

diff --git a/mpers_test.sh b/mpers_test.sh
index 72b5f5dab3848941142fa976731829fcc4025467..66588eeadd4c839e57b24b930c2ae428d7c0d811 100755 (executable)
--- a/mpers_test.sh
+++ b/mpers_test.sh
@@ -2,6 +2,7 @@
 #
 # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com>
 # Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
+# Copyright (c) 2015-2017 The strace developers.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -56,7 +57,7 @@ typedef struct {
                long long sll __attribute__((__aligned__(8)));
                unsigned long long ull;
                unsigned long ul;
-               long asl[3];
+               long asl[3][5][7];
                char f;
                /* unsigned char mpers_end_filler_4[7]; */
        } s;
@@ -68,11 +69,11 @@ typedef struct {
                unsigned long ul;
                int si;
                unsigned ui;
-               short ss;
-               unsigned short us;
+               short ss[7][9];
+               unsigned short us[4];
                char sc;
                unsigned char uc;
-       } u[3];
+       } u[3][2];
        short f[0];
 } sample_struct;
 #include MPERS_DEFS
@@ -99,7 +100,7 @@ unsigned char mpers_filler_3[6];
 int64_t sll;
 uint64_t ull;
 uint${size}_t ul;
-int${size}_t asl[3];
+int${size}_t asl[3][5][7];
 char f;
 unsigned char mpers_end_filler_4[7];
 } ATTRIBUTE_PACKED s;
@@ -111,17 +112,17 @@ int${size}_t sl;
 uint${size}_t ul;
 int32_t si;
 uint32_t ui;
-int16_t ss;
-uint16_t us;
+int16_t ss[7][9];
+uint16_t us[4];
 char sc;
 unsigned char uc;
-} u[3];
+} u[3][2];
 int16_t f[0];
 } ATTRIBUTE_PACKED ${mpers_name}_sample_struct;
 #define MPERS_${mpers_name}_sample_struct ${mpers_name}_sample_struct
 EOF
 
-CFLAGS="$CPPFLAGS -I${srcdir}" \
+CFLAGS="$CPPFLAGS -I${srcdir} -DMPERS_IS_${mpers_name}" \
 CPPFLAGS="$CPPFLAGS -I${srcdir} -DIN_MPERS -DMPERS_IS_${mpers_name}" \
 "$mpers_sh" "-$mpers_name" "$sample"
 cmp "$expected" "$mpers_dir"/sample_struct.h > /dev/null