perf tests: Synthesize struct instead of using field after variable sized type

End result is the same, its an ABI, so the struct won't change, avoid
using a GNU extension, so that we can catch other cases that may be bugs.

Caught when building with clang:

  tests/parse-no-sample-id-all.c:53:20: error: field 'attr' with variable sized type 'struct attr_event' not at the end of a struct or class is a GNU extension
        [-Werror,-Wgnu-variable-sized-type-not-at-end]
          struct attr_event attr;
                            ^
  1 error generated.

Testing it:

  # perf test sample_id
  24: Parse with no sample_id_all bit set        : Ok
  #

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-e2vs1x771fc208uvxnwcf08b@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/parse-no-sample-id-all.c b/tools/perf/tests/parse-no-sample-id-all.c
index 81c6eeaca0f53ec00d9cabca4d13119856b0c719..65dcf48a92fbc2bbc7e89fc8a5243c1bcec3eead 100644 (file)
--- a/tools/perf/tests/parse-no-sample-id-all.c
+++ b/tools/perf/tests/parse-no-sample-id-all.c
@@ -50,7 +50,8 @@ static int process_events(union perf_event **events, size_t count)
 }
 
 struct test_attr_event {
-       struct attr_event attr;
+       struct perf_event_header header;
+       struct perf_event_attr   attr;
        u64 id;
 };
 
@@ -71,20 +72,16 @@ int test__parse_no_sample_id_all(int subtest __maybe_unused)
        int err;
 
        struct test_attr_event event1 = {
-               .attr = {
-                       .header = {
-                               .type = PERF_RECORD_HEADER_ATTR,
-                               .size = sizeof(struct test_attr_event),
-                       },
+               .header = {
+                       .type = PERF_RECORD_HEADER_ATTR,
+                       .size = sizeof(struct test_attr_event),
                },
                .id = 1,
        };
        struct test_attr_event event2 = {
-               .attr = {
-                       .header = {
-                               .type = PERF_RECORD_HEADER_ATTR,
-                               .size = sizeof(struct test_attr_event),
-                       },
+               .header = {
+                       .type = PERF_RECORD_HEADER_ATTR,
+                       .size = sizeof(struct test_attr_event),
                },
                .id = 2,
        };