Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42be7398 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Fix exclude_guest parse events tests 



Event parsing tests are broken by following commit:

  perf tool: Precise mode requires exclude_guest
  commit 1342798c
  Author: David Ahern <dsahern@gmail.com>
  Date:   Thu Sep 13 14:59:13 2012 -0600

which enables 'exclude_guest' modifier any time the 'precise'
modifier is detected.

Fixing related tests and adding special comment.

Reported-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Tested-by: default avatarDavid Ahern <dsahern@gmail.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9fdbf671

tools/perf/util/parse-events-test.c

+8 −4
Original line number Diff line number Diff line
@@ -513,7 +513,8 @@ static int test__group1(struct perf_evlist *evlist) 
	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);

	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);

	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);

	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);

	/* use of precise requires exclude_guest */

	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);

	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);

	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 2);

	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);
@@ -599,7 +600,8 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);

	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);

	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);

	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);

	/* use of precise requires exclude_guest */

	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);

	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);

	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 3);

	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);
@@ -662,7 +664,8 @@ static int test__group4(struct perf_evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);

	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);

	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);

	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);

	/* use of precise requires exclude_guest */

	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);

	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);

	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 1);

	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
@@ -676,7 +679,8 @@ static int test__group4(struct perf_evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);

	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);

	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);

	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);

	/* use of precise requires exclude_guest */

	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);

	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);

	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 2);

	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);