perf test: Use ARRAY_SIZE in parse events tests (ebf124ff) · Commits · 戴 / test

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

+10 −19

Original line number	Diff line number	Diff line
		@@ -634,8 +634,6 @@ static struct test__event_st test__events[] = {
		},
		};

		#define TEST__EVENTS_CNT (sizeof(test__events) / sizeof(struct test__event_st))

		static struct test__event_st test__events_pmu[] = {
		[0] = {
		.name = "cpu/config=10,config1,config2=3,period=1000/u",
		@@ -647,9 +645,6 @@ static struct test__event_st test__events_pmu[] = {
		},
		};

		#define TEST__EVENTS_PMU_CNT (sizeof(test__events_pmu) / \
		sizeof(struct test__event_st))

		struct test__term {
		const char *str;
		__u32 type;
		@@ -765,21 +760,17 @@ int parse_events__test(void)
		{
		int ret;

		do {
		ret = test_events(test__events, TEST__EVENTS_CNT);
		if (ret)
		break;

		if (test_pmu()) {
		ret = test_events(test__events_pmu,
		TEST__EVENTS_PMU_CNT);
		if (ret)
		break;
		}
		#define TEST_EVENTS(tests) \
		do { \
		ret = test_events(tests, ARRAY_SIZE(tests)); \
		if (ret) \
		return ret; \
		} while (0)

		ret = test_terms(test__terms, TEST__TERMS_CNT);
		TEST_EVENTS(test__events);

		} while (0);
		if (test_pmu())
		TEST_EVENTS(test__events_pmu);

		return ret;
		return test_terms(test__terms, ARRAY_SIZE(test__terms));
		}