libperf: Keep count of failed tests (301a89f8) · Commits · 戴 / test

Keep the count of failed tests, so we get better output with failures, like: # make tests ... running static: - running test-cpumap.c...OK - running test-threadmap.c...OK - running test-evlist.c...FAILED test-evlist.c:53 failed to create evsel2 FAILED test-evlist.c:163 failed to create evsel2 FAILED test-evlist.c:287 failed count FAILED (3) - running test-evsel.c...OK running dynamic: - running test-cpumap.c...OK - running test-threadmap.c...OK - running test-evlist.c...FAILED test-evlist.c:53 failed to create evsel2 FAILED test-evlist.c:163 failed to create evsel2 FAILED test-evlist.c:287 failed count FAILED (3) - running test-evsel.c...OK ... Signed-off-by:

Jiri Olsa <jolsa@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexey Budankov <alexey.budankov@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lore.kernel.org/lkml/20191017105918.20873-9-jolsa@kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/lib/include/internal/tests.h

+17 −3

Original line number	Diff line number	Diff line
		@@ -4,14 +4,28 @@

		#include <stdio.h>

		#define __T_START fprintf(stdout, "- running %s...", __FILE__)
		#define __T_OK fprintf(stdout, "OK\n")
		#define __T_FAIL fprintf(stdout, "FAIL\n")
		int tests_failed;

		#define __T_START \
		do { \
		fprintf(stdout, "- running %s...", __FILE__); \
		fflush(NULL); \
		tests_failed = 0; \
		} while (0)

		#define __T_END \
		do { \
		if (tests_failed) \
		fprintf(stdout, " FAILED (%d)\n", tests_failed); \
		else \
		fprintf(stdout, "OK\n"); \
		} while (0)

		#define __T(text, cond) \
		do { \
		if (!(cond)) { \
		fprintf(stderr, "FAILED %s:%d %s\n", __FILE__, __LINE__, text); \
		tests_failed++; \
		return -1; \
		} \
		} while (0)

tools/perf/lib/tests/test-cpumap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,6 @@ int main(int argc, char **argv)
		perf_cpu_map__put(cpus);
		perf_cpu_map__put(cpus);

		__T_OK;
		__T_END;
		return 0;
		}

tools/perf/lib/tests/test-evlist.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -408,6 +408,6 @@ int main(int argc, char **argv)
		test_mmap_thread();
		test_mmap_cpus();

		__T_OK;
		__T_END;
		return 0;
		}

tools/perf/lib/tests/test-evsel.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,6 +130,6 @@ int main(int argc, char **argv)
		test_stat_thread();
		test_stat_thread_enable();

		__T_OK;
		__T_END;
		return 0;
		}

tools/perf/lib/tests/test-threadmap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,6 @@ int main(int argc, char **argv)
		perf_thread_map__put(threads);
		perf_thread_map__put(threads);

		__T_OK;
		__T_END;
		return 0;
		}

Admin message