Commit 30f31c0a authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Fix parse events automated tests 



Parse events tests got broken after following commit:

  perf tools: Fix trace events storms due to weight demux
  commit 0983cc0d
  Author: Frederic Weisbecker <fweisbec@gmail.com>

that added PERF_SAMPLE_PERIOD sample type for tracepoints.

Updating related tests.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1343825338-10618-1-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 194f8dcb

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

+6 −6
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ do { \ 
	} \

} while (0)



#define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \

			     PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD)



static int test__checkevent_tracepoint(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel = list_entry(evlist->entries.next,
@@ -21,8 +24,7 @@ static int test__checkevent_tracepoint(struct perf_evlist *evlist) 
	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);

	TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);

	TEST_ASSERT_VAL("wrong sample_type",

		(PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | PERF_SAMPLE_CPU) ==

		evsel->attr.sample_type);

		PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type);

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

	return 0;

}
@@ -37,8 +39,7 @@ static int test__checkevent_tracepoint_multi(struct perf_evlist *evlist) 
		TEST_ASSERT_VAL("wrong type",

			PERF_TYPE_TRACEPOINT == evsel->attr.type);

		TEST_ASSERT_VAL("wrong sample_type",

			(PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | PERF_SAMPLE_CPU)

			== evsel->attr.sample_type);

			PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type);

		TEST_ASSERT_VAL("wrong sample_period",

			1 == evsel->attr.sample_period);

	}
@@ -428,8 +429,7 @@ static int test__checkevent_list(struct perf_evlist *evlist) 
	evsel = list_entry(evsel->node.next, struct perf_evsel, node);

	TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);

	TEST_ASSERT_VAL("wrong sample_type",

		(PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | PERF_SAMPLE_CPU) ==

		evsel->attr.sample_type);

		PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type);

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE