Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1304609

[PATCH 5/6] perf tools: Pass O option to Makefile.perf in build-test

Show all headers | View raw

Doesn't like tools/perf/Makefile, tools/perf/Makefile.perf obey 'O'
option when it is passed through cmdline only, because of code in
tools/scripts/Makefile.include:

 ifneq ($(O),)
 ifeq ($(origin O), command line)
 	...
 	ABSOLUTE_O := $(shell cd $(O) ; pwd)
 	OUTPUT := $(ABSOLUTE_O)/$(if $(subdir),$(subdir)/)
 endif
 endif

This patch passes 'O' to Makefile.perf through cmdline explicitly
to make it follow O variable during build-test.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/tests/make | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index bd9c61a..a32615a3 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -3,7 +3,7 @@ ifeq ($(MAKECMDGOALS),)
 # no target specified, trigger the whole suite
 all:
 	@echo "Testing Makefile";      $(MAKE) -sf tests/make MK=Makefile
-	@echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf SET_PARALLEL=1
+	@echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf SET_PARALLEL=1 SET_O=1
 else
 # run only specific test over 'Makefile'
 %:
@@ -11,6 +11,14 @@ else
 endif
 else
 PERF := .
+O_OPT :=
+
+ifneq ($(O),)
+  FULL_O := $(shell readlink -f $(O) || echo $(O))
+  ifeq ($(SET_O),1)
+    O_OPT := 'O=$(FULL_O)'
+  endif
+endif
 
 PARALLEL_OPT=
 ifeq ($(SET_PARALLEL),1)
@@ -247,7 +255,7 @@ clean := @(cd $(PERF); make -s -f $(MK) clean >/dev/null)
 $(run):
 	$(call clean)
 	@TMP_DEST=$$(mktemp -d); \
-	cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) DESTDIR=$$TMP_DEST $($@)"; \
+	cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) $(O_OPT) DESTDIR=$$TMP_DEST $($@)"; \
 	echo "- $@: $$cmd" && echo $$cmd > $@ && \
 	( eval $$cmd ) >> $@ 2>&1; \
 	echo "  test: $(call test,$@)" >> $@ 2>&1; \
-- 
1.8.3.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] perf tools: Improve 'make build-test' Wang Nan <wangnan0@huawei.com> - 2016-01-08 15:30 +0100
  [PATCH 5/6] perf tools: Pass O option to Makefile.perf in build-test Wang Nan <wangnan0@huawei.com> - 2016-01-08 15:30 +0100
  [PATCH 2/6] perf tools: Add missing headers in perf's MANIFEST Wang Nan <wangnan0@huawei.com> - 2016-01-08 15:30 +0100
    [tip:perf/core] perf tools: Add missing headers in perf'  s MANIFEST tip-bot for Wang Nan <tipbot@zytor.com> - 2016-01-09 17:40 +0100
    Re: [PATCH] perf tools: Add missing sources in perf's MANIFEST "Wangnan (F)" <wangnan0@huawei.com> - 2016-01-11 10:50 +0100
      Re: [PATCH] perf tools: Add missing sources in perf's MANIFEST Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-11 15:20 +0100
    [PATCH] perf tools: Add missing sources in perf's MANIFEST Jiri Olsa <jolsa@redhat.com> - 2016-01-11 10:50 +0100
  [PATCH 4/6] perf tools: Set parallel making options build-test Wang Nan <wangnan0@huawei.com> - 2016-01-08 15:30 +0100
    Re: [PATCH 4/6] perf tools: Set parallel making options build-test Jiri Olsa <jolsa@redhat.com> - 2016-01-11 10:40 +0100
  Re: [PATCH 0/6] perf tools: Improve 'make build-test' Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-08 15:40 +0100
    Re: [PATCH 0/6] perf tools: Improve 'make build-test' "Wangnan (F)" <wangnan0@huawei.com> - 2016-01-11 04:00 +0100
      Re: [PATCH 0/6] perf tools: Improve 'make build-test' Jiri Olsa <jolsa@redhat.com> - 2016-01-11 09:50 +0100

csiph-web