diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/Makefile | 9 | ||||
| -rw-r--r-- | tools/perf/tests/builtin-test.c (renamed from tools/perf/builtin-test.c) | 8 | ||||
| -rw-r--r-- | tools/perf/tests/dso-data.c (renamed from tools/perf/util/dso-test-data.c) | 0 | ||||
| -rw-r--r-- | tools/perf/tests/parse-events.c (renamed from tools/perf/util/parse-events-test.c) | 0 |
4 files changed, 9 insertions, 8 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 3e807d7ab8e..2d3427f65b5 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -169,7 +169,7 @@ endif ### --- END CONFIGURATION SECTION --- -BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)util -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE +BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)util -Iutil -I. -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE BASIC_LDFLAGS = ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y) @@ -371,7 +371,6 @@ LIB_OBJS += $(OUTPUT)util/help.o LIB_OBJS += $(OUTPUT)util/levenshtein.o LIB_OBJS += $(OUTPUT)util/parse-options.o LIB_OBJS += $(OUTPUT)util/parse-events.o -LIB_OBJS += $(OUTPUT)util/parse-events-test.o LIB_OBJS += $(OUTPUT)util/path.o LIB_OBJS += $(OUTPUT)util/rbtree.o LIB_OBJS += $(OUTPUT)util/bitmap.o @@ -389,7 +388,6 @@ LIB_OBJS += $(OUTPUT)util/sigchain.o LIB_OBJS += $(OUTPUT)util/dso.o LIB_OBJS += $(OUTPUT)util/symbol.o LIB_OBJS += $(OUTPUT)util/symbol-elf.o -LIB_OBJS += $(OUTPUT)util/dso-test-data.o LIB_OBJS += $(OUTPUT)util/color.o LIB_OBJS += $(OUTPUT)util/pager.o LIB_OBJS += $(OUTPUT)util/header.o @@ -430,6 +428,9 @@ LIB_OBJS += $(OUTPUT)ui/stdio/hist.o LIB_OBJS += $(OUTPUT)arch/common.o +LIB_OBJS += $(OUTPUT)tests/parse-events.o +LIB_OBJS += $(OUTPUT)tests/dso-data.o + BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o BUILTIN_OBJS += $(OUTPUT)builtin-bench.o # Benchmark modules @@ -459,8 +460,8 @@ BUILTIN_OBJS += $(OUTPUT)builtin-probe.o BUILTIN_OBJS += $(OUTPUT)builtin-kmem.o BUILTIN_OBJS += $(OUTPUT)builtin-lock.o BUILTIN_OBJS += $(OUTPUT)builtin-kvm.o -BUILTIN_OBJS += $(OUTPUT)builtin-test.o BUILTIN_OBJS += $(OUTPUT)builtin-inject.o +BUILTIN_OBJS += $(OUTPUT)tests/builtin-test.o PERFLIBS = $(LIB_FILE) $(LIBTRACEEVENT) diff --git a/tools/perf/builtin-test.c b/tools/perf/tests/builtin-test.c index a04276e81f4..f6c642415c4 100644 --- a/tools/perf/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -318,7 +318,7 @@ static int test__open_syscall_event(void) nr_open_calls, evsel->counts->cpu[0].val); goto out_close_fd; } - + err = 0; out_close_fd: perf_evsel__close_fd(evsel, 1, threads->nr); @@ -1344,8 +1344,8 @@ static int test__syscall_open_tp_fields(void) perf_evlist__enable(evlist); /* - * Generate the event: - */ + * Generate the event: + */ open(filename, flags); while (1) { @@ -1495,7 +1495,7 @@ static int __cmd_test(int argc, const char *argv[]) width = len; ++i; } - + i = 0; while (tests[i].func) { int curr = i++, err; diff --git a/tools/perf/util/dso-test-data.c b/tools/perf/tests/dso-data.c index c6caedeb1d6..c6caedeb1d6 100644 --- a/tools/perf/util/dso-test-data.c +++ b/tools/perf/tests/dso-data.c diff --git a/tools/perf/util/parse-events-test.c b/tools/perf/tests/parse-events.c index b49c2eebff3..b49c2eebff3 100644 --- a/tools/perf/util/parse-events-test.c +++ b/tools/perf/tests/parse-events.c |