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

Groups > linux.kernel > #1309862

[PATCH v3 4/9] perf build: Pass O option to kernel makefile in build-test

From Wang Nan <wangnan0@huawei.com>
Newsgroups linux.kernel
Subject [PATCH v3 4/9] perf build: Pass O option to kernel makefile in build-test
Date 2016-01-15 05:10 +0100
Message-ID <qR3S2-Fo-11@gated-at.bofh.it> (permalink)
References <qR3S1-Fo-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Kernel makefile only follow 'O' option passed from command line
explicitely. In build-test with 'O' option set, kernel makefile
contaminate kernel source directory. Build test also fail if we
don't create output directory manually.

K_O_OPT is added and passed to kernel makefile if 'O' is passed
to 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 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 29810cf..f918015 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -22,6 +22,7 @@ ifneq ($(O),)
   ifeq ($(SET_O),1)
     O_OPT := 'O=$(FULL_O)'
   endif
+  K_O_OPT := 'O=$(FULL_O)'
 endif
 
 PARALLEL_OPT=
@@ -301,15 +302,15 @@ ifneq ($(O),)
 endif
 
 make_kernelsrc:
-	@echo "- make -C <kernelsrc> $(PARALLEL_OPT) tools/perf"
+	@echo "- make -C <kernelsrc> $(PARALLEL_OPT) $(K_O_OPT) tools/perf"
 	$(call clean); \
-	(make -C ../.. $(PARALLEL_OPT) tools/perf) > $@ 2>&1 && \
+	(make -C ../.. $(PARALLEL_OPT) $(K_O_OPT) tools/perf) > $@ 2>&1 && \
 	test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
 
 make_kernelsrc_tools:
-	@echo "- make -C <kernelsrc>/tools $(PARALLEL_OPT) perf"
+	@echo "- make -C <kernelsrc>/tools $(PARALLEL_OPT) $(K_O_OPT) perf"
 	$(call clean); \
-	(make -C ../../tools $(PARALLEL_OPT) perf) > $@ 2>&1 && \
+	(make -C ../../tools $(PARALLEL_OPT) $(K_O_OPT) perf) > $@ 2>&1 && \
 	test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
 
 all: $(run) $(run_O) tarpkg make_kernelsrc make_kernelsrc_tools
-- 
1.8.3.4

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

Thread

[PATCH v3 0/9] perf build: Make build-test faster Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
  [PATCH v3 4/9] perf build: Pass O option to kernel makefile in build-test Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
    [tip:perf/urgent] perf build:   Pass O option to kernel makefile in build-test tip-bot for Wang Nan <tipbot@zytor.com> - 2016-01-19 14:40 +0100
  [PATCH v3 3/9] perf build: Test correct path of perf in build-test Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
    [tip:perf/urgent] perf build:   Test correct path of perf in build-test tip-bot for Wang Nan <tipbot@zytor.com> - 2016-01-19 14:40 +0100
  [PATCH v3 6/9] perf build: Introduce FEATURES_DUMP make variable Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
    [tip:perf/urgent] perf build:   Introduce FEATURES_DUMP make variable tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-01-19 14:40 +0100
  [PATCH v3 1/9] perf build: Set parallel making options build-test Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
  [PATCH v3 2/9] perf build: Pass O option to Makefile.perf in build-test Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
    [tip:perf/urgent] perf build:   Pass O option to Makefile.perf in build-test tip-bot for Wang Nan <tipbot@zytor.com> - 2016-01-19 14:40 +0100
  Re: [PATCH v3 0/9] perf build: Make build-test faster Jiri Olsa <jolsa@redhat.com> - 2016-01-15 11:30 +0100
    Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 15:40 +0100
      Re: [PATCH v3 0/9] perf build: Make build-test faster pi3orama <pi3orama@163.com> - 2016-01-15 16:00 +0100
        Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 16:20 +0100
          Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 17:40 +0100
            Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 20:00 +0100
              Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 20:10 +0100
      Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 16:00 +0100

csiph-web